This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8908

store: refactor space delimited list to proper tuple
ClosedPublic

Authored by pulkit on Aug 7 2020, 8:44 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG909dafff6a78: store: refactor space delimited list to proper data structure
Summary

There is no good reason why are having a space delimited list and then using
.split() to get the actual list. Let's convert this into a proper tuple.

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 7 2020, 8:44 AM
indygreg accepted this revision.Aug 8 2020, 1:01 PM
This revision is now accepted and ready to land.Aug 8 2020, 1:01 PM
indygreg added inline comments.Aug 8 2020, 1:13 PM
mercurial/store.py
458
+    File "/home/gps/src/hg-committed/mercurial/store.py", line 458, in copylist
+      return [b'requires'] + _data
+  TypeError: can only concatenate list (not "tuple") to list

I think I'll just change _data to a list in-flight.

Revision Contents
Changeset List

Diff 22351

mercurial/store.py

# avoid some useless chmods # avoid some useless chmods
if (0o777 & ~util.umask) == (0o777 & mode): if (0o777 & ~util.umask) == (0o777 & mode):
mode = None mode = None
except OSError: except OSError:
mode = None mode = None
return mode return mode
_data = ( _data = [
b'bookmarks narrowspec data meta 00manifest.d 00manifest.i' b'bookmarks',
b' 00changelog.d 00changelog.i phaseroots obsstore' b'narrowspec',
) b'data',
b'meta',
b'00manifest.d',
b'00manifest.i',
b'00changelog.d',
b'00changelog.i',
b'phaseroots',
b'obsstore',
]
def isrevlog(f, kind, st): def isrevlog(f, kind, st):
return kind == stat.S_IFREG and f[-2:] in (b'.i', b'.d') return kind == stat.S_IFREG and f[-2:] in (b'.i', b'.d')
class basicstore(object): class basicstore(object):
'''base class for local repository stores''' '''base class for local repository stores'''
''' '''
# yield data files first # yield data files first
for x in self.datafiles(matcher): for x in self.datafiles(matcher):
yield x yield x
for x in self.topfiles(): for x in self.topfiles():
yield x yield x
def copylist(self): def copylist(self):
return [b'requires'] + _data.split() return [b'requires'] + _data
indygregUnsubmitted
Not Done
+    File "/home/gps/src/hg-committed/mercurial/store.py", line 458, in copylist
+      return [b'requires'] + _data
+  TypeError: can only concatenate list (not "tuple") to list

I think I'll just change _data to a list in-flight.

indygreg: ``` + File "/home/gps/src/hg-committed/mercurial/store.py", line 458, in copylist +…
def write(self, tr): def write(self, tr):
pass pass
def invalidatecaches(self): def invalidatecaches(self):
pass pass
def markremoved(self, fn): def markremoved(self, fn):
if a is not None and not _matchtrackedpath(a, matcher): if a is not None and not _matchtrackedpath(a, matcher):
continue continue
yield a, b, size yield a, b, size
def join(self, f): def join(self, f):
return self.path + b'/' + encodefilename(f) return self.path + b'/' + encodefilename(f)
def copylist(self): def copylist(self):
return [b'requires', b'00changelog.i'] + [ return [b'requires', b'00changelog.i'] + [b'store/' + f for f in _data]
b'store/' + f for f in _data.split()
]
class fncache(object): class fncache(object):
# the filename used to be partially encoded # the filename used to be partially encoded
# hence the encodedir/decodedir dance # hence the encodedir/decodedir dance
def __init__(self, vfs): def __init__(self, vfs):
self.vfs = vfs self.vfs = vfs
self.entries = None self.entries = None
try: try:
yield f, ef, self.getsize(ef) yield f, ef, self.getsize(ef)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
def copylist(self): def copylist(self):
d = ( d = (
b'bookmarks narrowspec data meta dh fncache phaseroots obsstore' b'bookmarks',
b' 00manifest.d 00manifest.i 00changelog.d 00changelog.i' b'narrowspec',
b'data',
b'meta',
b'dh',
b'fncache',
b'phaseroots',
b'obsstore',
b'00manifest.d',
b'00manifest.i',
b'00changelog.d',
b'00changelog.i',
) )
return [b'requires', b'00changelog.i'] + [ return [b'requires', b'00changelog.i'] + [b'store/' + f for f in d]
b'store/' + f for f in d.split()
]
def write(self, tr): def write(self, tr):
self.fncache.write(tr) self.fncache.write(tr)
def invalidatecaches(self): def invalidatecaches(self):
self.fncache.entries = None self.fncache.entries = None
self.fncache.addls = set() self.fncache.addls = set()