This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5476

merge: modify the logical statement
ClosedPublic

Authored by khanchi97 on Dec 23 2018, 7:47 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6faaf3a1c6ec: merge: modify the logical statement
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Dec 23 2018, 7:47 AM
Closed by commit rHG6faaf3a1c6ec: merge: modify the logical statement (authored by khanchi97). · Explain WhyDec 23 2018, 10:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (4 lines)

Diff 12964

mercurial/merge.py

@attr.s(frozen=True) @attr.s(frozen=True)
class updateresult(object): class updateresult(object):
updatedcount = attr.ib() updatedcount = attr.ib()
mergedcount = attr.ib() mergedcount = attr.ib()
removedcount = attr.ib() removedcount = attr.ib()
unresolvedcount = attr.ib() unresolvedcount = attr.ib()
def isempty(self): def isempty(self):
return (not self.updatedcount and not self.mergedcount return not (self.updatedcount or self.mergedcount
and not self.removedcount and not self.unresolvedcount) or self.removedcount or self.unresolvedcount)
def emptyactions(): def emptyactions():
"""create an actions dict, to be populated and passed to applyupdates()""" """create an actions dict, to be populated and passed to applyupdates()"""
return dict((m, []) return dict((m, [])
for m in ( for m in (
ACTION_ADD, ACTION_ADD,
ACTION_ADD_MODIFIED, ACTION_ADD_MODIFIED,
ACTION_FORGET, ACTION_FORGET,