D5476: merge: modify the logical statement
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sun Dec 23 22:10:33 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6faaf3a1c6ec: merge: modify the logical statement (authored by khanchi97, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5476?vs=12963&id=12964
REVISION DETAIL
https://phab.mercurial-scm.org/D5476
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1538,8 +1538,8 @@
unresolvedcount = attr.ib()
def isempty(self):
- return (not self.updatedcount and not self.mergedcount
- and not self.removedcount and not self.unresolvedcount)
+ return not (self.updatedcount or self.mergedcount
+ or self.removedcount or self.unresolvedcount)
def emptyactions():
"""create an actions dict, to be populated and passed to applyupdates()"""
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list