Patchwork D2874: remotenames: synchronise remotenames after push also

login
register
mail settings
Submitter phabricator
Date March 26, 2018, 11:47 a.m.
Message ID <4fd617f8825e04848ee186599cf62406@localhost.localdomain>
Download mbox | patch
Permalink /patch/29858/
State Not Applicable
Headers show

Comments

phabricator - March 26, 2018, 11:47 a.m.
pulkit updated this revision to Diff 7287.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2874?vs=7250&id=7287

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

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

CHANGE DETAILS




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

Patch

diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t
--- a/tests/test-logexchange.t
+++ b/tests/test-logexchange.t
@@ -457,20 +457,21 @@ 
      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
+  |  hoisted name:  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
   |  bookmark:    foo
   |  remote branch:  $TESTTMP/server2/wat
-  |  remote branch:  default/wat
   |  parent:      4:aa98ab95a928
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -503,8 +504,6 @@ 
   |
   o  changeset:   3:62615734edd5
   |  remote bookmark:  $TESTTMP/server2/foo
-  |  remote bookmark:  default/foo
-  |  hoisted name:  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
@@ -487,6 +487,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