diff options
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 7 | ||||
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index dcda351d35..31cba64d93 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -94,7 +94,7 @@ class Marks: return self.last_mark def is_marked(self, rev): - return str(rev) in self.marks + return rev in self.marks def new_mark(self, rev, mark): self.marks[rev] = mark @@ -224,7 +224,7 @@ def export_files(tree, files): else: mode = '100644' - # is the blog already exported? + # is the blob already exported? if h in filenodes: mark = filenodes[h] final.append((mode, mark, path)) @@ -521,7 +521,7 @@ def c_style_unescape(string): return string def parse_commit(parser): - global marks, blob_marks, bmarks, parsed_refs + global marks, blob_marks, parsed_refs global mode parents = [] @@ -643,6 +643,7 @@ def do_export(parser): wt = repo.bzrdir.open_workingtree() wt.update() print "ok %s" % ref + print def do_capabilities(parser): diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index fda4199a98..cfa96c16b2 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -12,7 +12,7 @@ # For remote repositories a local clone is stored in # "$GIT_DIR/hg/origin/clone/.hg/". -from mercurial import hg, ui, bookmarks, context, util, encoding, node, error, extensions +from mercurial import hg, ui, bookmarks, context, encoding, node, error, extensions import re import sys |