diff hgext3rd/serverminitopic.py @ 4526:ede9b37572f0

branching: merge stable back into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Apr 2019 20:58:10 +0200
parents 5303b9128714
children f0ecf2137824
line wrap: on
line diff
--- a/hgext3rd/serverminitopic.py	Fri Apr 12 02:21:09 2019 +0200
+++ b/hgext3rd/serverminitopic.py	Wed Apr 17 20:58:10 2019 +0200
@@ -159,8 +159,13 @@
 
     def copy(self):
         """return an deep copy of the branchcache object"""
-        new = self.__class__(self, self.tipnode, self.tiprev, self.filteredhash,
-                             self._closednodes)
+        if util.safehasattr(self, '_entries'):
+            _entries = self._entries
+        else:
+            # hg <= 4.9 (624d6683c705, b137a6793c51)
+            _entries = self
+        new = self.__class__(_entries, self.tipnode, self.tiprev,
+                             self.filteredhash, self._closednodes)
         new.phaseshash = self.phaseshash
         return new