[PATCH 6 of 8] convert: add support for --includerevs, --excluderevs

Yury Sulsky yury.sulsky at gmail.com
Mon Nov 28 12:35:20 CST 2011


Sorry, minor fix for this patch:

# HG changeset patch
# User Yury Sulsky <ysulsky at janestreet.com>
# Date 1322505149 18000
# Node ID fa4e7792be8039026eee55a83fc3b7d8e7ec7d95
# Parent  94ee4735ac3e64348ce1aa5de8265fd24dc93ccf
convert: ignore blank lines in --includerevs argument

diff --git a/hgext/convert/filtermap.py b/hgext/convert/filtermap.py
--- a/hgext/convert/filtermap.py
+++ b/hgext/convert/filtermap.py
@@ -321,15 +321,14 @@
             self.filemapper = None

     def _parserevset(self, fname):
-        def parse(line):
-            line = line.strip()
-            ret = self.base.lookuprev(line)
-            if ret is None:
+        def lookup(rev):
+            rev = self.base.lookuprev(rev)
+            if not rev:
                 self.ui.warn(_("Can't find revision %s." % line))
-            return ret
+            return rev
         fp = open(fname, 'r')
         try:
-            return set([parse(line) for line in fp])
+            return set([lookup(x.strip()) for x in fp if x.strip()])
         finally:
             fp.close()

Yury


More information about the Mercurial-devel mailing list