[PATCH 2 of 8] rebase: during abort add warning to user on any exception
Christian Delahousse
cdelahousse at fb.com
Thu Oct 15 21:33:31 CDT 2015
# HG changeset patch
# User Christian Delahousse <cdelahousse at fb.com>
# Date 1444944088 25200
# Thu Oct 15 14:21:28 2015 -0700
# Node ID 1dd6fe8f95da7735de7485d5145a2c389860e387
# Parent c3787f7156bdbb6d5f7c6e2540248b911162c0b3
rebase: during abort add warning to user on any exception
If an exception happens during an --abort, the user should be notified to check
their repo. This patch will do so by catching, warning the user, and then
rethrowing.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -963,6 +963,11 @@
if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark)
+ except Exception:
+ repo.ui.warn(_('warning: encountered an exception during rebase '
+ '--abort; the repository may not have been completely '
+ 'cleaned up\n'))
+ raise
finally:
clearstatus(repo)
repo.ui.warn(_('rebase aborted\n'))
More information about the Mercurial-devel
mailing list