# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1520133924 18000
# Node ID b1cc19e5ef2404a166803afb887e0d228f357d77
# Parent  57033b0bd347977988b9a21e297661a613eb738f# Parent  768f752b5364a12db3b791e33a48896e7d760c4e
branching: merge with stable

diff -r 57033b0bd347 -r b1cc19e5ef24 CHANGELOG
--- a/CHANGELOG	Sat Mar 03 22:12:35 2018 -0500
+++ b/CHANGELOG	Sat Mar 03 22:25:24 2018 -0500
@@ -14,6 +14,7 @@
 
   * fold: fix issue related to bookmarks movement (issue5772)
   * amend: take lock before parsing the commit description (issue5266)
+  * legacy: respect 'server.bundle1' config if any is set
 
 7.2.1 --2018-01-20
 -------------------
diff -r 57033b0bd347 -r b1cc19e5ef24 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Sat Mar 03 22:12:35 2018 -0500
+++ b/hgext3rd/evolve/__init__.py	Sat Mar 03 22:25:24 2018 -0500
@@ -416,7 +416,9 @@
         evolveopts = ['all']
         repo.ui.setconfig('experimental', 'evolution', evolveopts, 'evolve')
     if obsolete.isenabled(repo, 'exchange'):
-        repo.ui.setconfig('server', 'bundle1', False)
+        # if no config explicitly set, disable bundle1
+        if not isinstance(repo.ui.config('server', 'bundle1'), str):
+            repo.ui.setconfig('server', 'bundle1', False)
 
     class trdescrepo(repo.__class__):
 
diff -r 57033b0bd347 -r b1cc19e5ef24 hgext3rd/evolve/serveronly.py
--- a/hgext3rd/evolve/serveronly.py	Sat Mar 03 22:12:35 2018 -0500
+++ b/hgext3rd/evolve/serveronly.py	Sat Mar 03 22:25:24 2018 -0500
@@ -58,4 +58,6 @@
         evolveopts = 'all'
         repo.ui.setconfig('experimental', 'evolution', evolveopts)
     if obsolete.isenabled(repo, 'exchange'):
-        repo.ui.setconfig('server', 'bundle1', False)
+        # if no config explicitly set, disable bundle1
+        if not isinstance(repo.ui.config('server', 'bundle1'), str):
+            repo.ui.setconfig('server', 'bundle1', False)
diff -r 57033b0bd347 -r b1cc19e5ef24 hgext3rd/serverminitopic.py
--- a/hgext3rd/serverminitopic.py	Sat Mar 03 22:12:35 2018 -0500
+++ b/hgext3rd/serverminitopic.py	Sat Mar 03 22:25:24 2018 -0500
@@ -68,7 +68,7 @@
     def branchinfo(self, rev):
         """return branch name and close flag for rev, using and updating
         persistent cache."""
-        phase = self._repo._phasecache.phase(self, rev)
+        phase = self._repo._phasecache.phase(self._repo, rev)
         if phase:
             ctx = self._repo[rev]
             return ctx.branch(), ctx.closesbranch()