remote-bzr: support the new 'force' option

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 054161ae21b0c884d314c984992a6c7aa8276a96..f1ba477fb8f75eb646befd80feb9af08b10b8d35 100755 (executable)
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -685,7 +685,8 @@ def do_export(parser):
                 peer = bzrlib.branch.Branch.open(peers[name],
                                                  possible_transports=transports)
                 try:
                 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
                 except bzrlib.errors.DivergedBranches:
                     print "error %s non-fast forward" % ref
                     continue


@@ -719,8 +720,32 @@ def do_capabilities(parser):
         print "*import-marks %s" % path
     print "*export-marks %s" % path
 
         print "*import-marks %s" % path
     print "*export-marks %s" % path
 

+    print "option"

     print
 
     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 '~^: \\']
 
 def ref_is_valid(name):
     return not True in [c in name for c in '~^: \\']
 


@@ -883,6 +908,7 @@ def main(args):
     global is_tmp
     global branches, peers
     global transports
     global is_tmp
     global branches, peers
     global transports

+    global force

 
     alias = args[1]
     url = args[2]
 
     alias = args[1]
     url = args[2]


@@ -896,6 +922,7 @@ def main(args):
     branches = {}
     peers = {}
     transports = []
     branches = {}
     peers = {}
     transports = []

+    force = False

 
     if alias[5:] == url:
         is_tmp = True
 
     if alias[5:] == url:
         is_tmp = True


@@ -931,6 +958,8 @@ def main(args):
             do_import(parser)
         elif parser.check('export'):
             do_export(parser)
             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()
         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 5c5025178370813aabec64c8bfbd7ac59c6186a5..ae26dbb2e9605e939ab4c478537d98949025363d 100755 (executable)
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -65,13 +65,33 @@ test_expect_success 'pushing' '
        test_cmp expected actual
 '
 
        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
        ) &&
 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) &&
        test_cmp expected actual &&
 
        (cd gitrepo && git push && git pull) &&