Patchwork [4,of,8,V11] bundle2: add `bookmarks` part handler

login
register
mail settings
Submitter Stanislau Hlebik
Date Nov. 22, 2016, 10:17 a.m.
Message ID <1572af8f4545b11c8147.1479809866@devvm957.lla2.facebook.com>
Download mbox | patch
Permalink /patch/17694/
State Superseded
Headers show

Comments

Stanislau Hlebik - Nov. 22, 2016, 10:17 a.m.
# HG changeset patch
# User Stanislau Hlebik <stash@fb.com>
# Date 1479807361 28800
#      Tue Nov 22 01:36:01 2016 -0800
# Node ID 1572af8f4545b11c8147170cb421c23547d918fc
# Parent  36d83269edc51168908c9b1160e22282ab6c5c04
bundle2: add `bookmarks` part handler

Applies bookmarks part to the local repo. `processbookmarksmode` determines
how remote bookmarks are handled. They are either ignored ('ignore' mode),
diverged ('diverge' mode) or applied ('apply' mode).

Patch

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -155,6 +155,7 @@ 
 
 from .i18n import _
 from . import (
+    bookmarks as bookmod,
     changegroup,
     error,
     obsolete,
@@ -287,13 +288,19 @@ 
     * a way to construct a bundle response when applicable.
     """
 
-    def __init__(self, repo, transactiongetter, captureoutput=True):
+    def __init__(self, repo, transactiongetter, captureoutput=True,
+                 behavior=None):
+        """
+        `behavior` is a dictionary that is passed to part handlers to tweak
+        their behaviour
+        """
         self.repo = repo
         self.ui = repo.ui
         self.records = unbundlerecords()
         self.gettransaction = transactiongetter
         self.reply = None
         self.captureoutput = captureoutput
+        self.behavior = behavior or {}
 
 class TransactionUnavailable(RuntimeError):
     pass
@@ -1616,3 +1623,35 @@ 
 
     cache.write()
     op.ui.debug('applied %i hgtags fnodes cache entries\n' % count)
+
+@parthandler('bookmarks')
+def handlebookmarks(op, inpart):
+    """Processes bookmarks part.
+
+    `processbookmarksmode` determines how remote bookmarks are handled. They are
+    either ignored ('ignore' mode), diverged ('diverge' mode) or applied
+    ('apply' mode). 'ignore' mode is used to get bookmarks and process them
+    later, 'diverge' mode is used to process bookmarks during pull, 'apply'
+    mode is used during push.
+    """
+
+    bookmarks = bookmod.decodebookmarks(inpart.read())
+    processbookmarksmode = op.behavior.get('processbookmarksmode', 'ignore')
+    if processbookmarksmode == 'apply':
+        for bookmark, node in bookmarks.items():
+            if node:
+                op.repo._bookmarks[bookmark] = node
+            else:
+                try:
+                    del op.repo._bookmarks[bookmark]
+                except KeyError:
+                    # ignore if bookmark does not exist
+                    pass
+        op.repo._bookmarks.recordchange(op.gettransaction())
+    elif processbookmarksmode == 'diverge':
+        remotepath = op.behavior.get('remotepath', '')
+        explicitbookmarks = op.behavior.get('explicitbookmarks', ())
+        bookmod.updatefromremote(op.ui, op.repo, bookmarks,
+                                 remotepath, op.gettransaction,
+                                 explicit=explicitbookmarks)
+    op.records.add('bookmarks', bookmarks)