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
Apr 11, 2013 at 07:22 UTC
a57ad51d1ae136e704a004c7d5c6307b4ce19c63
1 file changed
+5
-5
contrib/remote-helpers/git-remote-hg
+5
-5
@@ -531,7 +531,6 @@ def parse_blob(parser):
531
data = parser.get_data()
532
blob_marks[mark] = data
533
parser.next()
534
- return
534
535
def get_merge_files(repo, p1, p2, files):
536
for e in repo[p1].files():
@@ -542,7 +541,7 @@ def get_merge_files(repo, p1, p2, files):
541
files[e] = f
542
543
def parse_commit(parser):
545
- global marks, blob_marks, bmarks, parsed_refs
544
+ global marks, blob_marks, parsed_refs
545
global mode
546
547
from_mark = merge_mark = None
@@ -647,10 +646,11 @@ def parse_commit(parser):
646
rev = repo[node].rev()
647
648
parsed_refs[ref] = node
650
-
649
marks.new_mark(rev, commit_mark)
650
651
def parse_reset(parser):
652
+ global parsed_refs
653
+
654
ref = parser[1]
655
parser.next()
656
# ugh
@@ -715,11 +715,11 @@ def do_export(parser):
715
continue
716
print "ok %s" % ref
717
718
- print
719
-
718
if peer:
719
parser.repo.push(peer, force=False)
720
721
+ print
722
+
723
def fix_path(alias, repo, orig_url):
724
repo_url = util.url(repo.url())
725
url = util.url(orig_url)