Mercurial > evolve
changeset 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 | 36632d514af2 (current diff) f6099a171a9d (diff) |
| children | 4c3667220267 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
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
--- a/hgext3rd/topic/__init__.py Fri Apr 12 02:21:09 2019 +0200 +++ b/hgext3rd/topic/__init__.py Wed Apr 17 20:58:10 2019 +0200 @@ -567,12 +567,18 @@ self._extra[constants.extrakey] = '' def wrapadd(orig, cl, manifest, files, desc, transaction, p1, p2, user, - date=None, extra=None): + date=None, extra=None, p1copies=None, p2copies=None): if constants.extrakey in extra and not extra[constants.extrakey]: extra = extra.copy() del extra[constants.extrakey] + # hg <= 4.9 (0e41f40b01cc) + kwargs = {} + if p1copies is not None: + kwargs['p1copies'] = p1copies + if p2copies is not None: + kwargs['p2copies'] = p2copies return orig(cl, manifest, files, desc, transaction, p1, p2, user, - date=date, extra=extra) + date=date, extra=extra, **kwargs) # revset predicates are automatically registered at loading via this symbol revsetpredicate = topicrevset.revsetpredicate