This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5364

narrow: don't resurrect old commits when narrowing (don't strip obsmarkers)
ClosedPublic

Authored by martinvonz on Dec 3 2018, 8:00 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG77173267878b: narrow: don't resurrect old commits when narrowing (don't strip obsmarkers)
Summary

If you have an old obsolescence-chain of commits that has been pruned
and you narrow your repo so that some of those commits get stripped
(because they affected the removed paths), then we would currently
resurrect the commit that came before (along the obsmarker chain) the
last stripped commit. That happens by the usual rules for
obsmarker-stripping. However, it's quite surprising when it happens
when you narrow your repo. This patch makes narrowing not strip
obsmarkers.

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

martinvonz created this revision.Dec 3 2018, 8:00 PM
Closed by commit rHG77173267878b: narrow: don't resurrect old commits when narrowing (don't strip obsmarkers) (authored by martinvonz). · Explain WhyDec 5 2018, 6:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (4 lines)
Mtests/test-narrow.t (23 lines)

Diff 12706

hgext/narrow/narrowcommands.py

with ui.uninterruptable(): with ui.uninterruptable():
if revstostrip: if revstostrip:
tostrip = [unfi.changelog.node(r) for r in revstostrip] tostrip = [unfi.changelog.node(r) for r in revstostrip]
if repo['.'].node() in tostrip: if repo['.'].node() in tostrip:
# stripping working copy, so move to a different commit first # stripping working copy, so move to a different commit first
urev = max(repo.revs('(::%n) - %ln + null', urev = max(repo.revs('(::%n) - %ln + null',
repo['.'].node(), visibletostrip)) repo['.'].node(), visibletostrip))
hg.clean(repo, urev) hg.clean(repo, urev)
overrides = {('devel', 'strip-obsmarkers'): False}
with ui.configoverride(overrides, 'narrow'):
repair.strip(ui, unfi, tostrip, topic='narrow') repair.strip(ui, unfi, tostrip, topic='narrow')
todelete = [] todelete = []
for f, f2, size in repo.store.datafiles(): for f, f2, size in repo.store.datafiles():
if f.startswith('data/'): if f.startswith('data/'):
file = f[5:-2] file = f[5:-2]
if not newmatch(file): if not newmatch(file):
todelete.append(f) todelete.append(f)
elif f.startswith('meta/'): elif f.startswith('meta/'):

tests/test-narrow.t

deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !) deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
deleting data/d3/f/index (reposimplestore !) deleting data/d3/f/index (reposimplestore !)
$ hg id $ hg id
000000000000 000000000000
$ cd .. $ cd ..
Narrowing doesn't resurrect old commits (unlike what regular `hg strip` does)
$ hg clone --narrow ssh://user@dummy/master narrow-obsmarkers --include d0 --include d3 -q
$ cd narrow-obsmarkers
$ echo a >> d0/f2
$ hg add d0/f2
$ hg ci -m 'modify d0/'
$ echo a >> d3/f2
$ hg add d3/f2
$ hg commit --amend -m 'modify d0/ and d3/'
$ hg log -T "{rev}: {desc}\n"
5: modify d0/ and d3/
3: add d10/f
2: add d3/f
1: add d2/f
0: add d0/f
$ hg tracked --removeinclude d3 --force-delete-local-changes -q
$ hg log -T "{rev}: {desc}\n"
3: add d10/f
2: add d3/f
1: add d2/f
0: add d0/f
$ cd ..
Can remove last include, making repo empty Can remove last include, making repo empty
$ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default