changeset 3077:b76fe277cef2 stable

inhibit: respect '--keep' when handling rebase clean up
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 19 Oct 2017 19:56:18 +0200
parents 1893bde71ebc
children 1e29cdd9c022 b3efdd407f30 e6455324fc65
files hgext3rd/evolve/hack/inhibit.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/hack/inhibit.py	Sat Oct 14 18:55:43 2017 +0200
+++ b/hgext3rd/evolve/hack/inhibit.py	Thu Oct 19 19:56:18 2017 +0200
@@ -236,8 +236,11 @@
     repo._obsoletenotrebased = r.keys()
     return r
 
-def _clearrebased(orig, ui, repo, *args, **kwargs):
-    r = orig(ui, repo, *args, **kwargs)
+def _clearrebased(orig, ui, repo, dest, state, skipped, collapsedas=None,
+                  keepf=False):
+    r = orig(ui, repo, dest, state, skipped, collapsedas, keepf)
+    if keepf:
+        return r
     tonode = repo.changelog.node
     if util.safehasattr(repo, '_obsoletenotrebased'):
         _deinhibitmarkers(repo, [tonode(k) for k in repo._obsoletenotrebased])