Mercurial > evolve
changeset 3437:98e889782c86 mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Jan 2018 12:28:53 +0100 |
| parents | b21a3753255f (current diff) f4accec7c547 (diff) |
| children | 7ac98f83ae6d |
| files | tests/test-discovery-obshashrange.t |
| diffstat | 7 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jan 16 04:41:48 2018 +0100 +++ b/.hgtags Sat Jan 20 12:28:53 2018 +0100 @@ -62,3 +62,4 @@ c56c028f3802202241551e5953bea74ab3a6c434 7.0.0 c4940c22d76b9c6b3c2117a3b490f3c4fd796972 7.0.1 06a3cb59495636df8b567e49a0fd7fd8fd823074 7.1.0 +bf6b859807bac23752a26e58876fe3a4a9a2fef8 7.2.0
--- a/CHANGELOG Tue Jan 16 04:41:48 2018 +0100 +++ b/CHANGELOG Sat Jan 20 12:28:53 2018 +0100 @@ -1,6 +1,13 @@ Changelog ========= +7.2.1 - in progress +------------------- + + * compatibility with future Mercurial 4.5 + * fix a packaging issue affect `hg evolve --continue` + * fix "automatic" cache warming mode for push (client side) + 7.2.0 -- 2018-01-15 -------------------
--- a/hgext3rd/evolve/__init__.py Tue Jan 16 04:41:48 2018 +0100 +++ b/hgext3rd/evolve/__init__.py Sat Jan 20 12:28:53 2018 +0100 @@ -809,6 +809,10 @@ @eh.wrapcommand("unbundle") def warnobserrors(orig, ui, repo, *args, **kwargs): """display warning is the command resulted in more instable changeset""" + # hg < 4.4 does not have the feature built in. bail out otherwise. + if util.safehasattr(scmutil, '_reportstroubledchangesets'): + return orig(ui, repo, *args, **kwargs) + # part of the troubled stuff may be filtered (stash ?) # This needs a better implementation but will probably wait for core. filtered = repo.changelog.filteredrevs
--- a/hgext3rd/evolve/metadata.py Tue Jan 16 04:41:48 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Sat Jan 20 12:28:53 2018 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '7.2.0' +__version__ = '7.2.1.dev' testedwith = '4.1.3 4.2.3 4.3.2 4.4.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/utility.py Tue Jan 16 04:41:48 2018 +0100 +++ b/hgext3rd/evolve/utility.py Sat Jan 20 12:28:53 2018 +0100 @@ -42,7 +42,14 @@ config = repo.ui.config desc = getattr(tr, 'desc', '') - autocase = tr is None or desc.startswith('push') or desc.startswith('serve') + autocase = False + if tr is None: + autocase = True + elif desc.startswith('serve'): + autocase = True + elif desc.startswith('push') and not desc.startswith('push-response'): + autocase = True + autocache = config('experimental', 'obshashrange.warm-cache', 'auto') == 'auto' if autocache: