This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11243

remotefilelog: fix what looks like a wrong refactoring
ClosedPublic

Authored by valentin.gatienbaron on Aug 2 2021, 9:57 PM.

Details

Reviewers
pulkit
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6802422a1ae0: remotefilelog: fix what looks like a wrong refactoring
Summary

when various store functions started returning a revlog type as the
first element of the 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 accepted this revision.Aug 4 2021, 4:39 AM
This revision is now accepted and ready to land.Aug 4 2021, 4:39 AM
marmoute accepted this revision.Aug 4 2021, 4:02 PM
marmoute added a subscriber: marmoute.

This looks correct, and suitable for stable.

@valentin.gatienbaron is it possible to get a test covering this in a follow up ?

valentin.gatienbaron added a comment.Aug 4 2021, 6:05 PM

I am definitely not going to write a test. I know nothing about remotefilelog. I merely happened to see this while grepping around.

Revision Contents
Changeset List

Diff 29796

hgext/remotefilelog/remotefilelogserver.py

match = state.match match = state.match
if match and not match.always(): if match and not match.always():
for (t, u, e, s) in repo.store.datafiles(): for (t, u, e, s) in repo.store.datafiles():
f = u[5:-2] # trim data/... and .i/.d f = u[5:-2] # trim data/... and .i/.d
if not state.match(f): if not state.match(f):
yield (t, u, e, s) yield (t, u, e, s)
for x in repo.store.topfiles(): for x in repo.store.topfiles():
if state.noflatmf and x[0][:11] == b'00manifest.': if state.noflatmf and x[1][:11] == b'00manifest.':
continue continue
yield x yield x
elif shallowutil.isenabled(repo): elif shallowutil.isenabled(repo):
# don't allow cloning from a shallow repo to a full repo # don't allow cloning from a shallow repo to a full repo
# since it would require fetching every version of every # since it would require fetching every version of every
# file in order to create the revlogs. # file in order to create the revlogs.
raise error.Abort( raise error.Abort(