Mercurial > hg
annotate tests/test-clone-pull-corruption.t @ 51871:cfd30df0f8e4
bundlerepo: fix mismatches with repository and revlog classes
Both pytype and PyCharm complained that `write()` and `_write()` in the
bundlephasecache class aren't proper overrides- indeed they seem to be missing
an argument that the base class has.
PyCharm and pytype also complained that the `revlog.revlog` class doesn't have a
`_chunk()` method. That looks like it was moved from revlog to `_InnerRevlog`
back in e8ad6d8de8b8, and wasn't caught because this module wasn't type checked.
However, I couldn't figure out a syntax with `revlog.revlog._inner._chunk(self, rev)`,
as it complained about passing too many args. `bundlerevlog._rawtext()` uses
this `super(...)` style to call the super class, so hopefully that works, even
with the wonky dynamic subclassing. The revlog class needed the `_InnerRevlog`
field typed because it isn't set in the constructor.
Finally, the vfs type hints look broken. This initially failed with:
File "/mnt/c/Users/Matt/hg/mercurial/bundlerepo.py", line 65, in __init__: Function readonlyvfs.__init__ was called with the wrong arguments [wrong-arg-types]
Expected: (self, vfs: mercurial.vfs.vfs)
Actually passed: (self, vfs: Callable)
Called from (traceback):
line 232, in dirlog
line 214, in __init__
I don't see a raw Callable, but I tried changing some of the vfs args to be typed
as `vfsmod.abstractvfs`, but that class doesn't have `options`, so it failed
elsewhere. `readonlyvfs` isn't a subclass of `vfs` (it's a subclass of
`abstractvfs`), so I'm not sure how to handle that. It would be a shame to have
to make a union of vfs subclasses (but not all of them have `options` either).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Aug 2024 01:33:13 -0400 |
parents | 2f2682f40ea0 |
children |
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 |
24838
b2c1ff96c1e1
tests: use double quote to quote arguments in hook for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16962
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 |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
24838
diff
changeset
|
40 new changesets 52998019f625 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
41 (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
|
42 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
43 see what happened |
1785
81ca1a9bd061
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 |
12412
2dbb9e5e3454
tests: unify test-clone-pull-corruption
Matt Mackall <mpm@selenic.com>
parents:
1785
diff
changeset
|
45 $ wait |
49825
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents:
39489
diff
changeset
|
46 $ hg verify -q |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
47 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15445
diff
changeset
|
48 $ cd .. |