hgext/rebase.py
changeset 27010 f4fec0940278
parent 26902 7ffebbdcb371
parent 26960 6979fe2a6d75
child 27012 5eac7ab59b95
--- a/hgext/rebase.py	Sun Nov 01 14:43:25 2015 +0900
+++ b/hgext/rebase.py	Wed Nov 18 20:59:17 2015 -0600
@@ -1104,6 +1104,7 @@
 
 def pullrebase(orig, ui, repo, *args, **opts):
     'Call rebase after pull if the latter has been invoked with --rebase'
+    ret = None
     if opts.get('rebase'):
         wlock = lock = None
         try:
@@ -1121,7 +1122,7 @@
                 pass
             commands.postincoming = _dummy
             try:
-                orig(ui, repo, *args, **opts)
+                ret = orig(ui, repo, *args, **opts)
             finally:
                 commands.postincoming = origpostincoming
             revspostpull = len(repo)
@@ -1148,7 +1149,9 @@
     else:
         if opts.get('tool'):
             raise error.Abort(_('--tool can only be used with --rebase'))
-        orig(ui, repo, *args, **opts)
+        ret = orig(ui, repo, *args, **opts)
+
+    return ret
 
 def _setrebasesetvisibility(repo, revs):
     """store the currently rebased set on the repo object