remote-hg: trivial cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 24, 2013 at 21:29 UTC
34d75e78f407c85f948dc74806a6505cd1f001ec
1 file changed
+7
-7
contrib/remote-helpers/git-remote-hg
+7
-7
@@ -74,11 +74,11 @@ def hgmode(mode):
74
m = { '100755': 'x', '120000': 'l' }
75
return m.get(mode, '')
76
77
-def hghex(node):
78
- return hg.node.hex(node)
77
+def hghex(n):
78
+ return node.hex(n)
79
80
-def hgbin(node):
81
- return hg.node.bin(node)
80
+def hgbin(n):
81
+ return node.bin(n)
82
83
def hgref(ref):
84
return ref.replace('___', ' ')
@@ -734,12 +734,12 @@ def parse_commit(parser):
734
if from_mark:
735
p1 = mark_to_rev(from_mark)
736
else:
737
- p1 = '\0' * 20
737
+ p1 = '0' * 40
738
739
if merge_mark:
740
p2 = mark_to_rev(merge_mark)
741
else:
742
- p2 = '\0' * 20
742
+ p2 = '0' * 40
743
744
#
745
# If files changed from any of the parents, hg wants to know, but in git if
@@ -826,7 +826,7 @@ def write_tag(repo, tag, node, msg, author):
826
return context.memfilectx(f, content, False, False, None)
827
828
p1 = tip.hex()
829
- p2 = '\0' * 20
829
+ p2 = '0' * 40
830
if not author:
831
author = (None, 0, 0)
832
user, date, tz = author