# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508435778 -7200
# Node ID b76fe277cef2b75191acc0f348e7653346a193c2
# Parent  1893bde71ebcf79ccbbc2e567ffe0a0e6df370ed
inhibit: respect '--keep' when handling rebase clean up

diff -r 1893bde71ebc -r b76fe277cef2 hgext3rd/evolve/hack/inhibit.py
--- 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])