Mercurial > hg
changeset 28234:2c29f157463e
destutil: remove redundant examination
Before this patch, "len(heads) != len(otherheads)" is examined to
detect whether message should be displayed or not.
But if "repo.revs('%ln and parents()', heads)", heads should contain
"parents()" and otherheads is always less than heads.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 24 Feb 2016 23:00:32 +0900 |
| parents | 9da2283d0c56 |
| children | c2f0a47069ef |
| files | mercurial/destutil.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/destutil.py Wed Feb 24 23:00:32 2016 +0900 +++ b/mercurial/destutil.py Wed Feb 24 23:00:32 2016 +0900 @@ -357,11 +357,10 @@ def _statusotherbranchheads(ui, repo): currentbranch = repo.dirstate.branch() heads = repo.branchheads(currentbranch) - l = len(heads) if repo.revs('%ln and parents()', heads): # we are on a head otherheads = repo.revs('%ln - parents()', heads) - if otherheads and l != len(otherheads): + if otherheads: ui.status(_('%i other heads for branch "%s"\n') % (len(otherheads), currentbranch))