Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 41053:6faaf3a1c6ec
merge: modify the logical statement
Differential Revision: https://phab.mercurial-scm.org/D5476
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sun, 23 Dec 2018 13:16:25 +0530 |
| parents | 54c3b4bd01f2 |
| children | 8c222bec97da |
comparison
equal
deleted
inserted
replaced
| 41052:021496277392 | 41053:6faaf3a1c6ec |
|---|---|
| 1536 mergedcount = attr.ib() | 1536 mergedcount = attr.ib() |
| 1537 removedcount = attr.ib() | 1537 removedcount = attr.ib() |
| 1538 unresolvedcount = attr.ib() | 1538 unresolvedcount = attr.ib() |
| 1539 | 1539 |
| 1540 def isempty(self): | 1540 def isempty(self): |
| 1541 return (not self.updatedcount and not self.mergedcount | 1541 return not (self.updatedcount or self.mergedcount |
| 1542 and not self.removedcount and not self.unresolvedcount) | 1542 or self.removedcount or self.unresolvedcount) |
| 1543 | 1543 |
| 1544 def emptyactions(): | 1544 def emptyactions(): |
| 1545 """create an actions dict, to be populated and passed to applyupdates()""" | 1545 """create an actions dict, to be populated and passed to applyupdates()""" |
| 1546 return dict((m, []) | 1546 return dict((m, []) |
| 1547 for m in ( | 1547 for m in ( |