# [PATCH 1/2] remote-hg: trivial cleanups 3 messages from 2012-11-11 to 2012-11-11. Participants: Felipe Contreras. Thread: https://gitlist.dev/t/32072 ## Felipe Contreras, 2012-11-11 14:09 Subject: [PATCH 0/2] remote-hg: small fixes Message-ID: <1352642999-7205-1-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1352642999-7205-1-git-send-email-felipe.contreras%40gmail.com ``` 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, 2012-11-11 14:09 Subject: [PATCH 1/2] remote-hg: trivial cleanups Message-ID: <1352642999-7205-2-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1352642999-7205-2-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1352642999-7205-1-git-send-email-felipe.contreras@gmail.com> ``` Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, 2012-11-11 14:09 Subject: [PATCH 2/2] remote-hg: fix for files with spaces Message-ID: <1352642999-7205-3-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1352642999-7205-3-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1352642999-7205-1-git-send-email-felipe.contreras@gmail.com> ``` Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ```