summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-26 16:12:31 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-26 15:20:26 -0700
commit75301a45887dfaab2f1458a2a56f7ed9b8f474ce (patch)
tree625e87f3f9355af48c9a14f17d7efabb68bf7b54
parentc8c82b1ba3fd03b3de4d2c6c760b75726f519cb8 (diff)
downloadgit-75301a45887dfaab2f1458a2a56f7ed9b8f474ce.tar.gz
remote-helpers: trivial cleanups
No functional changes. Typos, unused variables, redundant operations, and white-spaces. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr7
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg2
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