Mercurial > hg > mercurial-crew-with-dirclash
changeset 3533:891c8d20f80f
mq: support qimport -
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 26 Oct 2006 09:40:20 -0700 |
parents | 04d44c3d64f7 |
children | 811e6c95485c |
files | hgext/mq.py |
diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py +++ b/hgext/mq.py @@ -1337,13 +1337,20 @@ class queue: for filename in files: if existing: + if filename == '-': + raise util.Abort(_('-e is incompatible with import from -')) if not patchname: patchname = filename if not os.path.isfile(self.join(patchname)): raise util.Abort(_("patch %s does not exist") % patchname) else: try: - text = file(filename).read() + if filename == '-': + if not patchname: + raise util.Abort(_('need --name to import a patch from -')) + text = sys.stdin.read() + else: + text = file(filename).read() except IOError: raise util.Abort(_("unable to read %s") % patchname) if not patchname: