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

equal deleted inserted replaced

-:18cf95ad3666
+:158d3d2ae070
 from i18n import gettext as _
 demandload(globals(), "os re sys signal shutil imp urllib pdb")
 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
 demandload(globals(), "fnmatch mdiff random signal tempfile time")
 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
-demandload(globals(), "archival changegroup")
+demandload(globals(), "archival cStringIO changegroup email.Parser")
 demandload(globals(), "hgweb.server sshserver")
 class UnknownCommand(Exception):
 """Exception raised if command is not in the command table."""
 class AmbiguousCommand(Exception):
 Import a list of patches and commit them individually.
 If there are outstanding changes in the working directory, import
 will abort unless given the -f flag.
-If a patch looks like a mail message (its first line starts with
+You can import a patch straight from a mail message.  Even patches
-"From " or looks like an RFC822 header), it will not be applied
+as attachments work (body part must be type text/plain or
-unless the -f option is used.  The importer neither parses nor
+text/x-patch to be used).  Sender and subject line of email
-discards mail headers, so use -f only to override the "mailness"
+message are used as default committer and commit message.  Any
-safety check, not to import a real mail message.
+text/plain body part before first diff is added to commit message.
+If imported patch was generated by hg export, user and description
+from patch override values from message headers and body.  Values
+given on command line with -m and -u override these.
 To read a patch from standard input, use patch name "-".
 """
 patches = (patch1,) + patches
 mailre = re.compile(r'(?:From |[\w-]+:)')
 # attempt to detect the start of a patch
 # (this heuristic is borrowed from quilt)
-diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +
+diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' +
 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
-'(---|\*\*\*)[ \t])')
+'(---|\*\*\*)[ \t])', re.MULTILINE)
 for patch in patches:
 pf = os.path.join(d, patch)
-message = []
+message = None
 user = None
 date = None
 hgpatch = False
+p = email.Parser.Parser()
 if pf == '-':
-f = sys.stdin
+msg = p.parse(sys.stdin)
-fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
-pf = tmpname
-tmpfp = os.fdopen(fd, 'w')
 ui.status(_("applying patch from stdin\n"))
 else:
-f = open(pf)
+msg = p.parse(file(pf))
-tmpfp, tmpname = None, None
 ui.status(_("applying %s\n") % patch)
+fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
+tmpfp = os.fdopen(fd, 'w')
 try:
-while True:
+message = msg['Subject']
-line = f.readline()
+if message:
-if not line: break
+message = message.replace('\n\t', ' ')
-if tmpfp: tmpfp.write(line)
+ui.debug('Subject: %s\n' % message)
-line = line.rstrip()
+user = msg['From']
-if (not message and not hgpatch and
+if user:
-mailre.match(line) and not opts['force']):
+ui.debug('From: %s\n' % user)
-if len(line) > 35:
+diffs_seen = 0
-line = line[:32] + '...'
+ok_types = ('text/plain', 'text/x-patch')
-raise util.Abort(_('first line looks like a '
+for part in msg.walk():
-'mail header: ') + line)
+content_type = part.get_content_type()
-if diffre.match(line):
+ui.debug('Content-Type: %s\n' % content_type)
+if content_type not in ok_types:
+continue
+payload = part.get_payload(decode=True)
+m = diffre.search(payload)
+if m:
+ui.debug(_('found patch at byte %d\n') % m.start(0))
+diffs_seen += 1
+hgpatch = False
+fp = cStringIO.StringIO()
+for line in payload[:m.start(0)].splitlines():
+if line.startswith('# HG changeset patch'):
+ui.debug(_('patch generated by hg export\n'))
+hgpatch = True
+elif hgpatch:
+if line.startswith('# User '):
+user = line[7:]
+ui.debug('From: %s\n' % user)
+elif line.startswith("# Date "):
+date = line[7:]
+if not line.startswith('# '):
+fp.write(line)
+fp.write('\n')
+hgpatch = False
+message = fp.getvalue() or message
 if tmpfp:
-for chunk in util.filechunkiter(f):
+tmpfp.write(payload)
-tmpfp.write(chunk)
+if not payload.endswith('\n'):
-break
+tmpfp.write('\n')
-elif hgpatch:
+elif not diffs_seen and message and content_type == 'text/plain':
-# parse values when importing the result of an hg export
+message += '\n' + payload
-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)
 if opts['message']:
 # pickup the cmdline msg
 message = opts['message']
 elif message:
 # pickup the patch msg
-message = '\n'.join(message).rstrip()
+message = message.strip()
 else:
 # launch the editor
 message = None
 ui.debug(_('message:\n%s\n') % message)
-if tmpfp: tmpfp.close()
+tmpfp.close()
-files = util.patch(strip, pf, ui)
+if not diffs_seen:
+raise util.Abort(_('no diffs found'))
+files = util.patch(strip, tmpname, ui)
 if len(files) > 0:
 addremove_lock(ui, repo, files, {})
 repo.commit(files, message, user, date)
 finally:
-if tmpname: os.unlink(tmpname)
+os.unlink(tmpname)
 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

changeset 2504	158d3d2ae070
parent 2494	73ac95671788
child 2510	cbff06469488