Mercurial > public > mercurial-scm > evolve

diff src/topic/__init__.py @ 1885:d49f75eab6a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: take topic in account for all branch head computation This changeset introduce a "topicmap" that is tracking not just the head of all branches, but the heads of all branch+topic pair. Including the head of the part of the branch without any topic. In practice this means that BRANCHNAME now resolve to the tipmost part for the branch without topic and impact various other logic like head checking during push and default destination for update and merge (these aspect will need adjustment in later changesets). The on-the-fly-temporary-monkey-patching process is pretty horrible, but allow to move forward without waiting on having core patched. We use 'branch:topic' as the branchmap key, this is a small and easy hack that help use a lot for (future) support of heads discovery/checking and on disc cache. I'm not sure it is worthwhile to improve this until an implementation into core. Note that this changeset change the branchmap in all cases, including during exchange, see next changeset for improved behavior. We also currently have the on-disk cache disabled because the core branchmap is lacking phase information in its cache key. This will get done in a later changesets
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 12 Mar 2016 15:36:17 +0000
parents 8a53f99d9061
children 0504e76bfbd9
line wrap: on
line diff
--- a/src/topic/__init__.py	Mon Mar 14 20:18:09 2016 -0400
+++ b/src/topic/__init__.py	Sat Mar 12 15:36:17 2016 +0000
@@ -26,10 +26,12 @@
 from mercurial import patch
 from mercurial import phases
 from mercurial import util
+from mercurial import branchmap
 
 from . import constants
 from . import revset as topicrevset
 from . import destination
+from . import topicmap
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
@@ -92,6 +94,29 @@
         def currenttopic(self):
             return self.vfs.tryread('topic')
 
+        def branchmap(self, topic=True):
+            if not topic:
+                super(topicrepo, self).branchmap()
+            oldbranchcache = branchmap.branchcache
+            oldfilename = branchmap._filename
+            oldcaches =  getattr(self, '_branchcaches', {})
+            try:
+                branchmap.branchcache = topicmap.topiccache
+                branchmap._filename = topicmap._filename
+                self._branchcaches = getattr(self, '_topiccaches', {})
+                branchmap.updatecache(self)
+                self._topiccaches = self._branchcaches
+                return self._topiccaches[self.filtername]
+            finally:
+                self._branchcaches = oldcaches
+                branchmap.branchcache = oldbranchcache
+                branchmap._filename = oldfilename
+
+        def invalidatecaches(self):
+            super(topicrepo, self).invalidatecaches()
+            if '_topiccaches' in vars(self.unfiltered()):
+                self.unfiltered()._topiccaches.clear()
+
     repo.__class__ = topicrepo
     if util.safehasattr(repo, 'names'):
         repo.names.addnamespace(namespaces.namespace(