[PATCH 6 of 8] rebase: remove unecessary rebasestate file check in summary hook
Christian Delahousse
cdelahousse at fb.com
Thu Oct 15 21:33:35 CDT 2015
# HG changeset patch
# User Christian Delahousse <cdelahousse at fb.com>
# Date 1444949712 25200
# Thu Oct 15 15:55:12 2015 -0700
# Node ID e717eac5fb915f0d7c31db9559dd866a57b0f0c0
# Parent 73fa24b0b32b6b65f3c3c71d066f54e149b69b87
rebase: remove unecessary rebasestate file check in summary hook
Since restorestatus returns None when no rebasestate file exists, there's no
need for a check in the summary hook. This fix just tests to see that what
restorestatus isn't Falsey
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1210,10 +1210,11 @@
return obsoletenotrebased
def summaryhook(ui, repo):
- if not os.path.exists(repo.join('rebasestate')):
- return
try:
- state = restorestatus(repo)[2]
+ result = restorestatus(repo)
+ if not result:
+ return
+ state = result[2]
except error.RepoLookupError:
# i18n: column positioning for "hg summary"
msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n')
More information about the Mercurial-devel
mailing list