test-subrepo-missing.t
141 lines
| 3.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-subrepo-missing.t
|
r13017 | $ hg init repo | ||
$ cd repo | ||||
$ hg init subrepo | ||||
$ echo a > subrepo/a | ||||
$ hg -R subrepo ci -Am adda | ||||
adding a | ||||
$ echo 'subrepo = subrepo' > .hgsub | ||||
$ hg ci -Am addsubrepo | ||||
adding .hgsub | ||||
$ echo b > subrepo/b | ||||
$ hg -R subrepo ci -Am addb | ||||
adding b | ||||
$ hg ci -m updatedsub | ||||
|
r16595 | ignore blanklines in .hgsubstate | ||
|
r37602 | >>> open('.hgsubstate', 'wb').write(b'\n\n \t \n \n') and None | ||
|
r16595 | $ hg st --subrepos | ||
M .hgsubstate | ||||
$ hg revert -qC .hgsubstate | ||||
|
r16596 | abort more gracefully on .hgsubstate parsing error | ||
$ cp .hgsubstate .hgsubstate.old | ||||
|
r37602 | >>> open('.hgsubstate', 'wb').write(b'\ninvalid') and None | ||
|
r25769 | $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo | ||
|
r25865 | abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2 | ||
|
r16596 | [255] | ||
$ mv .hgsubstate.old .hgsubstate | ||||
|
r13017 | delete .hgsub and revert it | ||
$ rm .hgsub | ||||
$ hg revert .hgsub | ||||
|
r24645 | warning: subrepo spec file '.hgsub' not found | ||
warning: subrepo spec file '.hgsub' not found | ||||
|
r13017 | |||
delete .hgsubstate and revert it | ||||
$ rm .hgsubstate | ||||
$ hg revert .hgsubstate | ||||
delete .hgsub and update | ||||
$ rm .hgsub | ||||
|
r25769 | $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo | ||
|
r25865 | warning: subrepo spec file 'repo/.hgsub' not found | ||
warning: subrepo spec file 'repo/.hgsub' not found | ||||
|
r13017 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg st | ||||
|
r24645 | warning: subrepo spec file '.hgsub' not found | ||
|
r13017 | ! .hgsub | ||
$ ls subrepo | ||||
a | ||||
delete .hgsubstate and update | ||||
$ hg up -C | ||||
|
r24645 | warning: subrepo spec file '.hgsub' not found | ||
warning: subrepo spec file '.hgsub' not found | ||||
|
r13017 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ rm .hgsubstate | ||||
|
r17345 | $ hg up 0 | ||
|
r29775 | other [destination] changed .hgsubstate which local [working copy] deleted | ||
|
r13017 | use (c)hanged version or leave (d)eleted? c | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg st | ||||
$ ls subrepo | ||||
a | ||||
|
r16913 | |||
|
r20319 | Enable obsolete | ||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
> logtemplate= {rev}:{node|short} {desc|firstline} | ||||
> [phases] | ||||
> publish=False | ||||
|
r22955 | > [experimental] | ||
|
r34867 | > evolution.createmarkers=True | ||
|
r20319 | > EOF | ||
check that we can update parent repo with missing (amended) subrepo revision | ||||
$ hg up --repository subrepo -r tip | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg ci -m "updated subrepo to tip" | ||||
created new head | ||||
$ cd subrepo | ||||
$ hg update -r tip | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo foo > a | ||||
$ hg commit --amend -m "addb (amended)" | ||||
|
r16913 | $ cd .. | ||
|
r20319 | $ hg update --clean . | ||
|
r33365 | revision 102a90ea7b4a in subrepository "subrepo" is hidden | ||
|
r20319 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r24877 | check that --hidden is propagated to the subrepo | ||
$ hg -R subrepo up tip | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg ci -m 'commit with amended subrepo' | ||||
$ echo bar > subrepo/a | ||||
$ hg -R subrepo ci --amend -m "amend a (again)" | ||||
$ hg --hidden cat subrepo/a | ||||
foo | ||||
|
r25591 | verify will warn if locked-in subrepo revisions are hidden or missing | ||
$ hg ci -m "amended subrepo (again)" | ||||
r32629 | $ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no | |||
|
r25591 | $ hg verify | ||
checking changesets | ||||
checking manifests | ||||
crosschecking files in changesets and manifests | ||||
checking files | ||||
2 files, 5 changesets, 5 total revisions | ||||
checking subrepo links | ||||
subrepo 'subrepo' is hidden in revision a66de08943b6 | ||||
subrepo 'subrepo' is hidden in revision 674d05939c1e | ||||
subrepo 'subrepo' not found in revision a7d05d9055a4 | ||||
|
r29021 | verifying shouldn't init a new subrepo if the reference doesn't exist | ||
$ mv subrepo b | ||||
$ hg verify | ||||
checking changesets | ||||
checking manifests | ||||
crosschecking files in changesets and manifests | ||||
checking files | ||||
2 files, 5 changesets, 5 total revisions | ||||
checking subrepo links | ||||
|
r35394 | 0: repository $TESTTMP/repo/subrepo not found | ||
1: repository $TESTTMP/repo/subrepo not found | ||||
3: repository $TESTTMP/repo/subrepo not found | ||||
4: repository $TESTTMP/repo/subrepo not found | ||||
|
r29021 | $ ls | ||
b | ||||
$ mv b subrepo | ||||
|
r20319 | $ cd .. | ||