This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2007

narrowrepo: make repo requirement include the string 'experimental'
ClosedPublic

Authored by durin42 on Feb 2 2018, 10:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe14821b290eb: narrowrepo: make repo requirement include the string 'experimental'
Summary

We can just move to "narrow" or similar when we finalize the
format. I'm not sure what the migration process from one requirement
to another should look like, but we're about to cross that bridge at
Google once this change lands, so hopefully we'll know soon.

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.Feb 2 2018, 10:53 AM
indygreg added a subscriber: indygreg.Feb 2 2018, 1:25 PM

We can treat two requirements strings as equivalent.

The trick is once we introduce a requirements string in the wild, we can't make BC changes to its format. i.e. the behavior surrounding a store requirement must be immutable over time. So e.g. if we introduce narrowhg-experimental today, any repos with that requirement will be openable by any Mercurial supporting that requirement, even if we change the store format. That's not good. Especially if we ship narrowhg-experimental with different behavior in say 4.6 and 4.7.

One trick I like to do (which I'll be doing with the wire protocol shortly), is introduce a version component. e.g. experimental-narrow-0001. If you make a change to the format, you bump to experimental-narrow-0002. This basically requires that a specific revision of Mercurial must be used for all operations. When we finally make the transition to non-experimental, you can optionally teach new clients to treat the latest experimental version as equivalent to the final version.

indygreg accepted this revision.Feb 5 2018, 4:25 PM
indygreg added inline comments.
tests/test-narrow-pull.t
169

I'd glob the line number while you are here. Also, I think one of my many review comments will make this warning go away :)

This revision is now accepted and ready to land.Feb 5 2018, 4:25 PM
Closed by commit rHGe14821b290eb: narrowrepo: make repo requirement include the string 'experimental' (authored by durin42). · Explain WhyFeb 12 2018, 6:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5551

hgext/narrow/narrowrepo.py

share, share,
) )
from . import ( from . import (
narrowrevlog, narrowrevlog,
narrowspec, narrowspec,
) )
REQUIREMENT = 'narrowhg' # When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar.
REQUIREMENT = 'narrowhg-experimental'
def wrappostshare(orig, sourcerepo, destrepo, **kwargs): def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
orig(sourcerepo, destrepo, **kwargs) orig(sourcerepo, destrepo, **kwargs)
if REQUIREMENT in sourcerepo.requirements: if REQUIREMENT in sourcerepo.requirements:
with destrepo.wlock(): with destrepo.wlock():
with destrepo.vfs('shared', 'a') as fp: with destrepo.vfs('shared', 'a') as fp:
fp.write(narrowspec.FILENAME + '\n') fp.write(narrowspec.FILENAME + '\n')

tests/test-narrow-acl.t

The clone directory should only contain f1 and f2 The clone directory should only contain f1 and f2
$ ls -1 narrowclone1 | sort $ ls -1 narrowclone1 | sort
f1 f1
f2 f2
Requirements should contain narrowhg Requirements should contain narrowhg
$ cat narrowclone1/.hg/requires | grep narrowhg $ cat narrowclone1/.hg/requires | grep narrowhg
narrowhg narrowhg-experimental
NarrowHG should track f1 and f2 NarrowHG should track f1 and f2
$ hg -R narrowclone1 tracked $ hg -R narrowclone1 tracked
I path:f1 I path:f1
I path:f2 I path:f2

tests/test-narrow-clone-no-ellipsis.t

adding manifests adding manifests
adding file changes adding file changes
added 40 changesets with 1 changes to 1 files added 40 changesets with 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrow $ cd narrow
$ cat .hg/requires | grep -v generaldelta $ cat .hg/requires | grep -v generaldelta
dotencode dotencode
fncache fncache
narrowhg narrowhg-experimental
revlogv1 revlogv1
store store
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [includes]
path:dir/src/f10 path:dir/src/f10
[excludes] [excludes]
$ hg update $ hg update

tests/test-narrow-clone.t

adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 1 changes to 1 files added 3 changesets with 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrow $ cd narrow
$ cat .hg/requires | grep -v generaldelta $ cat .hg/requires | grep -v generaldelta
dotencode dotencode
fncache fncache
narrowhg narrowhg-experimental
revlogv1 revlogv1
store store
$ cat .hg/narrowspec $ cat .hg/narrowspec
[includes] [includes]
path:dir/src/f10 path:dir/src/f10
[excludes] [excludes]
$ hg tracked $ hg tracked

tests/test-narrow-debugcommands.t

$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat << EOF > .hg/narrowspec $ cat << EOF > .hg/narrowspec
> [includes] > [includes]
> path:foo > path:foo
> [excludes] > [excludes]
> EOF > EOF
$ echo treemanifest >> .hg/requires $ echo treemanifest >> .hg/requires
$ echo narrowhg >> .hg/requires $ echo narrowhg-experimental >> .hg/requires
$ mkdir -p foo/bar $ mkdir -p foo/bar
$ echo b > foo/f $ echo b > foo/f
$ echo c > foo/bar/f $ echo c > foo/bar/f
$ hg commit -Am hi $ hg commit -Am hi
adding foo/bar/f adding foo/bar/f
adding foo/f adding foo/f
$ hg debugindex -m $ hg debugindex -m
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2

tests/test-narrow-pull.t

$ hg share narrow2 narrow2-share $ hg share narrow2 narrow2-share
updating working directory updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow2-share $ cd narrow2-share
$ hg status $ hg status
We should also be able to unshare without breaking everything: We should also be able to unshare without breaking everything:
$ hg unshare $ hg unshare
devel-warn: write with no wlock: "narrowspec" at: */hgext/narrow/narrowrepo.py:41 (unsharenarrowspec) (glob) devel-warn: write with no wlock: "narrowspec" at: */hgext/narrow/narrowrepo.py:43 (unsharenarrowspec) (glob)
indygregUnsubmitted
Not Done

I'd glob the line number while you are here. Also, I think one of my many review comments will make this warning go away :)

indygreg: I'd glob the line number while you are here. Also, I think one of my many review comments will…
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
1 files, 1 changesets, 1 total revisions 1 files, 1 changesets, 1 total revisions