[PATCH 37/47] remote-hg: force remote bookmark push selectively

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

May 14, 2013, 04:37 UTC

Message-ID

<1368506230-19614-38-git-send-email-felipe.contreras@gmail.com>

In-Reply-To

<1368506230-19614-1-git-send-email-felipe.contreras@gmail.com>

Let's do that only when forced push is configured.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 14fadd1..0780679 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -906,7 +906,8 @@ def do_export(parser):
         # update remote bookmarks
         remote_bmarks = peer.listkeys('bookmarks')
         for ref, bmark, old, new in p_bmarks:
-            old = remote_bmarks.get(bmark, '')
+            if force_push:
+                old = remote_bmarks.get(bmark, '')
             if not peer.pushkey('bookmarks', bmark, old, new):
                 print "error %s" % ref
     else:

-- 
1.8.3.rc1.579.g184e698