Browse Source

remote-hg: trivial cleanups

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
a57ad51d1a
  1. 10
      contrib/remote-helpers/git-remote-hg

10
contrib/remote-helpers/git-remote-hg

@ -531,7 +531,6 @@ def parse_blob(parser): @@ -531,7 +531,6 @@ def parse_blob(parser):
data = parser.get_data()
blob_marks[mark] = data
parser.next()
return

def get_merge_files(repo, p1, p2, files):
for e in repo[p1].files():
@ -542,7 +541,7 @@ def get_merge_files(repo, p1, p2, files): @@ -542,7 +541,7 @@ def get_merge_files(repo, p1, p2, files):
files[e] = f

def parse_commit(parser):
global marks, blob_marks, bmarks, parsed_refs
global marks, blob_marks, parsed_refs
global mode

from_mark = merge_mark = None
@ -647,10 +646,11 @@ def parse_commit(parser): @@ -647,10 +646,11 @@ def parse_commit(parser):
rev = repo[node].rev()

parsed_refs[ref] = node

marks.new_mark(rev, commit_mark)

def parse_reset(parser):
global parsed_refs

ref = parser[1]
parser.next()
# ugh
@ -715,11 +715,11 @@ def do_export(parser): @@ -715,11 +715,11 @@ def do_export(parser):
continue
print "ok %s" % ref

print

if peer:
parser.repo.push(peer, force=False)

print

def fix_path(alias, repo, orig_url):
repo_url = util.url(repo.url())
url = util.url(orig_url)

Loading…
Cancel
Save