This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8565

mergestate: optimize unresolvedcount() a little bit
AbandonedPublic

Authored by durin42 on May 18 2020, 6:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

It struck me as wasteful to make this extra list copy of a generator. I was
hoping to manage to return a bool instead of an int (and thus avoid traversing
the dictionary past the first unresolved entry) but at least one caller cares
about the count and this is the easy way forward while still making me
marginally happier.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.May 18 2020, 6:08 PM
durin42 updated this revision to Diff 21510.May 28 2020, 4:26 PM
durin42 updated this revision to Diff 21517.May 28 2020, 5:09 PM
marmoute added a subscriber: marmoute.Jun 8 2020, 1:58 PM

Do you have any concret performance number of case where this is an issue?

durin42 added a comment.Jun 9 2020, 4:47 PM

I don't have concrete numbers, but it avoids some function calls and uses only internal details instead of part of the public API.

We can also drop it if it's objectionable, I guess.

marmoute added a comment.Jun 10 2020, 5:35 AM

Unless we have evidence that this is performance concerns I would rather keep the simpler (code)

durin42 abandoned this revision.Jun 11 2020, 11:29 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (19 lines)

Diff 21442

mercurial/mergestate.py

ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
ACTION_KEEP = b'k' ACTION_KEEP = b'k'
ACTION_EXEC = b'e' ACTION_EXEC = b'e'
ACTION_CREATED_MERGE = b'cm' ACTION_CREATED_MERGE = b'cm'
# GET the other/remote side and store this info in mergestate # GET the other/remote side and store this info in mergestate
ACTION_GET_OTHER_AND_STORE = b'gs' ACTION_GET_OTHER_AND_STORE = b'gs'
_MERGE_UNRESOLVED_STATES = {
MERGE_RECORD_UNRESOLVED,
MERGE_RECORD_UNRESOLVED_PATH,
}
class mergestate(object): class mergestate(object):
'''track 3-way merge state of individual files '''track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with The merge state is stored on disk when needed. Two files are used: one with
an old format (version 1), and one with a new format (version 2). Version 2 an old format (version 1), and one with a new format (version 2). Version 2
stores a superset of the data in version 1, including new kinds of records stores a superset of the data in version 1, including new kinds of records
in the future. For more about the new format, see the documentation for in the future. For more about the new format, see the documentation for
`_readrecordsv2`. `_readrecordsv2`.
def mdstate(self): def mdstate(self):
return self._mdstate return self._mdstate
def unresolved(self): def unresolved(self):
"""Obtain the paths of unresolved files.""" """Obtain the paths of unresolved files."""
for f, entry in pycompat.iteritems(self._state): for f, entry in pycompat.iteritems(self._state):
if entry[0] in ( if entry[0] in _MERGE_UNRESOLVED_STATES:
MERGE_RECORD_UNRESOLVED,
MERGE_RECORD_UNRESOLVED_PATH,
):
yield f yield f
def driverresolved(self): def driverresolved(self):
"""Obtain the paths of driver-resolved files.""" """Obtain the paths of driver-resolved files."""
for f, entry in self._state.items(): for f, entry in self._state.items():
if entry[0] == MERGE_RECORD_DRIVER_RESOLVED: if entry[0] == MERGE_RECORD_DRIVER_RESOLVED:
yield f yield f
if action == ACTION_REMOVE: if action == ACTION_REMOVE:
removed += 1 removed += 1
else: else:
merged += 1 merged += 1
return updated, merged, removed return updated, merged, removed
def unresolvedcount(self): def unresolvedcount(self):
"""get unresolved count for this merge (persistent)""" """get unresolved count for this merge (persistent)"""
return len(list(self.unresolved())) return len(
[
None
for entry in pycompat.itervalues(self._state)
if entry[0] in _MERGE_UNRESOLVED_STATES
]
)
def actions(self): def actions(self):
"""return lists of actions to perform on the dirstate""" """return lists of actions to perform on the dirstate"""
actions = { actions = {
ACTION_REMOVE: [], ACTION_REMOVE: [],
ACTION_FORGET: [], ACTION_FORGET: [],
ACTION_ADD: [], ACTION_ADD: [],
ACTION_ADD_MODIFIED: [], ACTION_ADD_MODIFIED: [],