changeset 26718:806ca3a37858

rebase: directly use '_destrebase' There is little value in using the revset instead of the function.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 15 Oct 2015 01:51:53 +0100
parents 1755e1d9d1c3
children 8bed1eae99df
files hgext/rebase.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Oct 15 01:50:31 2015 +0100
+++ b/hgext/rebase.py	Thu Oct 15 01:51:53 2015 +0100
@@ -287,9 +287,11 @@
             cmdutil.checkunfinished(repo)
             cmdutil.bailifchanged(repo)
 
-            if not destf:
-                destf = '_rebasedefaultdest()'
-            dest = scmutil.revsingle(repo, destf)
+            if destf:
+                dest = scmutil.revsingle(repo, destf)
+            else:
+                dest = repo[_destrebase(repo)]
+                destf = str(dest)
 
             if revf:
                 rebaseset = scmutil.revrange(repo, revf)