This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8919

mergestate: use collections.defaultdict(dict) for _stateextras
ClosedPublic

Authored by pulkit on Aug 10 2020, 7:17 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHGede4c121239e: mergestate: use collections.defaultdict(dict) for _stateextras
Summary

I want to use this _stateextras more in upcoming patches to store some commit
time related information. Using defaultdict will help in cleaner code around
checking whether a file exists or not.

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

pulkit created this revision.Aug 10 2020, 7:17 AM
marmoute accepted this revision.Aug 10 2020, 1:14 PM
indygreg added a subscriber: indygreg.Aug 10 2020, 9:06 PM
indygreg added inline comments.
mercurial/mergestate.py
701

This changes behavior so pop() will raise KeyError on a missing key. Is this desired?

pulkit marked an inline comment as done.Aug 11 2020, 3:45 AM
pulkit updated this revision to Diff 22391.
pulkit added inline comments.Aug 11 2020, 3:47 AM
mercurial/mergestate.py
701

Nope. It's was my wrong understanding of collections.defaultdict(). Fixed it.

pulkit added a comment.Aug 19 2020, 8:54 AM

Gente ping for review.

indygreg accepted this revision.Aug 22 2020, 6:41 PM
This revision is now accepted and ready to land.Aug 22 2020, 6:41 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (7 lines)

Diff 22422

mercurial/mergestate.py

from __future__ import absolute_import from __future__ import absolute_import
import collections
import errno import errno
import shutil import shutil
import struct import struct
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
Do not use this directly! Instead call read() or clean().""" Do not use this directly! Instead call read() or clean()."""
self._repo = repo self._repo = repo
self._dirty = False self._dirty = False
self._labels = None self._labels = None
def reset(self, node=None, other=None, labels=None): def reset(self, node=None, other=None, labels=None):
self._state = {} self._state = {}
self._stateextras = {} self._stateextras = collections.defaultdict(dict)
self._local = None self._local = None
self._other = None self._other = None
self._labels = labels self._labels = labels
for var in ('localctx', 'otherctx'): for var in ('localctx', 'otherctx'):
if var in vars(self): if var in vars(self):
delattr(self, var) delattr(self, var)
if node: if node:
self._local = node self._local = node
def _read(self): def _read(self):
"""Analyse each record content to restore a serialized state from disk """Analyse each record content to restore a serialized state from disk
This function process "record" entry produced by the de-serialization This function process "record" entry produced by the de-serialization
of on disk file. of on disk file.
""" """
self._state = {} self._state = {}
self._stateextras = {} self._stateextras = collections.defaultdict(dict)
self._local = None self._local = None
self._other = None self._other = None
for var in ('localctx', 'otherctx'): for var in ('localctx', 'otherctx'):
if var in vars(self): if var in vars(self):
delattr(self, var) delattr(self, var)
self._readmergedriver = None self._readmergedriver = None
self._mdstate = MERGE_DRIVER_STATE_SUCCESS self._mdstate = MERGE_DRIVER_STATE_SUCCESS
unsupported = set() unsupported = set()
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
def extras(self, filename): def extras(self, filename):
return self._stateextras.setdefault(filename, {}) return self._stateextras[filename]
def _resolve(self, preresolve, dfile, wctx): def _resolve(self, preresolve, dfile, wctx):
"""rerun merge process for file path `dfile`. """rerun merge process for file path `dfile`.
Returns whether the merge was completed and the return value of merge Returns whether the merge was completed and the return value of merge
obtained from filemerge._filemerge(). obtained from filemerge._filemerge().
""" """
if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED): if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
return True, 0 return True, 0
fcd, fcd,
fco, fco,
fca, fca,
labels=self._labels, labels=self._labels,
) )
if merge_ret is None: if merge_ret is None:
# If return value of merge is None, then there are no real conflict # If return value of merge is None, then there are no real conflict
del self._state[dfile] del self._state[dfile]
self._stateextras.pop(dfile, None) self._stateextras.pop(dfile, None)
indygregUnsubmitted
Done

This changes behavior so pop() will raise KeyError on a missing key. Is this desired?

indygreg: This changes behavior so `pop()` will raise `KeyError` on a missing key. Is this desired?
pulkitAuthorUnsubmitted
Done

Nope. It's was my wrong understanding of collections.defaultdict(). Fixed it.

pulkit: Nope. It's was my wrong understanding of `collections.defaultdict()`. Fixed it.
self._dirty = True self._dirty = True
elif not merge_ret: elif not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED) self.mark(dfile, MERGE_RECORD_RESOLVED)
if complete: if complete:
action = None action = None
if deleted: if deleted:
if fcd.isabsent(): if fcd.isabsent():