This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8369

manifest: teach treemanifest about long hashes
ClosedPublic

Authored by durin42 on Apr 2 2020, 4:31 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0e99b876966a: manifest: teach treemanifest about long hashes

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

durin42 created this revision.Apr 2 2020, 4:31 PM
Alphare accepted this revision.Apr 14 2020, 4:50 AM
Alphare added a subscriber: Alphare.

I feel like that warrants a small comment about hash compatibility just to ease-in new contributors or people who haven't followed that discussion.

durin42 added a comment.Apr 14 2020, 11:25 AM
In D8369#125460, @Alphare wrote:

I feel like that warrants a small comment about hash compatibility just to ease-in new contributors or people who haven't followed that discussion.

Added a comment, hopefully this is what you have in mind?

durin42 updated this revision to Diff 21051.Apr 14 2020, 11:29 AM
Alphare added a comment.Apr 14 2020, 11:31 AM
In D8369#125485, @durin42 wrote:

Added a comment, hopefully this is what you have in mind?

Yes, perfect. I have also looked at the added comments on the other changesets and they seem fine as well, thanks.

pulkit accepted this revision.Apr 14 2020, 2:56 PM
This revision is now accepted and ready to land.Apr 14 2020, 2:56 PM
durin42 added a commit: rHG0e99b876966a: manifest: teach treemanifest about long hashes.Apr 14 2020, 3:18 PM
Closed by commit rHG0e99b876966a: manifest: teach treemanifest about long hashes (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (7 lines)

Diff 21082

mercurial/manifest.py

self._load() self._load()
dir, subpath = _splittopdir(f) dir, subpath = _splittopdir(f)
if dir: if dir:
self._loadlazy(dir) self._loadlazy(dir)
if dir not in self._dirs: if dir not in self._dirs:
self._dirs[dir] = treemanifest(self._subpath(dir)) self._dirs[dir] = treemanifest(self._subpath(dir))
self._dirs[dir].__setitem__(subpath, n) self._dirs[dir].__setitem__(subpath, n)
else: else:
self._files[f] = n[:21] # to match manifestdict's behavior # manifest nodes are either 20 bytes or 32 bytes,
# depending on the hash in use. An extra byte is
# occasionally used by hg, but won't ever be
# persisted. Trim to 21 or 33 bytes as appropriate.
trim = 21 if len(n) < 25 else 33
self._files[f] = n[:trim] # to match manifestdict's behavior
self._dirty = True self._dirty = True
def _load(self): def _load(self):
if self._loadfunc is not _noop: if self._loadfunc is not _noop:
lf, self._loadfunc = self._loadfunc, _noop lf, self._loadfunc = self._loadfunc, _noop
lf(self) lf(self)
elif self._copyfunc is not _noop: elif self._copyfunc is not _noop:
cf, self._copyfunc = self._copyfunc, _noop cf, self._copyfunc = self._copyfunc, _noop