undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: trivial cleanups

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-04-11 07:22:57 -05:00 committed by Junio C Hamano
parent cc3e4eba72
commit a57ad51d1a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,7 +531,6 @@ def parse_blob(parser):
data = parser.get_data() data = parser.get_data()
blob_marks[mark] = data blob_marks[mark] = data
parser.next() parser.next()
return
def get_merge_files(repo, p1, p2, files): def get_merge_files(repo, p1, p2, files):
for e in repo[p1].files(): for e in repo[p1].files():
@ -542,7 +541,7 @@ def get_merge_files(repo, p1, p2, files):
files[e] = f files[e] = f
def parse_commit(parser): def parse_commit(parser):
global marks, blob_marks, bmarks, parsed_refs global marks, blob_marks, parsed_refs
global mode global mode
from_mark = merge_mark = None from_mark = merge_mark = None
@ -647,10 +646,11 @@ def parse_commit(parser):
rev = repo[node].rev() rev = repo[node].rev()
parsed_refs[ref] = node parsed_refs[ref] = node
marks.new_mark(rev, commit_mark) marks.new_mark(rev, commit_mark)
def parse_reset(parser): def parse_reset(parser):
global parsed_refs
ref = parser[1] ref = parser[1]
parser.next() parser.next()
# ugh # ugh
@ -715,11 +715,11 @@ def do_export(parser):
continue continue
print "ok %s" % ref print "ok %s" % ref
print
if peer: if peer:
parser.repo.push(peer, force=False) parser.repo.push(peer, force=False)
print
def fix_path(alias, repo, orig_url): def fix_path(alias, repo, orig_url):
repo_url = util.url(repo.url()) repo_url = util.url(repo.url())
url = util.url(orig_url) url = util.url(orig_url)