Signed-off-by: Richard Hansen rhan...@bbn.com
---
This is a reroll of:
http://article.gmane.org/gmane.comp.version-control.git/237607
based on feedback from Felipe:
http://article.gmane.org/gmane.comp.version-control.git/237615
This patch is an optional extension to Felipe's transport-helper:
updates patch series:
http://thread.gmane.org/gmane.comp.version-control.git/237663
and it requires those changes to work.
contrib/remote-helpers/git-remote-bzr | 32 +++-
contrib/remote-helpers/test-bzr.sh| 22 +-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr
b/contrib/remote-helpers/git-remote-bzr
index 7e34532..2f481e9 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -42,6 +42,7 @@ import json
import re
import StringIO
import atexit, shutil, hashlib, urlparse, subprocess
+import types
NAME_RE = re.compile('^([^]+)')
AUTHOR_RE = re.compile('^([^]+?)? ?[]([^]*)(?:$|)')
@@ -684,7 +685,8 @@ def do_export(parser):
peer = bzrlib.branch.Branch.open(peers[name],
possible_transports=transports)
try:
-peer.bzrdir.push_branch(branch, revision_id=revid)
+peer.bzrdir.push_branch(branch, revision_id=revid,
+overwrite=force)
except bzrlib.errors.DivergedBranches:
print error %s non-fast forward % ref
continue
@@ -718,8 +720,32 @@ def do_capabilities(parser):
print *import-marks %s % path
print *export-marks %s % path
+print option
print
+class InvalidOptionValue(Exception):
+pass
+
+def get_bool_option(val):
+if val == 'true':
+return True
+elif val == 'false':
+return False
+else:
+raise InvalidOptionValue()
+
+def do_option(parser):
+global force
+(opt, val) = parser[1:3]
+try:
+if opt == 'force':
+force = get_bool_option(val)
+print 'ok'
+else:
+print 'unsupported'
+except InvalidOptionValue:
+print error '%s' is not a valid value for option '%s' % (val, opt)
+
def ref_is_valid(name):
return not True in [c in name for c in '~^: \\']
@@ -882,6 +908,7 @@ def main(args):
global is_tmp
global branches, peers
global transports
+global force
alias = args[1]
url = args[2]
@@ -895,6 +922,7 @@ def main(args):
branches = {}
peers = {}
transports = []
+force = False
if alias[5:] == url:
is_tmp = True
@@ -930,6 +958,8 @@ def main(args):
do_import(parser)
elif parser.check('export'):
do_export(parser)
+elif parser.check('option'):
+do_option(parser)
else:
die('unhandled command: %s' % line)
sys.stdout.flush()
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
index 1e53ff9..4f379c2 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -66,13 +66,33 @@ test_expect_success 'pushing' '
test_cmp expected actual
'
+test_expect_success 'forced pushing' '
+ (
+ cd gitrepo
+ echo three-new content
+ git commit -a --amend -m three-new
+ git push -f
+ )
+
+ (
+ cd bzrrepo
+ # the forced update overwrites the bzr branch but not the bzr
+ # working directory (it tries to merge instead)
+ bzr revert
+ )
+
+ echo three-new expected
+ cat bzrrepo/content actual
+ test_cmp expected actual
+'
+
test_expect_success 'roundtrip' '
(
cd gitrepo
git pull
git log --format=%s -1 origin/master actual
)
- echo three expected
+ echo three-new expected
test_cmp expected actual
(cd gitrepo git push git pull)
--
1.8.5.rc1.208.g8ff7964
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
