Mercurial > public > mercurial-scm > hg-stable

diff hgext/transplant.py @ 13789:7e5031180c0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: fix crash if filter script munges log file This fixes an UnboundLocalError crash if the filter script removes the 'User' or 'Date' lines from the log file.
author Luke Plant <L.Plant.98@cantab.net>
date Mon, 28 Mar 2011 21:17:32 +0100
parents 7abab875e647
children c0ed76b5056d
line wrap: on
line diff
--- a/hgext/transplant.py	Mon Mar 28 11:18:56 2011 -0500
+++ b/hgext/transplant.py	Mon Mar 28 21:17:32 2011 +0100
@@ -346,6 +346,8 @@
         message = []
         node = revlog.nullid
         inmsg = False
+        user = None
+        date = None
         for line in fp.read().splitlines():
             if inmsg:
                 message.append(line)
@@ -360,6 +362,8 @@
             elif not line.startswith('# '):
                 inmsg = True
                 message.append(line)
+        if None in (user, date):
+            raise util.Abort(_("filter produced garbled log file"))
         return (node, user, date, '\n'.join(message), parents)
 
     def log(self, user, date, message, p1, p2, merge=False):