This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1898

localrepo: consistently use native str when __dict__ is involved
ClosedPublic

Authored by durin42 on Jan 18 2018, 8:39 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9dad46c23185: localrepo: consistently use native str when __dict__ is involved
rHG5a34d8b667c1: localrepo: consistently use native str when __dict__ is involved
Summary
  1. skip-blame just a bytes prefix

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jan 18 2018, 8:39 AM
pulkit accepted this revision.Jan 18 2018, 9:00 AM
durin42 edited the summary of this revision. (Show Details)Jan 18 2018, 1:37 PM
pulkit added a comment.Jan 19 2018, 1:23 AM

I think this should not be a skip-blame. We are adding a call to pycompat.sysstr too.

durin42 updated this revision to Diff 4950.Jan 19 2018, 3:12 PM
pulkit accepted this revision.Jan 20 2018, 5:20 AM

Looks good, the skip-blame part in commit message can be dropped during flight.

durin42 updated this revision to Diff 5043.Feb 1 2018, 3:05 PM
indygreg accepted this revision.Feb 1 2018, 3:38 PM
indygreg added a subscriber: indygreg.

Dropped skip-blame in flight.

This revision is now accepted and ready to land.Feb 1 2018, 3:38 PM
Closed by commit rHG5a34d8b667c1: localrepo: consistently use native str when __dict__ is involved (authored by durin42). · Explain WhyFeb 1 2018, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)

Diff 5043

mercurial/localrepo.py

# extension should hook this to invalidate its caches # extension should hook this to invalidate its caches
self.invalidate() self.invalidate()
self.invalidatedirstate() self.invalidatedirstate()
@unfilteredmethod @unfilteredmethod
def _refreshfilecachestats(self, tr): def _refreshfilecachestats(self, tr):
"""Reload stats of cached files so that they are flagged as valid""" """Reload stats of cached files so that they are flagged as valid"""
for k, ce in self._filecache.items(): for k, ce in self._filecache.items():
if k == 'dirstate' or k not in self.__dict__: k = pycompat.sysstr(k)
if k == r'dirstate' or k not in self.__dict__:
continue continue
ce.refresh() ce.refresh()
def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc, def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc,
inheritchecker=None, parentenvvar=None): inheritchecker=None, parentenvvar=None):
parentlock = None parentlock = None
# the contents of parentenvvar are used by the underlying lock to # the contents of parentenvvar are used by the underlying lock to
# determine whether it can be inherited # determine whether it can be inherited