diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-11 07:22:57 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-11 10:46:46 -0700 |
| commit | a57ad51d1ae136e704a004c7d5c6307b4ce19c63 (patch) | |
| tree | e76bcd5cdd3a0ef7c5f22867e9ad50ca536064d9 | |
| parent | Update draft release notes to 1.8.3 (diff) | |
| download | tgif-a57ad51d1ae136e704a004c7d5c6307b4ce19c63.tar.xz | |
remote-hg: trivial cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 328c2dc76d..d0dfb1ec2c 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -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): 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): 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): 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) |