Re: [PATCH v4 00/21] remote-hg: general updates
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH v4 00/21] remote-hg: general updates · Felipe Contreras <hidden>
Felipe Contreras [off-list ref] writes:
This is a reroll of the previous series due to a few minor issues. As the previous version, forced pushes remain a configuration option. Also, I picked up a fix for test regarding hg_log() that was sent to the mailing list.
Will replace the previous round with this one. The changes since the previous round looks like this on my end, which all look sensible. Thanks.
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index d45f16d..a5f0013 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg@@ -655,7 +655,7 @@ def parse_commit(parser): # Check if the ref is supposed to be a named branch if ref.startswith('refs/heads/branches/'): - extra['branch'] = ref.replace('refs/heads/branches/', '') + extra['branch'] = ref[len('refs/heads/branches/'):] if mode == 'hg': i = data.find('\n--HG--\n')
@@ -762,7 +762,7 @@ def do_export(parser): # handle bookmarks for bmark, node in p_bmarks: - ref = 'refs/heads' + bmark + ref = 'refs/heads/' + bmark new = hghex(node) if bmark in bmarks:
diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index a3c88f6..f368953 100755
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh@@ -50,7 +50,8 @@ hg_push () { } hg_log () { - hg -R $1 log --graph --debug | grep -v 'tag: *default/' + hg -R $1 log --graph --debug >log && + grep -v 'tag: *default/' log } setup () {
@@ -62,6 +63,8 @@ setup () { echo "commit = -d \"0 0\"" echo "debugrawcommit = -d \"0 0\"" echo "tag = -d \"0 0\"" + echo "[extensions]" + echo "graphlog =" ) >> "$HOME"/.hgrc && git config --global remote-hg.hg-git-compat true
diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh
index 8c59d8e..5daad6b 100755
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh@@ -78,7 +78,8 @@ hg_push_hg () { } hg_log () { - hg -R $1 log --graph --debug | grep -v 'tag: *default/' + hg -R $1 log --graph --debug >log && + grep -v 'tag: *default/' log } git_log () {
@@ -97,6 +98,7 @@ setup () { echo "[extensions]" echo "hgext.bookmarks =" echo "hggit =" + echo "graphlog =" ) >> "$HOME"/.hgrc && git config --global receive.denycurrentbranch warn git config --global remote-hg.hg-git-compat true