mercurial-crew-with-dirclash: mercurial/commands.py comparison

comparison mercurial/commands.py @ 2400:2e90024e1471

import: allow to import stdin with file name "-"

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Sun, 04 Jun 2006 16:47:46 -0700
parents	e9d402506514
children	4593d09e534d

comparison

equal deleted inserted replaced

-:cc90dcbdf053
+:2e90024e1471
 If a patch looks like a mail message (its first line starts with
 "From " or looks like an RFC822 header), it will not be applied
 unless the -f option is used.  The importer neither parses nor
 discards mail headers, so use -f only to override the "mailness"
 safety check, not to import a real mail message.
+To read a patch from standard input, use patch name "-".
 """
 patches = (patch1,) + patches
 if not opts['force']:
 bail_if_changed(repo)
 diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +
 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
 '(---|\*\*\*)[ \t])')
 for patch in patches:
-ui.status(_("applying %s\n") % patch)
 pf = os.path.join(d, patch)
 message = []
 user = None
 date = None
 hgpatch = False
-for line in file(pf):
+if pf == '-':
-line = line.rstrip()
+f = sys.stdin
-if (not message and not hgpatch and
+fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
-mailre.match(line) and not opts['force']):
+pf = tmpname
-if len(line) > 35:
+tmpfp = os.fdopen(fd, 'w')
-line = line[:32] + '...'
+ui.status(_("applying patch from stdin\n"))
-raise util.Abort(_('first line looks like a '
+else:
-'mail header: ') + line)
+f = open(pf)
-if diffre.match(line):
+tmpfp, tmpname = None, None
-break
+ui.status(_("applying %s\n") % patch)
-elif hgpatch:
+try:
-# parse values when importing the result of an hg export
+while True:
-if line.startswith("# User "):
+line = f.readline()
-user = line[7:]
+if not line: break
-ui.debug(_('User: %s\n') % user)
+if tmpfp: tmpfp.write(line)
-elif line.startswith("# Date "):
+line = line.rstrip()
-date = line[7:]
+if (not message and not hgpatch and
-elif not line.startswith("# ") and line:
+mailre.match(line) and not opts['force']):
+if len(line) > 35:
+line = line[:32] + '...'
+raise util.Abort(_('first line looks like a '
+'mail header: ') + line)
+if diffre.match(line):
+if tmpfp:
+for chunk in util.filechunkiter(f):
+tmpfp.write(chunk)
+break
+elif hgpatch:
+# parse values when importing the result of an hg export
+if line.startswith("# User "):
+user = line[7:]
+ui.debug(_('User: %s\n') % user)
+elif line.startswith("# Date "):
+date = line[7:]
+elif not line.startswith("# ") and line:
+message.append(line)
+hgpatch = False
+elif line == '# HG changeset patch':
+hgpatch = True
+message = []       # We may have collected garbage
+elif message or line:
 message.append(line)
-hgpatch = False
-elif line == '# HG changeset patch':
+# make sure message isn't empty
-hgpatch = True
+if not message:
-message = []       # We may have collected garbage
+message = _("imported patch %s\n") % patch
-elif message or line:
+else:
-message.append(line)
+message = '\n'.join(message).rstrip()
+ui.debug(_('message:\n%s\n') % message)
-# make sure message isn't empty
-if not message:
+if tmpfp: tmpfp.close()
-message = _("imported patch %s\n") % patch
+files = util.patch(strip, pf, ui)
-else:
-message = '\n'.join(message).rstrip()
+if len(files) > 0:
-ui.debug(_('message:\n%s\n') % message)
+addremove_lock(ui, repo, files, {})
+repo.commit(files, message, user, date)
-files = util.patch(strip, pf, ui)
+finally:
+if tmpname: os.unlink(tmpname)
-if len(files) > 0:
-addremove_lock(ui, repo, files, {})
-repo.commit(files, message, user, date)
 def incoming(ui, repo, source="default", **opts):
 """show new changesets found in source
 Show new changesets found in the specified path/URL or the default

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2400:2e90024e1471