Mercurial > hg
annotate tests/test-clone-pull-corruption.t @ 23575:a2f139d25845
subrepo: drop the 'ui' parameter to archive()
The current state of subrepo methods is to pass a 'ui' object to some methods,
which has the effect of overriding the subrepo configuration since it is the
root repo's 'ui' that is passed along as deep as there are subrepos. Other
subrepo method are *not* passed the root 'ui', and instead delegate to their
repo object's 'ui'. Even in the former case where the root 'ui' is available,
some methods are inconsistent in their use of both the root 'ui' and the local
repo's 'ui'. (Consider hg._incoming() uses the root 'ui' for path expansion
and some status messages, but also calls bundlerepo.getremotechanges(), which
eventually calls discovery.findcommonincoming(), which calls
setdiscovery.findcommonheads(), which calls status() on the local repo 'ui'.)
This inconsistency with respect to the configured output level is probably
always hidden, because --verbose, --debug and --quiet, along with their 'ui.xxx'
equivalents in the global and user level hgrc files are propagated from the
parent repo to the subrepo via 'baseui'. The 'ui.xxx' settings in the parent
repo hgrc file are not propagated, but that seems like an unusual thing to set
on a per repo config file. Any 'ui.xxx' options changed by --config are also
not propagated, because they are set on repo.ui by dispatch.py, not repo.baseui.
The goal here is to cleanup the subrepo methods by dropping the 'ui' parameter,
which in turn prevents mixing subtly different 'ui' instances on a given subrepo
level. Some methods use more than just the output level settings in 'ui' (add
for example ends up calling scmutil.checkportabilityalert() with both the root
and local repo's 'ui' at different points). This series just goes for the low
hanging fruit and switches methods that only use the output level.
If we really care about not letting a subrepo config override the root repo's
output level, we can propagate the verbose, debug and quiet settings to the
subrepo in the same way 'ui.commitsubrepos' is in hgsubrepo.__init__.
Archive only uses the 'ui' object to call its progress() method, and gitsubrepo
calls status().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 13 Dec 2014 14:53:46 -0500 |
parents | d2fe9aaedcaf |
children | b2c1ff96c1e1 |
rev | line source |
---|---|
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
1 Corrupt an hg repo with a pull started during an aborted commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
2 Create two repos, so that one of them can pull from the other one. |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
4 $ hg init source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
5 $ cd source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
6 $ touch foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
7 $ hg add foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
8 $ hg ci -m 'add foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
9 $ hg clone . ../corrupted |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
10 updating to branch default |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
12 $ echo >> foo |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
13 $ hg ci -m 'change foo' |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
14 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
15 Add a hook to wait 5 seconds and then abort the commit |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
16 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
17 $ cd ../corrupted |
16962
d2fe9aaedcaf
test-clone-pull-corruption: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
18 $ echo "[hooks]" >> .hg/hgrc |
d2fe9aaedcaf
test-clone-pull-corruption: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
19 $ echo "pretxncommit = sh -c 'sleep 5; exit 1'" >> .hg/hgrc |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
20 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
21 start a commit... |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
23 $ touch bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
24 $ hg add bar |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
25 $ hg ci -m 'add bar' & |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
26 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
27 ... and start a pull while the commit is still running |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
29 $ sleep 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
30 $ hg pull ../source 2>/dev/null |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
31 pulling from ../source |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
32 transaction abort! |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
33 rollback completed |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
34 abort: pretxncommit hook exited with status 1 |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
35 searching for changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
36 adding changesets |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
37 adding manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
38 adding file changes |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
39 added 1 changesets with 1 changes to 1 files |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
40 (run 'hg update' to get a working copy) |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
42 see what happened |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
44 $ wait |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
45 $ hg verify |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
46 checking changesets |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
47 checking manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
48 crosschecking files in changesets and manifests |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
49 checking files |
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
50 1 files, 2 changesets, 2 total revisions |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
51 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
52 $ cd .. |