# HG changeset patch
# User liscju <piotr.listkiewicz@gmail.com>
# Date 2015-11-15 21:18:48
# Node ID 6979fe2a6d75105affcacd9e298262a92641cb98
# Parent  ed5f20f9c22e85f31b5784e09bf08460fc2f0f94

rebase: add returning value from pullrebase function

So far pullrebase function has always returned None value, no matter
what orig function returned. This behaviour made impossible for
pull to change returned value from mercurial process (it has always
ended with 0 value by default). This patch makes pullrebase returning
with returned value from orig.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1096,6 +1096,7 @@ def clearrebased(ui, repo, state, skippe
 
 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:
@@ -1113,7 +1114,7 @@ def pullrebase(orig, ui, repo, *args, **
                 pass
             commands.postincoming = _dummy
             try:
-                orig(ui, repo, *args, **opts)
+                ret = orig(ui, repo, *args, **opts)
             finally:
                 commands.postincoming = origpostincoming
             revspostpull = len(repo)
@@ -1140,7 +1141,9 @@ def pullrebase(orig, ui, repo, *args, **
     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