threads / patch / 32072

patch, 2 partsremote-hg: trivial cleanups

Subject: [PATCH 1/2] remote-hg: trivial cleanups

## tl;dr

3 messages between Nov 11, 2012 and Nov 11, 2012. Diffs are folded; open one to read it.

replies: 2people: 1as markdown or json

Felipe Contreras· Nov 11, 2012, 14:09 UTC · lore

[PATCH 0/2] remote-hg: small fixes

Hi,

Nothing major.

These are meant to be on top of fc/remote-hg that is on peff/pu.

Felipe Contreras (2):
  remote-hg: trivial cleanups
  remote-hg: fix for files with spaces

 contrib/remote-helpers/git-remote-hg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.0

Felipe Contreras· Nov 11, 2012, 14:09 UTC · re: Felipe Contreras · lore

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to contrib/remote-helpers/git-remote-hg +2 −2

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 7929eec..0edb8ac 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -523,7 +523,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():
@@ -639,10 +638,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

-- 
1.8.0

Felipe Contreras· Nov 11, 2012, 14:09 UTC · re: Felipe Contreras · lore

[PATCH 2/2] remote-hg: fix for files with spaces

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/remote-helpers/git-remote-hg +1 −1

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 0edb8ac..1d46838 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -562,7 +562,7 @@ def parse_commit(parser):
 
     for line in parser:
         if parser.check('M'):
-            t, m, mark_ref, path = line.split(' ')
+            t, m, mark_ref, path = line.split(' ', 3)
             mark = int(mark_ref[1:])
             f = { 'mode' : hgmode(m), 'data' : blob_marks[mark] }
         elif parser.check('D'):

-- 
1.8.0