This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8083

archival: use walk() instead of matches() on manifest
ClosedPublic

Authored by durin42 on Feb 5 2020, 5:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2d1b2ad3705b: archival: use walk() instead of matches() on manifest
Summary

All we care about is the filepaths, so this avoids a pointless copy of the
manifest that we only used to extract matching filenames.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Feb 5 2020, 5:34 PM
durin42 added a commit: rHG2d1b2ad3705b: archival: use walk() instead of matches() on manifest.Feb 6 2020, 11:11 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2d1b2ad3705b: archival: use walk() instead of matches() on manifest (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Feb 6 2020, 12:02 PM

Oops, I queued this one out of order because I wanted to think more about the previous two patches first, but that made test-subrepo-deep-nested-change.t fail. I should have known there was a reason for the order in this series. I'll de-queue this one for now, so please revive your local copy.

Revision Contents
Changeset List

PathPackages
Mmercurial/archival.py (2 lines)

Diff 19966

mercurial/archival.py

if not match: if not match:
match = scmutil.matchall(repo) match = scmutil.matchall(repo)
if repo.ui.configbool(b"ui", b"archivemeta"): if repo.ui.configbool(b"ui", b"archivemeta"):
name = b'.hg_archival.txt' name = b'.hg_archival.txt'
if match(name): if match(name):
write(name, 0o644, False, lambda: buildmetadata(ctx)) write(name, 0o644, False, lambda: buildmetadata(ctx))
files = [f for f in ctx.manifest().matches(match)] files = list(ctx.manifest().walk(match))
total = len(files) total = len(files)
if total: if total:
files.sort() files.sort()
scmutil.prefetchfiles( scmutil.prefetchfiles(
repo, [ctx.rev()], scmutil.matchfiles(repo, files) repo, [ctx.rev()], scmutil.matchfiles(repo, files)
) )
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'archiving'), unit=_(b'files'), total=total _(b'archiving'), unit=_(b'files'), total=total