This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3060

tests: disallow using simple store repo with bundlerepo
ClosedPublic

Authored by indygreg on Apr 3 2018, 9:56 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG45a4799174a1: tests: disallow using simple store repo with bundlerepo
Summary

bundlerepo is... going to be difficult to port to an alternate
store because it assumes revlogs for storage and essentially
overlays the contents of a bundle onto a fake revlog-like
primitive. It will be a good test case for our eventual new
storage interface.

Refactoring bundlerepo to make it work with non-revlog storage is
going to be a bit of work. So for now, let's refuse to use the
simple store repo when a bundlerepo is in play.

A new test requirement advertising support for treating bundle
files as repo instances has been added. Some tests have been
made conditional on this feature. Additional tests will be
annotated in subsequent commits.

Having positive opt-in to repo features will be simpler in the
long run because it will allow multiple storage backends to
declare feature support and we won't have to annotate each test
with the set of repo backends that are supported. Again, we'll
probably want better integration between repo features and
tests. But this is the easiest we can do at the moment.

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

indygreg created this revision.Apr 3 2018, 9:56 PM
durin42 accepted this revision.Apr 4 2018, 2:15 PM
This revision is now accepted and ready to land.Apr 4 2018, 2:15 PM
indygreg edited the summary of this revision. (Show Details)Apr 4 2018, 2:45 PM
indygreg updated this revision to Diff 7635.
Closed by commit rHG45a4799174a1: tests: disallow using simple store repo with bundlerepo (authored by indygreg). · Explain WhyApr 4 2018, 5:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7648

tests/hghave.py

"""Obtain set of repository features in use. """Obtain set of repository features in use.
HGREPOFEATURES can be used to define or remove features. It contains HGREPOFEATURES can be used to define or remove features. It contains
a space-delimited list of feature strings. Strings beginning with ``-`` a space-delimited list of feature strings. Strings beginning with ``-``
mean to remove. mean to remove.
""" """
# Default list provided by core. # Default list provided by core.
features = { features = {
'bundlerepo',
'revlogstore', 'revlogstore',
} }
# Features that imply other features. # Features that imply other features.
implies = { implies = {
'simplestore': ['-revlogstore'], 'simplestore': ['-revlogstore', '-bundlerepo'],
} }
for override in os.environ.get('HGREPOFEATURES', '').split(' '): for override in os.environ.get('HGREPOFEATURES', '').split(' '):
if not override: if not override:
continue continue
if override.startswith('-'): if override.startswith('-'):
if override[1:] in features: if override[1:] in features:
@check('reporevlogstore', 'repository using the default revlog store') @check('reporevlogstore', 'repository using the default revlog store')
def has_reporevlogstore(): def has_reporevlogstore():
return 'revlogstore' in getrepofeatures() return 'revlogstore' in getrepofeatures()
@check('reposimplestore', 'repository using simple storage extension') @check('reposimplestore', 'repository using simple storage extension')
def has_reposimplestore(): def has_reposimplestore():
return 'simplestore' in getrepofeatures() return 'simplestore' in getrepofeatures()
@check('repobundlerepo', 'whether we can open bundle files as repos')
def has_repobundlerepo():
return 'bundlerepo' in getrepofeatures()

tests/simplestorerepo.py

nullid, nullid,
nullrev, nullrev,
) )
from mercurial.thirdparty import ( from mercurial.thirdparty import (
cbor, cbor,
) )
from mercurial import ( from mercurial import (
ancestor, ancestor,
bundlerepo,
error, error,
filelog, filelog,
mdiff, mdiff,
pycompat, pycompat,
revlog, revlog,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# Purge index data starting at the requested revision. # Purge index data starting at the requested revision.
self._indexdata[rev:] = [] self._indexdata[rev:] = []
self._reflectindexupdate() self._reflectindexupdate()
def reposetup(ui, repo): def reposetup(ui, repo):
if not repo.local(): if not repo.local():
return return
if isinstance(repo, bundlerepo.bundlerepository):
raise error.Abort(_('cannot use simple store with bundlerepo'))
class simplestorerepo(repo.__class__): class simplestorerepo(repo.__class__):
def file(self, f): def file(self, f):
return filestorage(self.svfs, f) return filestorage(self.svfs, f)
repo.__class__ = simplestorerepo repo.__class__ = simplestorerepo

tests/test-manifest.t

#require repobundlerepo
Source bundle was generated with the following script: Source bundle was generated with the following script:
# hg init # hg init
# echo a > a # echo a > a
# ln -s a l # ln -s a l
# hg ci -Ama -d'0 0' # hg ci -Ama -d'0 0'
# mkdir b # mkdir b
# echo a > b/a # echo a > b/a

tests/test-mq-pull-from-bundle.t

#require repobundlerepo
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq= > mq=
> [alias] > [alias]
> tlog = log --template "{rev}: {node|short} {desc}\\n" > tlog = log --template "{rev}: {node|short} {desc}\\n"
> theads = heads --template "{rev}: {desc}\\n" > theads = heads --template "{rev}: {desc}\\n"
> tincoming = incoming --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n"
> EOF > EOF

tests/test-narrow-strip.t

added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets * (glob) new changesets * (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ rm .hg/strip-backup/*-backup.hg $ rm .hg/strip-backup/*-backup.hg
$ hg strip 0 $ hg strip 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
#if repobundlerepo
$ hg incoming .hg/strip-backup/*-backup.hg $ hg incoming .hg/strip-backup/*-backup.hg
comparing with .hg/strip-backup/*-backup.hg (glob) comparing with .hg/strip-backup/*-backup.hg (glob)
changeset: 0:* (glob) changeset: 0:* (glob)
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: initial summary: initial
changeset: 1:9e48d953700d (flat !) changeset: 1:9e48d953700d (flat !)
pulling from .hg/strip-backup/*-backup.hg (glob) pulling from .hg/strip-backup/*-backup.hg (glob)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 2 changes to 1 files (+1 heads) added 3 changesets with 2 changes to 1 files (+1 heads)
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
#endif

tests/test-obsolete.t

$ hg log -G --hidden $ hg log -G --hidden
@ 2:b7d587542d40 (draft) [tip ] B+ @ 2:b7d587542d40 (draft) [tip ] B+
| |
| x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40]
|/ |/
o 0:4b34ecfb0d56 (draft) [ ] A o 0:4b34ecfb0d56 (draft) [ ] A
#if repobundlerepo
$ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
comparing with ../repo-bundleoverlay comparing with ../repo-bundleoverlay
searching for changes searching for changes
1:44526ebb0f98 (draft) [ ] B 1:44526ebb0f98 (draft) [ ] B
2:c186d7714947 (draft) [tip ] C 2:c186d7714947 (draft) [tip ] C
$ hg log -G -R ../bundleoverlay.hg $ hg log -G -R ../bundleoverlay.hg
o 3:c186d7714947 (draft) [tip ] C o 3:c186d7714947 (draft) [tip ] C
| |
| @ 2:b7d587542d40 (draft) [ ] B+ | @ 2:b7d587542d40 (draft) [ ] B+
|/ |/
o 0:4b34ecfb0d56 (draft) [ ] A o 0:4b34ecfb0d56 (draft) [ ] A
#endif
#if serve #if serve
Test issue 4506 Test issue 4506
$ cd .. $ cd ..
$ hg init repo-issue4506 $ hg init repo-issue4506
$ cd repo-issue4506 $ cd repo-issue4506

tests/test-shelve.t

other uncommitted changes - merge: other uncommitted changes - merge:
$ hg st $ hg st
A f A f
? f.orig ? f.orig
$ hg shelve $ hg shelve
shelved as default shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
#if repobundlerepo
$ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()'
o 4 changes to: commit stuff shelve@localhost o 4 changes to: commit stuff shelve@localhost
| |
~ ~
#endif
$ hg log -G --template '{rev} {desc|firstline} {author}' $ hg log -G --template '{rev} {desc|firstline} {author}'
@ 3 commit stuff test @ 3 commit stuff test
| |
| o 2 c test | o 2 c test
|/ |/
o 0 a test o 0 a test
$ mv f.orig f $ mv f.orig f

tests/test-treemanifest.t

M dir1/a M dir1/a
$ hg --config extensions.strip= strip tip $ hg --config extensions.strip= strip tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
$ hg debugindex --dir dir1 $ hg debugindex --dir dir1
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 4 064927a0648a 000000000000 000000000000 0 4 064927a0648a 000000000000 000000000000
1 5 25ecb8cb8618 000000000000 000000000000 1 5 25ecb8cb8618 000000000000 000000000000
#if repobundlerepo
$ hg incoming .hg/strip-backup/* $ hg incoming .hg/strip-backup/*
comparing with .hg/strip-backup/*-backup.hg (glob) comparing with .hg/strip-backup/*-backup.hg (glob)
searching for changes searching for changes
changeset: 6:51cfd7b1e13b changeset: 6:51cfd7b1e13b
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify dir1/a summary: modify dir1/a
#endif
$ hg unbundle .hg/strip-backup/* $ hg unbundle .hg/strip-backup/*
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 51cfd7b1e13b new changesets 51cfd7b1e13b
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg --config extensions.strip= strip tip $ hg --config extensions.strip= strip tip