D2874: remotenames: synchronise remotenames after push also

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Thu Mar 15 13:49:49 UTC 2018


pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Earlier we use to pull remotenames information from the server in case of pull
  and clone only. This patch adds logic to push also command to pull remotenames
  information.
  
  This will help us in keeping the remotenames more upto date where there are a
  lot people changing state of branches and bookmarks at the server.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2874

AFFECTED FILES
  mercurial/exchange.py
  tests/test-logexchange.t

CHANGE DETAILS

diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t
--- a/tests/test-logexchange.t
+++ b/tests/test-logexchange.t
@@ -376,19 +376,19 @@
      bar                       6:87d6d6676308
      foo                       9:aa6a885086c0
 
-XXX: remotebookmarks should have been updated after this push
   $ hg log -G
   @  changeset:   9:aa6a885086c0
   |  branch:      wat
   |  tag:         tip
+  |  remote bookmark:  default/foo
+  |  remote branch:  default/wat
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     added foobar
   |
   o  changeset:   8:3e1487808078
   |  branch:      wat
   |  remote branch:  $TESTTMP/server2/wat
-  |  remote branch:  default/wat
   |  parent:      4:aa98ab95a928
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -422,7 +422,6 @@
   o  changeset:   3:62615734edd5
   |  bookmark:    foo
   |  remote bookmark:  $TESTTMP/server2/foo
-  |  remote bookmark:  default/foo
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Added d
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -484,6 +484,9 @@
         _pushobsolete(pushop)
         _pushbookmark(pushop)
 
+    if repo.ui.configbool('experimental', 'remotenames'):
+        logexchange.pullremotenames(repo, remote)
+
     return pushop
 
 # list of steps to perform discovery before push



To: pulkit, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list