diff mercurial/commands.py @ 26968:216cc65cf227

pull: return 255 value on update failure (issue4948) (BC)

Before this patch hg pull -u on UpdateAbort error returned
0 value to the system. This patch fixes this by reraising
UpdateAbort with updated error msg.

--- a/mercurial/commands.py	Wed Nov 11 10:19:11 2015 -0800
+++ b/mercurial/commands.py	Sun Nov 15 22:58:28 2015 +0100
@@ -5227,10 +5227,9 @@
                 checkout, movemarkfrom, brev = updata
             ret = hg.update(repo, checkout)
         except error.UpdateAbort as inst:
-            ui.warn(_("not updating: %s\n") % str(inst))
-            if inst.hint:
-                ui.warn(_("(%s)\n") % inst.hint)
-            return 0
+            msg = _("not updating: %s") % str(inst)
+            hint = inst.hint
+            raise error.UpdateAbort(msg, hint=hint)
         if not ret and not checkout:
             if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                 ui.status(_("updating bookmark %s\n") % repo._activebookmark)