Mercurial > evolve
changeset 1488:3dec62fc266e
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 10 Aug 2015 00:44:53 -0700 |
| parents | 1ba64be11bf8 (current diff) ee5391999f2d (diff) |
| children | 8f469f81129c |
| files | hgext/evolve.py hgext/inhibit.py |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Sat Aug 08 12:42:57 2015 -0700 +++ b/hgext/evolve.py Mon Aug 10 00:44:53 2015 -0700 @@ -2070,7 +2070,7 @@ result = 1 else: aspchildren = _aspiringchildren(repo, [repo['.'].rev()]) - if not opts['evolve']: + if not opts['evolve'] or not aspchildren: ui.warn(_('no children\n')) if aspchildren: msg = _('(%i unstable changesets to be evolved here, '
--- a/hgext/inhibit.py Sat Aug 08 12:42:57 2015 -0700 +++ b/hgext/inhibit.py Mon Aug 10 00:44:53 2015 -0700 @@ -166,7 +166,7 @@ finally: lockmod.release(tr, lock) -def transactioncallback(orig, repo, *args, **kwargs): +def transactioncallback(orig, repo, desc, *args, **kwargs): """ Wrap localrepo.transaction to inhibit new obsolete changes """ def inhibitposttransaction(transaction): # At the end of the transaction we catch all the new visible and @@ -176,8 +176,9 @@ visibleobsolete = list(r for r in visibleobsolete if r not in ignoreset) if visibleobsolete: _inhibitmarkers(repo, [repo[r].node() for r in visibleobsolete]) - transaction = orig(repo, *args, **kwargs) - transaction.addpostclose('inhibitposttransaction', inhibitposttransaction) + transaction = orig(repo, desc, *args, **kwargs) + if desc != 'strip': + transaction.addpostclose('inhibitposttransaction', inhibitposttransaction) return transaction def extsetup(ui):