This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10501

narrow: add progress-reporting when looking for local changes in `hg tracked`
ClosedPublic

Authored by martinvonz on Apr 20 2021, 1:29 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG124fe94016c0: narrow: add progress-reporting when looking for local changes in `hg tracked`
rHG1e761c1c7411: narrow: add progress-reporting when looking for local changes in `hg tracked`
Summary

Looking for local changes (changes not on the given remote) can take a
long time, so we should have progress-reporting for it.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (13 lines)

Diff 27254

hgext/narrow/narrowcommands.py

newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
# This is essentially doing "hg outgoing" to find all local-only # This is essentially doing "hg outgoing" to find all local-only
# commits. We will then check that the local-only commits don't # commits. We will then check that the local-only commits don't
# have any changes to files that will be untracked. # have any changes to files that will be untracked.
unfi = repo.unfiltered() unfi = repo.unfiltered()
outgoing = discovery.findcommonoutgoing(unfi, remote, commoninc=commoninc) outgoing = discovery.findcommonoutgoing(unfi, remote, commoninc=commoninc)
ui.status(_(b'looking for local changes to affected paths\n')) ui.status(_(b'looking for local changes to affected paths\n'))
progress = ui.makeprogress(
topic=_(b'changesets'),
unit=_(b'changesets'),
total=len(outgoing.missing) + len(outgoing.excluded),
)
localnodes = [] localnodes = []
with progress:
for n in itertools.chain(outgoing.missing, outgoing.excluded): for n in itertools.chain(outgoing.missing, outgoing.excluded):
progress.increment()
if any(oldmatch(f) and not newmatch(f) for f in unfi[n].files()): if any(oldmatch(f) and not newmatch(f) for f in unfi[n].files()):
localnodes.append(n) localnodes.append(n)
revstostrip = unfi.revs(b'descendants(%ln)', localnodes) revstostrip = unfi.revs(b'descendants(%ln)', localnodes)
hiddenrevs = repoview.filterrevs(repo, b'visible') hiddenrevs = repoview.filterrevs(repo, b'visible')
visibletostrip = list( visibletostrip = list(
repo.changelog.node(r) for r in (revstostrip - hiddenrevs) repo.changelog.node(r) for r in (revstostrip - hiddenrevs)
) )
if visibletostrip: if visibletostrip:
ui.status( ui.status(
_( _(