[PATCH] hg-to-git: fix parent analysis

Stelian Pop· Feb 15, 2008, 21:20 UTC · lore

Fix a bug in the hg-to-git convertor introduced by commit 1bc7c13af9f936aa80893100120b542338a10bf4: when searching the changeset parents, 'hg log' returns an extra space at the end of the line, which confuses the .split(' ') based tokenizer:

    Traceback (most recent call last):
      File "hg-to-git.py", line 123, in <module>
          hgchildren[mparent] += ( str(cset), )
      KeyError: ''

Signed-off-by: Stelian Pop <stelian@popies.net>

---

Show changes to contrib/hg-to-git/hg-to-git.py +1 −1

diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
index c35b158..d72ffbb 100755
--- a/contrib/hg-to-git/hg-to-git.py
+++ b/contrib/hg-to-git/hg-to-git.py
@@ -111,7 +111,7 @@ hgparents["0"] = (None, None)
 hgbranch["0"] = "master"
 for cset in range(1, int(tip) + 1):
     hgchildren[str(cset)] = ()
-    prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().split(' ')
+    prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().strip().split(' ')
     prnts = map(lambda x: x[:x.find(':')], prnts)
     if prnts[0] != '':
         parent = prnts[0].strip()

-- 
Stelian Pop <stelian@popies.net>

Karl Hasselström· Feb 19, 2008, 10:12 UTC · re: Stelian Pop · lore

Re: [PATCH] hg-to-git: fix parent analysis

On 2008-02-15 22:20:44 +0100, Stelian Pop wrote:

> -    prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().split(' ')
> +    prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().strip().split(' ')

If it's not already too late, you could wrap this line when you're changing it anyway. Something like this maybe:

    prnts = os.popen('hg log -r %d --template "{parents}"' % cset
                     ).read().strip().split(' ')

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

patchhg-to-git: fix parent analysis