|
 |
6499dc6 |
From 43c3e6f0b30895fa9e8f21c49cd53ff222f888d4 Mon Sep 17 00:00:00 2001
|
|
|
6499dc6 |
From: Petr Stodulka <pstodulk@redhat.com>
|
|
|
6499dc6 |
Date: Fri, 27 Nov 2015 15:00:03 +0100
|
|
|
6499dc6 |
Subject: [PATCH] added missing parameter "repo" when call context.memfilectx
|
|
|
6499dc6 |
|
|
|
6499dc6 |
- mercurial has changed API and require parameter repo as first
|
|
|
6499dc6 |
---
|
|
|
6499dc6 |
git-remote-hg | 4 ++--
|
|
|
6499dc6 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
6499dc6 |
|
|
|
6499dc6 |
diff --git a/git-remote-hg b/git-remote-hg
|
|
|
6499dc6 |
index da58c32..ea7fdfe 100755
|
|
|
6499dc6 |
--- a/git-remote-hg
|
|
|
6499dc6 |
+++ b/git-remote-hg
|
|
|
6499dc6 |
@@ -814,7 +814,7 @@ def parse_commit(parser):
|
|
|
6499dc6 |
is_exec = of['mode'] == 'x'
|
|
|
6499dc6 |
is_link = of['mode'] == 'l'
|
|
|
6499dc6 |
rename = of.get('rename', None)
|
|
|
6499dc6 |
- return context.memfilectx(f, of['data'],
|
|
|
6499dc6 |
+ return context.memfilectx(repo, f, of['data'],
|
|
|
6499dc6 |
is_link, is_exec, rename)
|
|
|
6499dc6 |
|
|
|
6499dc6 |
repo = parser.repo
|
|
|
6499dc6 |
@@ -918,7 +918,7 @@ def write_tag(repo, tag, node, msg, author):
|
|
|
6499dc6 |
except error.ManifestLookupError:
|
|
|
6499dc6 |
data = ""
|
|
|
6499dc6 |
content = data + "%s %s\n" % (node, tag)
|
|
|
6499dc6 |
- return context.memfilectx(f, content, False, False, None)
|
|
|
6499dc6 |
+ return context.memfilectx(repo, f, content, False, False, None)
|
|
|
6499dc6 |
|
|
|
6499dc6 |
p1 = tip.hex()
|
|
|
6499dc6 |
p2 = '0' * 40
|
|
|
6499dc6 |
--
|
|
|
6499dc6 |
2.4.3
|
|
|
6499dc6 |
|