Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 03 Mar 2018 22:25:24 -0500
changeset 3513 b1cc19e5ef24
parent 3512 57033b0bd347 (current diff)
parent 3511 768f752b5364 (diff)
child 3514 498f782ccb4b
branching: merge with stable
CHANGELOG file | annotate | diff | comparison | revisions
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- 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
 -------------------
--- 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__):
 
--- 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)
--- 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()
evolve