Show More
@@ -5669,7 +5669,7 b' def push(ui, repo, dest=None, **opts):' | |||||
5669 |
|
5669 | |||
5670 | @command( |
|
5670 | @command( | |
5671 | b'recover', |
|
5671 | b'recover', | |
5672 |
[(b'', b'verify', |
|
5672 | [(b'', b'verify', False, b"run `hg verify` after successful recover"),], | |
5673 | helpcategory=command.CATEGORY_MAINTENANCE, |
|
5673 | helpcategory=command.CATEGORY_MAINTENANCE, | |
5674 | ) |
|
5674 | ) | |
5675 | def recover(ui, repo, **opts): |
|
5675 | def recover(ui, repo, **opts): |
@@ -356,7 +356,7 b' Clean cached versions' | |||||
356 | $ cat .hg/store/fncache | sort |
|
356 | $ cat .hg/store/fncache | sort | |
357 | data/y.i |
|
357 | data/y.i | |
358 | data/z.i |
|
358 | data/z.i | |
359 | $ hg recover |
|
359 | $ hg recover --verify | |
360 | rolling back interrupted transaction |
|
360 | rolling back interrupted transaction | |
361 | checking changesets |
|
361 | checking changesets | |
362 | checking manifests |
|
362 | checking manifests |
@@ -15,11 +15,7 b'' | |||||
15 |
|
15 | |||
16 | $ hg recover |
|
16 | $ hg recover | |
17 | rolling back interrupted transaction |
|
17 | rolling back interrupted transaction | |
18 | checking changesets |
|
18 | (verify step skipped, run `hg verify` to check your repository content) | |
19 | checking manifests |
|
|||
20 | crosschecking files in changesets and manifests |
|
|||
21 | checking files |
|
|||
22 | checked 1 changesets with 1 changes to 1 files |
|
|||
23 |
|
19 | |||
24 | recover, explicit verify |
|
20 | recover, explicit verify | |
25 |
|
21 |
@@ -25,7 +25,9 b'' | |||||
25 | > else |
|
25 | > else | |
26 | > echo "(no journal)" |
|
26 | > echo "(no journal)" | |
27 | > fi |
|
27 | > fi | |
28 |
> ls .hg/store/journal >/dev/null 2>&1 |
|
28 | > if ls .hg/store/journal >/dev/null 2>&1; then | |
|
29 | > hg recover --verify | |||
|
30 | > fi | |||
29 | > ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/* |
|
31 | > ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/* | |
30 | > rm -rf .hg/strip-backup |
|
32 | > rm -rf .hg/strip-backup | |
31 | > } |
|
33 | > } |
@@ -190,7 +190,7 b' same again, but emulate an old client th' | |||||
190 |
|
190 | |||
191 | corrupt journal test |
|
191 | corrupt journal test | |
192 | $ echo "foo" > .hg/store/journal |
|
192 | $ echo "foo" > .hg/store/journal | |
193 | $ hg recover |
|
193 | $ hg recover --verify | |
194 | rolling back interrupted transaction |
|
194 | rolling back interrupted transaction | |
195 | couldn't read journal entry 'foo\n'! |
|
195 | couldn't read journal entry 'foo\n'! | |
196 | checking changesets |
|
196 | checking changesets |
General Comments 0
You need to be logged in to leave comments.
Login now