author | Martin von Zweigbergk <martinvonz@google.com> |
Sat, 19 Oct 2019 00:15:41 -0700 | |
changeset 43589 | 7f4d58c21aec |
parent 40655 | 69d4c8c5c25e |
child 44530 | 4d1634e59f13 |
permissions | -rw-r--r-- |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
2 |
> [extdiff] |
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
3 |
> # for portability: |
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
4 |
> pdiff = sh "$RUNTESTDIR/pdiff" |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
5 |
> [progress] |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
6 |
> disable=False |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
7 |
> assume-tty = 1 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
8 |
> delay = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
9 |
> # set changedelay really large so we don't see nested topics |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
10 |
> changedelay = 30000 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
11 |
> format = topic bar number |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
12 |
> refresh = 0 |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
13 |
> width = 60 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
14 |
> EOF |
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
15 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
16 |
Preparing the subrepository 'sub2' |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
17 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
18 |
$ hg init sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
19 |
$ echo sub2 > sub2/sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
20 |
$ hg add -R sub2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
21 |
adding sub2/sub2 |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
22 |
$ hg commit -R sub2 -m "sub2 import" |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
23 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
24 |
Preparing the 'sub1' repo which depends on the subrepo 'sub2' |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
25 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
26 |
$ hg init sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
27 |
$ echo sub1 > sub1/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
28 |
$ echo "sub2 = ../sub2" > sub1/.hgsub |
12107
497c78760b37
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11913
diff
changeset
|
29 |
$ hg clone sub2 sub1/sub2 |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
30 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
31 |
linking [ <=> ] 1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
32 |
linking [ <=> ] 2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
33 |
linking [ <=> ] 3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
34 |
linking [ <=> ] 4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
35 |
linking [ <=> ] 5\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
36 |
linking [ <=> ] 6\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
37 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
38 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
39 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
40 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
41 |
updating to branch default |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
42 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
43 |
$ hg add -R sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
44 |
adding sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
45 |
adding sub1/sub1 |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
46 |
$ hg commit -R sub1 -m "sub1 import" |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
47 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
48 |
Preparing the 'main' repo which depends on the subrepo 'sub1' |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
49 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
50 |
$ hg init main |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
51 |
$ echo main > main/main |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
52 |
$ echo "sub1 = ../sub1" > main/.hgsub |
12107
497c78760b37
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11913
diff
changeset
|
53 |
$ hg clone sub1 main/sub1 |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
54 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
55 |
linking [ <=> ] 1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
56 |
linking [ <=> ] 2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
57 |
linking [ <=> ] 3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
58 |
linking [ <=> ] 4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
59 |
linking [ <=> ] 5\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
60 |
linking [ <=> ] 6\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
61 |
linking [ <=> ] 7\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
62 |
linking [ <=> ] 8\r (no-eol) (esc) |
37338
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
63 |
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !) |
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
64 |
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
65 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
66 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
67 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
34351
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
68 |
\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
69 |
\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
70 |
linking [ <=> ] 1\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
71 |
linking [ <=> ] 2\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
72 |
linking [ <=> ] 3\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
73 |
linking [ <=> ] 4\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
74 |
linking [ <=> ] 5\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
75 |
linking [ <=> ] 6\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
76 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
77 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
78 |
updating to branch default |
14281
ccb7240acf32
subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents:
12640
diff
changeset
|
79 |
cloning subrepo sub2 from $TESTTMP/sub2 |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
80 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
81 |
$ hg add -R main |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
82 |
adding main/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
83 |
adding main/main |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
84 |
$ hg commit -R main -m "main import" |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
85 |
|
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
86 |
#if serve |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
87 |
|
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
88 |
Unfortunately, subrepos not at their nominal location cannot be cloned. But |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
89 |
they are still served from their location within the local repository. The only |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
90 |
reason why 'main' can be cloned via the filesystem is because 'sub1' and 'sub2' |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
91 |
are also available as siblings of 'main'. |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
92 |
|
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
93 |
$ hg serve -R main --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
94 |
adding = $TESTTMP/main |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
95 |
adding sub1 = $TESTTMP/main/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
96 |
adding sub1/sub2 = $TESTTMP/main/sub1/sub2 |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
97 |
listening at http://*:$HGPORT/ (bound to *:$HGPORT) (glob) (?) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
98 |
adding = $TESTTMP/main (?) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
99 |
adding sub1 = $TESTTMP/main/sub1 (?) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
100 |
adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (?) |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
101 |
$ cat hg1.pid >> $DAEMON_PIDS |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
102 |
|
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
103 |
$ hg clone http://localhost:$HGPORT httpclone --config progress.disable=True |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
104 |
requesting all changes |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
105 |
adding changesets |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
106 |
adding manifests |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
107 |
adding file changes |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
108 |
added 1 changesets with 3 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34351
diff
changeset
|
109 |
new changesets 7f491f53a367 |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
110 |
updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39854
diff
changeset
|
111 |
cloning subrepo sub1 from http://localhost:$HGPORT/../sub1 |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
112 |
abort: HTTP Error 404: Not Found |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
113 |
[255] |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
114 |
|
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
115 |
$ cat access.log |
37556
b77aa48ba690
httppeer: only advertise partial-pull if capabilities are known
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37498
diff
changeset
|
116 |
* "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
117 |
* "GET /?cmd=batch HTTP/1.1" 200 - * (glob) |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
118 |
* "GET /?cmd=getbundle HTTP/1.1" 200 - * (glob) |
37556
b77aa48ba690
httppeer: only advertise partial-pull if capabilities are known
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37498
diff
changeset
|
119 |
* "GET /../sub1?cmd=capabilities HTTP/1.1" 404 - (glob) |
36943
c8768bc46d24
tests: add a cat of `error.log` in subrepo test
Augie Fackler <augie@google.com>
parents:
35393
diff
changeset
|
120 |
$ cat error.log |
32005
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
121 |
|
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
122 |
$ killdaemons.py |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
123 |
$ rm hg1.pid error.log access.log |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
124 |
#endif |
2406dbba49bd
serve: add support for Mercurial subrepositories
Matt Harbison <matt_harbison@yahoo.com>
parents:
31064
diff
changeset
|
125 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
126 |
Cleaning both repositories, just as a clone -U |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
127 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
128 |
$ hg up -C -R sub2 null |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
129 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
130 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
131 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
132 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
133 |
$ hg up -C -R sub1 null |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
134 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
135 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
136 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
137 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
138 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
139 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
140 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
141 |
$ hg up -C -R main null |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
142 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
143 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
144 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
145 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
146 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
147 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
148 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
149 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
150 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
151 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
152 |
$ rm -rf main/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
153 |
$ rm -rf sub1/sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
154 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
155 |
Clone main |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
156 |
|
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
157 |
$ hg --config extensions.largefiles= clone main cloned |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
158 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
159 |
linking [ <=> ] 1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
160 |
linking [ <=> ] 2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
161 |
linking [ <=> ] 3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
162 |
linking [ <=> ] 4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
163 |
linking [ <=> ] 5\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
164 |
linking [ <=> ] 6\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
165 |
linking [ <=> ] 7\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
166 |
linking [ <=> ] 8\r (no-eol) (esc) |
37338
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
167 |
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !) |
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
168 |
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
169 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
170 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
171 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
34351
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
172 |
\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
173 |
\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
174 |
linking [ <=> ] 1\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
175 |
linking [ <=> ] 2\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
176 |
linking [ <=> ] 3\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
177 |
linking [ <=> ] 4\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
178 |
linking [ <=> ] 5\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
179 |
linking [ <=> ] 6\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
180 |
linking [ <=> ] 7\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
181 |
linking [ <=> ] 8\r (no-eol) (esc) |
37338
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
182 |
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !) |
cbc4425e81b5
tests: conditionalize tests based on presence of revlogs for files
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36943
diff
changeset
|
183 |
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
184 |
updating [===========================================>] 3/3\r (no-eol) (esc) |
34351
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
185 |
\r (no-eol) (esc) |
0e4bed5c5c38
ui: check for progress singleton when clearing progress bar (issue5684)
Mark Thomas <mbthomas@fb.com>
parents:
33545
diff
changeset
|
186 |
\r (no-eol) (esc) |
37416
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
187 |
linking [ <=> ] 1\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
188 |
linking [ <=> ] 2\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
189 |
linking [ <=> ] 3\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
190 |
linking [ <=> ] 4\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
191 |
linking [ <=> ] 5\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
192 |
linking [ <=> ] 6\r (no-eol) (esc) (reporevlogstore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
193 |
linking [ <=> ] 1\r (no-eol) (esc) (reposimplestore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
194 |
linking [ <=> ] 2\r (no-eol) (esc) (reposimplestore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
195 |
linking [ <=> ] 3\r (no-eol) (esc) (reposimplestore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
196 |
linking [ <=> ] 4\r (no-eol) (esc) (reposimplestore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
197 |
linking [ <=> ] 5\r (no-eol) (esc) (reposimplestore !) |
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37415
diff
changeset
|
198 |
linking [ <=> ] 6\r (no-eol) (esc) (reposimplestore !) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
199 |
updating [===========================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
200 |
\r (no-eol) (esc) |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
201 |
updating to branch default |
14281
ccb7240acf32
subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents:
12640
diff
changeset
|
202 |
cloning subrepo sub1 from $TESTTMP/sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
203 |
cloning subrepo sub1/sub2 from $TESTTMP/sub2 |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
204 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
205 |
|
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
206 |
Largefiles is NOT enabled in the clone if the source repo doesn't require it |
39854
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
207 |
$ grep largefiles cloned/.hg/hgrc |
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
208 |
[1] |
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
209 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
210 |
Checking cloned repo ids |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
211 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
212 |
$ printf "cloned " ; hg id -R cloned |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
213 |
cloned 7f491f53a367 tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
214 |
$ printf "cloned/sub1 " ; hg id -R cloned/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
215 |
cloned/sub1 fc3b4ce2696f tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
216 |
$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
217 |
cloned/sub1/sub2 c57a0840e3ba tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
218 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
219 |
debugsub output for main and sub1 |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
220 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
221 |
$ hg debugsub -R cloned |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
222 |
path sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
223 |
source ../sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
224 |
revision fc3b4ce2696f7741438c79207583768f2ce6b0dd |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
225 |
$ hg debugsub -R cloned/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
226 |
path sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
227 |
source ../sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
228 |
revision c57a0840e3badd667ef3c3ef65471609acb2ba3c |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
229 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
230 |
Modifying deeply nested 'sub2' |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
231 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
232 |
$ echo modified > cloned/sub1/sub2/sub2 |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
14281
diff
changeset
|
233 |
$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
234 |
committing subrepository sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
235 |
committing subrepository sub1/sub2 |
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
236 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
237 |
Checking modified node ids |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
238 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
239 |
$ printf "cloned " ; hg id -R cloned |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
240 |
cloned ffe6649062fe tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
241 |
$ printf "cloned/sub1 " ; hg id -R cloned/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
242 |
cloned/sub1 2ecb03bf44a9 tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
243 |
$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
244 |
cloned/sub1/sub2 53dd3430bcaf tip |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
245 |
|
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
246 |
debugsub output for main and sub1 |
11110
22f5ad0b5857
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
247 |
|
11913
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
248 |
$ hg debugsub -R cloned |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
249 |
path sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
250 |
source ../sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
251 |
revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
252 |
$ hg debugsub -R cloned/sub1 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
253 |
path sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
254 |
source ../sub2 |
628cdd158ec0
tests: unify test-subrepo-deep-nested-change
Martin Geisler <mg@lazybytes.net>
parents:
11110
diff
changeset
|
255 |
revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487 |
17105
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
256 |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
257 |
Check that deep archiving works |
17346
2944a6d35158
check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17113
diff
changeset
|
258 |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
259 |
$ cd cloned |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
260 |
$ echo 'test' > sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
261 |
$ hg --config extensions.largefiles=! add sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
262 |
$ mkdir sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
263 |
$ echo 'subfolder' > sub1/sub2/folder/test.txt |
23537
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
264 |
$ hg ci -ASm "add test.txt" |
23686
164915e8ef7b
narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23540
diff
changeset
|
265 |
adding sub1/sub2/folder/test.txt |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
266 |
committing subrepository sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
267 |
committing subrepository sub1/sub2 |
23325
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
268 |
|
33363
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
269 |
$ rm -r main |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
270 |
$ hg archive -S -qr 'wdir()' ../wdir |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
271 |
$ cat ../wdir/.hg_archival.txt |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
272 |
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
273 |
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+ |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
274 |
branch: default |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
275 |
latesttag: null |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
276 |
latesttagdistance: 4 |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
277 |
changessincelatesttag: 4 |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
278 |
$ hg update -Cq . |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
279 |
|
33364
bf2daeddd42b
subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
33363
diff
changeset
|
280 |
A deleted subrepo file is flagged as dirty, like the top level repo |
33363
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
281 |
|
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
282 |
$ rm -r ../wdir sub1/sub2/folder/test.txt |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
283 |
$ hg archive -S -qr 'wdir()' ../wdir |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
284 |
$ cat ../wdir/.hg_archival.txt |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
285 |
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
33364
bf2daeddd42b
subrepo: consider the parent repo dirty when a file is missing
Matt Harbison <matt_harbison@yahoo.com>
parents:
33363
diff
changeset
|
286 |
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+ |
33363
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
287 |
branch: default |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
288 |
latesttag: null |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
289 |
latesttagdistance: 4 |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
290 |
changessincelatesttag: 4 |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
291 |
$ hg update -Cq . |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
292 |
$ rm -r ../wdir |
3047167733dc
archival: flag missing files as a dirty wdir() in the metadata file (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
32005
diff
changeset
|
293 |
|
33545
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
294 |
$ hg archive -S -qr 'wdir()' ../wdir \ |
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
295 |
> --config 'experimental.archivemetatemplate=archived {node|short}\n' |
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
296 |
$ cat ../wdir/.hg_archival.txt |
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
297 |
archived ffffffffffff |
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
298 |
$ rm -r ../wdir |
8074e2d006c0
archive: add an experimental config to control the metadata file template
Matt Harbison <matt_harbison@yahoo.com>
parents:
33364
diff
changeset
|
299 |
|
23325
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
300 |
.. but first take a detour through some deep removal testing |
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
301 |
|
23327
bd296bb4b5c8
remove: avoid a bogus warning about no tracked files when removing '.'
Matt Harbison <matt_harbison@yahoo.com>
parents:
23326
diff
changeset
|
302 |
$ hg remove -S -I 're:.*.txt' . |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
303 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
304 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
305 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
306 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
307 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
308 |
deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
309 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
310 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
311 |
deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
312 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
313 |
removing sub1/sub2/folder/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
314 |
removing sub1/sub2/test.txt |
23325
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
315 |
$ hg status -S |
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
316 |
R sub1/sub2/folder/test.txt |
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
317 |
R sub1/sub2/test.txt |
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
318 |
$ hg update -Cq |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
319 |
$ hg remove -I 're:.*.txt' sub1 |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
320 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
321 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
322 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
323 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
324 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
325 |
\r (no-eol) (esc) |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
326 |
$ hg status -S |
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
327 |
$ hg remove sub1/sub2/folder/test.txt |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
328 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
329 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
330 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
331 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
332 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
333 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
334 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
335 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
336 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
337 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
338 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
339 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
340 |
\r (no-eol) (esc) |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
341 |
$ hg remove sub1/.hgsubstate |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
342 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
343 |
searching [==========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
344 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
345 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
346 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
347 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
348 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
349 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
350 |
\r (no-eol) (esc) |
24645
b39afa36006a
subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents:
24446
diff
changeset
|
351 |
$ mv sub1/.hgsub sub1/x.hgsub |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
352 |
$ hg status -S |
25865
a48a7c2d1fea
test-subrepo: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
25863
diff
changeset
|
353 |
warning: subrepo spec file 'sub1/.hgsub' not found |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
354 |
R sub1/.hgsubstate |
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
355 |
R sub1/sub2/folder/test.txt |
24645
b39afa36006a
subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents:
24446
diff
changeset
|
356 |
! sub1/.hgsub |
b39afa36006a
subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents:
24446
diff
changeset
|
357 |
? sub1/x.hgsub |
b39afa36006a
subrepo: precisely identify the missing subrepo spec file
Matt Harbison <matt_harbison@yahoo.com>
parents:
24446
diff
changeset
|
358 |
$ mv sub1/x.hgsub sub1/.hgsub |
23326
f6b8d23492e5
remove: support remove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23325
diff
changeset
|
359 |
$ hg update -Cq |
23538
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
360 |
$ touch sub1/foo |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
361 |
$ hg forget sub1/sub2/folder/test.txt |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
362 |
$ rm sub1/sub2/test.txt |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
363 |
|
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
364 |
Test relative path printing + subrepos |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
365 |
$ mkdir -p foo/bar |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
366 |
$ cd foo |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
367 |
$ touch bar/abc |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
368 |
$ hg addremove -S .. |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
369 |
\r (no-eol) (esc) |
38348
cd196be26cb7
similar: use progress helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
37556
diff
changeset
|
370 |
searching for exact renames [========================>] 1/1\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
371 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
372 |
adding ../sub1/sub2/folder/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
373 |
removing ../sub1/sub2/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
374 |
adding ../sub1/foo |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
375 |
adding bar/abc |
23538
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
376 |
$ cd .. |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
377 |
$ hg status -S |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
378 |
A foo/bar/abc |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
379 |
A sub1/foo |
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
380 |
R sub1/sub2/test.txt |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
381 |
|
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
382 |
Archive wdir() with subrepos |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
383 |
$ hg rm main |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
384 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
385 |
deleting [===========================================>] 1/1\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
386 |
\r (no-eol) (esc) |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
387 |
$ hg archive -S -r 'wdir()' ../wdir |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
388 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
389 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
390 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
391 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
392 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
393 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
394 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
395 |
archiving (sub1) [ ] 0/4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
396 |
archiving (sub1) [========> ] 1/4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
397 |
archiving (sub1) [=================> ] 2/4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
398 |
archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
399 |
archiving (sub1) [===================================>] 4/4\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
400 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
401 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
402 |
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
403 |
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
404 |
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
405 |
\r (no-eol) (esc) |
25863
1b449b012073
tests: diff -r on Solaris emits "Common subdirectories:"
Danek Duvall <danek.duvall@oracle.com>
parents:
25813
diff
changeset
|
406 |
$ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
407 |
Only in ../wdir: .hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
408 |
|
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
409 |
$ find ../wdir -type f | sort |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
410 |
../wdir/.hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
411 |
../wdir/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
412 |
../wdir/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
413 |
../wdir/foo/bar/abc |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
414 |
../wdir/sub1/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
415 |
../wdir/sub1/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
416 |
../wdir/sub1/foo |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
417 |
../wdir/sub1/sub1 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
418 |
../wdir/sub1/sub2/folder/test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
419 |
../wdir/sub1/sub2/sub2 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
420 |
|
25615
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
421 |
$ cat ../wdir/.hg_archival.txt |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
422 |
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
423 |
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+ |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
424 |
branch: default |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
425 |
latesttag: null |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
426 |
latesttagdistance: 4 |
25690
98064baab877
archive: fix changesincelatesttag with wdir()
Matt Mackall <mpm@selenic.com>
parents:
25615
diff
changeset
|
427 |
changessincelatesttag: 4 |
25615
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
428 |
|
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
429 |
Attempting to archive 'wdir()' with a missing file is handled gracefully |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
430 |
$ rm sub1/sub1 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
431 |
$ rm -r ../wdir |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
432 |
$ hg archive -v -S -r 'wdir()' ../wdir |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
433 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
434 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
435 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
436 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
437 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
438 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
439 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
440 |
archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
441 |
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
442 |
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
443 |
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
444 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
445 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
446 |
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
447 |
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
448 |
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
449 |
\r (no-eol) (esc) |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
450 |
$ find ../wdir -type f | sort |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
451 |
../wdir/.hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
452 |
../wdir/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
453 |
../wdir/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
454 |
../wdir/foo/bar/abc |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
455 |
../wdir/sub1/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
456 |
../wdir/sub1/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
457 |
../wdir/sub1/foo |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
458 |
../wdir/sub1/sub2/folder/test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
459 |
../wdir/sub1/sub2/sub2 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
460 |
|
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
461 |
Continue relative path printing + subrepos |
23538
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
462 |
$ hg update -Cq |
25615
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
463 |
$ rm -r ../wdir |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
464 |
$ hg archive -S -r 'wdir()' ../wdir |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
465 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
466 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
467 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
468 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
469 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
470 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
471 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
472 |
archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
473 |
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
474 |
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
475 |
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
476 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
477 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
478 |
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
479 |
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
480 |
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
481 |
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
482 |
\r (no-eol) (esc) |
25615
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
483 |
$ cat ../wdir/.hg_archival.txt |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
484 |
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
485 |
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
486 |
branch: default |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
487 |
latesttag: null |
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
488 |
latesttagdistance: 4 |
25690
98064baab877
archive: fix changesincelatesttag with wdir()
Matt Mackall <mpm@selenic.com>
parents:
25615
diff
changeset
|
489 |
changessincelatesttag: 4 |
25615
dc707fb35550
archive: report the node as "{p1node}+" when archiving a dirty wdir()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25601
diff
changeset
|
490 |
|
23539
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
491 |
$ touch sub1/sub2/folder/bar |
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
492 |
$ hg addremove sub1/sub2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
493 |
adding sub1/sub2/folder/bar |
23539
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
494 |
$ hg status -S |
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
495 |
A sub1/sub2/folder/bar |
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
496 |
? foo/bar/abc |
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
497 |
? sub1/foo |
cb42050f2dad
addremove: support addremove with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23538
diff
changeset
|
498 |
$ hg update -Cq |
23540
f274d27f1994
addremove: automatically process a subrepository's subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23539
diff
changeset
|
499 |
$ hg addremove sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
500 |
adding sub1/sub2/folder/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
501 |
adding sub1/foo |
23540
f274d27f1994
addremove: automatically process a subrepository's subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
23539
diff
changeset
|
502 |
$ hg update -Cq |
23537
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
503 |
$ rm sub1/sub2/folder/test.txt |
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
504 |
$ rm sub1/sub2/test.txt |
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
505 |
$ hg ci -ASm "remove test.txt" |
23686
164915e8ef7b
narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23540
diff
changeset
|
506 |
adding sub1/sub2/folder/bar |
164915e8ef7b
narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23540
diff
changeset
|
507 |
removing sub1/sub2/folder/test.txt |
164915e8ef7b
narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23540
diff
changeset
|
508 |
removing sub1/sub2/test.txt |
164915e8ef7b
narrowmatcher: propagate the rel() method
Matt Harbison <matt_harbison@yahoo.com>
parents:
23540
diff
changeset
|
509 |
adding sub1/foo |
23538
ccfb56450f21
addremove: add support for the -S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
23537
diff
changeset
|
510 |
adding foo/bar/abc |
23537
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
511 |
committing subrepository sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
512 |
committing subrepository sub1/sub2 |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
513 |
|
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
514 |
$ hg forget sub1/sub2/sub2 |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
515 |
$ echo x > sub1/sub2/x.txt |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
516 |
$ hg add sub1/sub2/x.txt |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
517 |
|
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
518 |
Files sees uncommitted adds and removes in subrepos |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
519 |
$ hg files -S |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
520 |
.hgsub |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
521 |
.hgsubstate |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
522 |
foo/bar/abc |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
523 |
main |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
524 |
sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
525 |
sub1/.hgsubstate |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
526 |
sub1/foo |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
527 |
sub1/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
528 |
sub1/sub2/folder/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
529 |
sub1/sub2/x.txt |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
530 |
|
25122
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
531 |
$ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')" |
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
532 |
.hgsub |
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
533 |
.hgsubstate |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
534 |
foo/bar/abc |
25122
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
535 |
main |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
536 |
sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
537 |
sub1/.hgsubstate |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
538 |
sub1/foo |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
539 |
sub1/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
540 |
sub1/sub2/folder/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
541 |
sub1/sub2/x.txt |
25122
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
542 |
|
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
543 |
$ hg files -r '.^' -S "set:eol('dos') or eol('unix')" |
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
544 |
.hgsub |
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
545 |
.hgsubstate |
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
546 |
main |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
547 |
sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
548 |
sub1/.hgsubstate |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
549 |
sub1/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
550 |
sub1/sub2/folder/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
551 |
sub1/sub2/sub2 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
552 |
sub1/sub2/test.txt |
25122
755d23a49170
match: resolve filesets in subrepos for commands given the '-S' argument
Matt Harbison <matt_harbison@yahoo.com>
parents:
24953
diff
changeset
|
553 |
|
25228
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
554 |
$ hg files sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
555 |
sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
556 |
sub1/.hgsubstate |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
557 |
sub1/foo |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
558 |
sub1/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
559 |
sub1/sub2/folder/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
560 |
sub1/sub2/x.txt |
25228
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
561 |
|
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
562 |
$ hg files sub1/sub2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
563 |
sub1/sub2/folder/bar |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
564 |
sub1/sub2/x.txt |
25228
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
565 |
|
28387
97175d9bf7cf
files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents:
26421
diff
changeset
|
566 |
$ hg files |
97175d9bf7cf
files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents:
26421
diff
changeset
|
567 |
.hgsub |
97175d9bf7cf
files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents:
26421
diff
changeset
|
568 |
.hgsubstate |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
569 |
foo/bar/abc |
28387
97175d9bf7cf
files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents:
26421
diff
changeset
|
570 |
main |
97175d9bf7cf
files: don't recurse into subrepos without a path or -S (issue5127)
Matt Harbison <matt_harbison@yahoo.com>
parents:
26421
diff
changeset
|
571 |
|
25193
ccb1623266eb
context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
572 |
$ hg files -S -r '.^' sub1/sub2/folder |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
573 |
sub1/sub2/folder/test.txt |
25193
ccb1623266eb
context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
574 |
|
ccb1623266eb
context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
575 |
$ hg files -S -r '.^' sub1/sub2/missing |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
576 |
sub1/sub2/missing: no such file in rev 78026e779ea6 |
25193
ccb1623266eb
context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
577 |
[1] |
ccb1623266eb
context: don't complain about a matcher's subrepo paths in changectx.walk()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
578 |
|
25228
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
579 |
$ hg files -r '.^' sub1/ |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
580 |
sub1/.hgsub |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
581 |
sub1/.hgsubstate |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
582 |
sub1/sub1 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
583 |
sub1/sub2/folder/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
584 |
sub1/sub2/sub2 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
585 |
sub1/sub2/test.txt |
25194
ef4538ba67ef
match: explicitly naming a subrepo implies always() for the submatcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
25193
diff
changeset
|
586 |
|
25228
63a57a2727b6
files: recurse into subrepos automatically with an explicit path
Matt Harbison <matt_harbison@yahoo.com>
parents:
25195
diff
changeset
|
587 |
$ hg files -r '.^' sub1/sub2 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
588 |
sub1/sub2/folder/test.txt |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
589 |
sub1/sub2/sub2 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
590 |
sub1/sub2/test.txt |
25194
ef4538ba67ef
match: explicitly naming a subrepo implies always() for the submatcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
25193
diff
changeset
|
591 |
|
23537
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
592 |
$ hg rollback -q |
f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23327
diff
changeset
|
593 |
$ hg up -Cq |
23325
4165cfd67519
remove: recurse into subrepositories with --subrepos/-S flag
Matt Harbison <matt_harbison@yahoo.com>
parents:
17346
diff
changeset
|
594 |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
595 |
$ hg --config extensions.largefiles=! archive -S ../archive_all |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
596 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
597 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
598 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
599 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
600 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
601 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
602 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
603 |
archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
604 |
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
605 |
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
606 |
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
607 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
608 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
609 |
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
610 |
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
611 |
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
612 |
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
613 |
\r (no-eol) (esc) |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
614 |
$ find ../archive_all | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
615 |
../archive_all |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
616 |
../archive_all/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
617 |
../archive_all/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
618 |
../archive_all/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
619 |
../archive_all/main |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
620 |
../archive_all/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
621 |
../archive_all/sub1/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
622 |
../archive_all/sub1/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
623 |
../archive_all/sub1/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
624 |
../archive_all/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
625 |
../archive_all/sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
626 |
../archive_all/sub1/sub2/folder/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
627 |
../archive_all/sub1/sub2/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
628 |
../archive_all/sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
629 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
630 |
Check that archive -X works in deep subrepos |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
631 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
632 |
$ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
633 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
634 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
635 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
636 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
637 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
638 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
639 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
640 |
archiving (sub1) [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
641 |
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
642 |
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
643 |
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
644 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
645 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
646 |
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
647 |
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
648 |
\r (no-eol) (esc) |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
649 |
$ find ../archive_exclude | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
650 |
../archive_exclude |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
651 |
../archive_exclude/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
652 |
../archive_exclude/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
653 |
../archive_exclude/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
654 |
../archive_exclude/main |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
655 |
../archive_exclude/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
656 |
../archive_exclude/sub1/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
657 |
../archive_exclude/sub1/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
658 |
../archive_exclude/sub1/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
659 |
../archive_exclude/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
660 |
../archive_exclude/sub1/sub2/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
661 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
662 |
$ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
663 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
664 |
archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
665 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
666 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
667 |
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
668 |
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
669 |
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
670 |
\r (no-eol) (esc) |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
671 |
$ find ../archive_include | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
672 |
../archive_include |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
673 |
../archive_include/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
674 |
../archive_include/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
675 |
../archive_include/sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
676 |
../archive_include/sub1/sub2/folder/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
677 |
../archive_include/sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
678 |
|
17105
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
679 |
Check that deep archive works with largefiles (which overrides hgsubrepo impl) |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
680 |
This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
681 |
subrepos are archived properly. |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
682 |
Note that add --large through a subrepo currently adds the file as a normal file |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
683 |
|
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
684 |
$ echo "large" > sub1/sub2/large.bin |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
685 |
$ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
686 |
$ echo "large" > large.bin |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
687 |
$ hg --config extensions.largefiles= add --large large.bin |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
688 |
$ hg --config extensions.largefiles= ci -S -m "add large files" |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
689 |
committing subrepository sub1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
690 |
committing subrepository sub1/sub2 |
17105
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
691 |
|
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
692 |
$ hg --config extensions.largefiles= archive -S ../archive_lf |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
693 |
$ find ../archive_lf | sort |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
694 |
../archive_lf |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
695 |
../archive_lf/.hg_archival.txt |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
696 |
../archive_lf/.hgsub |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
697 |
../archive_lf/.hgsubstate |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
698 |
../archive_lf/large.bin |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
699 |
../archive_lf/main |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
700 |
../archive_lf/sub1 |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
701 |
../archive_lf/sub1/.hgsub |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
702 |
../archive_lf/sub1/.hgsubstate |
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
703 |
../archive_lf/sub1/sub1 |
17106
4d0e81dca75f
largefiles: fix the directory structure when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
17105
diff
changeset
|
704 |
../archive_lf/sub1/sub2 |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
705 |
../archive_lf/sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
706 |
../archive_lf/sub1/sub2/folder/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
707 |
../archive_lf/sub1/sub2/large.bin |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
708 |
../archive_lf/sub1/sub2/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
709 |
../archive_lf/sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
710 |
$ rm -rf ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
711 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
712 |
Exclude large files from main and sub-sub repo |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
713 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
714 |
$ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
715 |
$ find ../archive_lf | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
716 |
../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
717 |
../archive_lf/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
718 |
../archive_lf/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
719 |
../archive_lf/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
720 |
../archive_lf/main |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
721 |
../archive_lf/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
722 |
../archive_lf/sub1/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
723 |
../archive_lf/sub1/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
724 |
../archive_lf/sub1/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
725 |
../archive_lf/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
726 |
../archive_lf/sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
727 |
../archive_lf/sub1/sub2/folder/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
728 |
../archive_lf/sub1/sub2/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
729 |
../archive_lf/sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
730 |
$ rm -rf ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
731 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
732 |
Exclude normal files from main and sub-sub repo |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
733 |
|
24953
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
734 |
$ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz |
24924
41cd8171e58f
archive: always use portable path component separators with subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
24645
diff
changeset
|
735 |
$ tar -tzf ../archive_lf.tgz | sort |
24953
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
736 |
.hgsub |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
737 |
.hgsubstate |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
738 |
large.bin |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
739 |
main |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
740 |
sub1/.hgsub |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
741 |
sub1/.hgsubstate |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
742 |
sub1/sub1 |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
743 |
sub1/sub2/large.bin |
5115d03440f4
archive: drop the leading '.' path component from the prefix (issue4634)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24924
diff
changeset
|
744 |
sub1/sub2/sub2 |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
745 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
746 |
Include normal files from within a largefiles subrepo |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
747 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
748 |
$ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
749 |
$ find ../archive_lf | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
750 |
../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
751 |
../archive_lf/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
752 |
../archive_lf/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
753 |
../archive_lf/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
754 |
../archive_lf/sub1/sub2/folder |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
755 |
../archive_lf/sub1/sub2/folder/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
756 |
../archive_lf/sub1/sub2/test.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
757 |
$ rm -rf ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
758 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
759 |
Include large files from within a largefiles subrepo |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
760 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
761 |
$ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
762 |
$ find ../archive_lf | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
763 |
../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
764 |
../archive_lf/large.bin |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
765 |
../archive_lf/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
766 |
../archive_lf/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
767 |
../archive_lf/sub1/sub2/large.bin |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
768 |
$ rm -rf ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
769 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
770 |
Find an exact largefile match in a largefiles subrepo |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
771 |
|
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
772 |
$ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
773 |
$ find ../archive_lf | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
774 |
../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
775 |
../archive_lf/sub1 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
776 |
../archive_lf/sub1/sub2 |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
777 |
../archive_lf/sub1/sub2/large.bin |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
778 |
$ rm -rf ../archive_lf |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
779 |
|
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
780 |
The local repo enables largefiles if a largefiles repo is cloned |
39854
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
781 |
|
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
782 |
$ hg showconfig extensions |
39854
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
783 |
extensions.largefiles= |
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
784 |
|
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
785 |
$ hg --config extensions.largefiles= clone -qU . ../lfclone |
39854
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
786 |
$ grep largefiles ../lfclone/.hg/requires |
823a580448d7
largefiles: automatically load largefiles extension when required (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38348
diff
changeset
|
787 |
largefiles |
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23923
diff
changeset
|
788 |
|
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
789 |
Find an exact match to a standin (should archive nothing) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17106
diff
changeset
|
790 |
$ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf |
17113
d7493da233c8
tests: remove GNU quoting in test-subrepo-deep-nested-change.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17112
diff
changeset
|
791 |
$ find ../archive_lf 2> /dev/null | sort |
17105
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
792 |
|
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
793 |
$ cat >> $HGRCPATH <<EOF |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
794 |
> [extensions] |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
795 |
> largefiles= |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
796 |
> [largefiles] |
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
797 |
> patterns=glob:**.dat |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
798 |
> EOF |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
799 |
|
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
800 |
Test forget through a deep subrepo with the largefiles extension, both a |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
801 |
largefile and a normal file. Then a largefile that hasn't been committed yet. |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
802 |
$ touch sub1/sub2/untracked.txt |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
803 |
$ touch sub1/sub2/large.dat |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
804 |
$ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
805 |
not removing sub1/sub2/untracked.txt: file is already untracked |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
806 |
[1] |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
807 |
$ hg add --large --dry-run -v sub1/sub2/untracked.txt |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
808 |
adding sub1/sub2/untracked.txt as a largefile |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
809 |
$ hg add --large -v sub1/sub2/untracked.txt |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
810 |
adding sub1/sub2/untracked.txt as a largefile |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
811 |
$ hg add --normal -v sub1/sub2/large.dat |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
812 |
adding sub1/sub2/large.dat |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
813 |
$ hg forget -v sub1/sub2/untracked.txt |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
814 |
removing sub1/sub2/untracked.txt |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
815 |
$ hg status -S |
23886
5ce8dcd05dc4
largefiles: enable subrepo support for add
Matt Harbison <matt_harbison@yahoo.com>
parents:
23837
diff
changeset
|
816 |
A sub1/sub2/large.dat |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
817 |
R sub1/sub2/large.bin |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
818 |
R sub1/sub2/test.txt |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
819 |
? foo/bar/abc |
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
820 |
? sub1/sub2/untracked.txt |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24230
diff
changeset
|
821 |
? sub1/sub2/x.txt |
23923
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
822 |
$ hg add sub1/sub2 |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
823 |
|
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
824 |
$ hg archive -S -r 'wdir()' ../wdir2 |
25863
1b449b012073
tests: diff -r on Solaris emits "Common subdirectories:"
Danek Duvall <danek.duvall@oracle.com>
parents:
25813
diff
changeset
|
825 |
$ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:' |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
826 |
Only in ../wdir2: .hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
827 |
Only in .: .hglf |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
828 |
Only in .: foo |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
829 |
Only in ./sub1/sub2: large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
830 |
Only in ./sub1/sub2: test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
831 |
Only in ./sub1/sub2: untracked.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
832 |
Only in ./sub1/sub2: x.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
833 |
$ find ../wdir2 -type f | sort |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
834 |
../wdir2/.hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
835 |
../wdir2/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
836 |
../wdir2/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
837 |
../wdir2/large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
838 |
../wdir2/main |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
839 |
../wdir2/sub1/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
840 |
../wdir2/sub1/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
841 |
../wdir2/sub1/sub1 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
842 |
../wdir2/sub1/sub2/folder/test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
843 |
../wdir2/sub1/sub2/large.dat |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
844 |
../wdir2/sub1/sub2/sub2 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
845 |
$ hg status -S -mac -n | sort |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
846 |
.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
847 |
.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
848 |
large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
849 |
main |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
850 |
sub1/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
851 |
sub1/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
852 |
sub1/sub1 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
853 |
sub1/sub2/folder/test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
854 |
sub1/sub2/large.dat |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
855 |
sub1/sub2/sub2 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
856 |
|
23923
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
857 |
$ hg ci -Sqm 'forget testing' |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
858 |
|
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
859 |
Test 'wdir()' modified file archiving with largefiles |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
860 |
$ echo 'mod' > main |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
861 |
$ echo 'mod' > large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
862 |
$ echo 'mod' > sub1/sub2/large.dat |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
863 |
$ hg archive -S -r 'wdir()' ../wdir3 |
25863
1b449b012073
tests: diff -r on Solaris emits "Common subdirectories:"
Danek Duvall <danek.duvall@oracle.com>
parents:
25813
diff
changeset
|
864 |
$ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories' |
25601
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
865 |
Only in ../wdir3: .hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
866 |
Only in .: .hglf |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
867 |
Only in .: foo |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
868 |
Only in ./sub1/sub2: large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
869 |
Only in ./sub1/sub2: test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
870 |
Only in ./sub1/sub2: untracked.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
871 |
Only in ./sub1/sub2: x.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
872 |
$ find ../wdir3 -type f | sort |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
873 |
../wdir3/.hg_archival.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
874 |
../wdir3/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
875 |
../wdir3/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
876 |
../wdir3/large.bin |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
877 |
../wdir3/main |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
878 |
../wdir3/sub1/.hgsub |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
879 |
../wdir3/sub1/.hgsubstate |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
880 |
../wdir3/sub1/sub1 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
881 |
../wdir3/sub1/sub2/folder/test.txt |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
882 |
../wdir3/sub1/sub2/large.dat |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
883 |
../wdir3/sub1/sub2/sub2 |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
884 |
$ hg up -Cq |
3ec8351fa6ed
archive: support 'wdir()'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25228
diff
changeset
|
885 |
|
23923
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
886 |
Test issue4330: commit a directory where only normal files have changed |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
887 |
$ touch foo/bar/large.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
888 |
$ hg add --large foo/bar/large.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
889 |
$ hg ci -m 'add foo/bar/large.dat' |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
890 |
$ touch a.txt |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
891 |
$ touch a.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
892 |
$ hg add -v foo/bar/abc a.txt a.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
893 |
adding a.dat as a largefile |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
894 |
adding a.txt |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
895 |
adding foo/bar/abc |
23923
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
896 |
$ hg ci -m 'dir commit with only normal file deltas' foo/bar |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
897 |
$ hg status |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
898 |
A a.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
899 |
A a.txt |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
900 |
|
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
901 |
Test a directory commit with a changed largefile and a changed normal file |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
902 |
$ echo changed > foo/bar/large.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
903 |
$ echo changed > foo/bar/abc |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
904 |
$ hg ci -m 'dir commit with normal and lf file deltas' foo |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
905 |
$ hg status |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
906 |
A a.dat |
ab6fd3205dad
largefiles: fix commit of a directory with no largefile changes (issue4330)
Matt Harbison <matt_harbison@yahoo.com>
parents:
23886
diff
changeset
|
907 |
A a.txt |
23837
2b79d124a12f
largefiles: enable subrepo support for forget
Matt Harbison <matt_harbison@yahoo.com>
parents:
23686
diff
changeset
|
908 |
|
24230
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
909 |
$ hg ci -m "add a.*" |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
910 |
$ hg mv a.dat b.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
911 |
$ hg mv foo/bar/abc foo/bar/def |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
912 |
$ hg status -C |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
913 |
A b.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
914 |
a.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
915 |
A foo/bar/def |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
916 |
foo/bar/abc |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
917 |
R a.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
918 |
R foo/bar/abc |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
919 |
|
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
920 |
$ hg ci -m "move large and normal" |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
921 |
$ hg status -C --rev '.^' --rev . |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
922 |
A b.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
923 |
a.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
924 |
A foo/bar/def |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
925 |
foo/bar/abc |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
926 |
R a.dat |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
927 |
R foo/bar/abc |
23438bceba04
largefiles: report the source of copied/moved largefiles in status -C
Matt Harbison <matt_harbison@yahoo.com>
parents:
24029
diff
changeset
|
928 |
|
24446
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
929 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
930 |
$ echo foo > main |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
931 |
$ hg ci -m "mod parent only" |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
932 |
$ hg init sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
933 |
$ echo "sub3 = sub3" >> .hgsub |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
934 |
$ echo xyz > sub3/a.txt |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
935 |
$ hg add sub3/a.txt |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
936 |
$ hg ci -Sm "add sub3" |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
937 |
committing subrepository sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
938 |
$ cat .hgsub | grep -v sub3 > .hgsub1 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
939 |
$ mv .hgsub1 .hgsub |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
940 |
$ hg ci -m "remove sub3" |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
941 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
942 |
$ hg log -r "subrepo()" --style compact |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
943 |
0 7f491f53a367 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
944 |
main import |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
945 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
946 |
1 ffe6649062fe 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
947 |
deep nested modif should trigger a commit |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
948 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
949 |
2 9bb10eebee29 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
950 |
add test.txt |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
951 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
952 |
3 7c64f035294f 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
953 |
add large files |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
954 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
955 |
4 f734a59e2e35 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
956 |
forget testing |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
957 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
958 |
11 9685a22af5db 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
959 |
add sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
960 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
961 |
12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
962 |
remove sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
963 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
964 |
$ hg log -r "subrepo('sub3')" --style compact |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
965 |
11 9685a22af5db 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
966 |
add sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
967 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
968 |
12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
969 |
remove sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
970 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
971 |
$ hg log -r "subrepo('bogus')" --style compact |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
972 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
973 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
974 |
Test .hgsubstate in the R state |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
975 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
976 |
$ hg rm .hgsub .hgsubstate |
28608
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
977 |
\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
978 |
deleting [=====================> ] 1/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
979 |
deleting [===========================================>] 2/2\r (no-eol) (esc) |
62e73d42bd14
remove: add progress support
timeless <timeless@mozdev.org>
parents:
28606
diff
changeset
|
980 |
\r (no-eol) (esc) |
24446
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
981 |
$ hg ci -m 'trash subrepo tracking' |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
982 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
983 |
$ hg log -r "subrepo('re:sub\d+')" --style compact |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
984 |
0 7f491f53a367 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
985 |
main import |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
986 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
987 |
1 ffe6649062fe 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
988 |
deep nested modif should trigger a commit |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
989 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
990 |
2 9bb10eebee29 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
991 |
add test.txt |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
992 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
993 |
3 7c64f035294f 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
994 |
add large files |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
995 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
996 |
4 f734a59e2e35 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
997 |
forget testing |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
998 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
999 |
11 9685a22af5db 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1000 |
add sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1001 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1002 |
12 2e0485b475b9 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1003 |
remove sub3 |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1004 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1005 |
13[tip] a68b2c361653 1970-01-01 00:00 +0000 test |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1006 |
trash subrepo tracking |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1007 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1008 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1009 |
Restore the trashed subrepo tracking |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1010 |
|
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1011 |
$ hg rollback -q |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1012 |
$ hg update -Cq . |
582cfcc843c7
revset: add the 'subrepo' symbol
Matt Harbison <matt_harbison@yahoo.com>
parents:
24413
diff
changeset
|
1013 |
|
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1014 |
Interaction with extdiff, largefiles and subrepos |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1015 |
|
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
1016 |
$ hg --config extensions.extdiff= pdiff -S |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1017 |
|
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
1018 |
$ hg --config extensions.extdiff= pdiff -r '.^' -S |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1019 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1020 |
archiving [ ] 0/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1021 |
archiving [====================> ] 1/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1022 |
archiving [==========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1023 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1024 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1025 |
archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1026 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1027 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1028 |
archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1029 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1030 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1031 |
archiving (sub3) [ <=> ] 0\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1032 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1033 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1034 |
archiving [ ] 0/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1035 |
archiving [====================> ] 1/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1036 |
archiving [==========================================>] 2/2\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1037 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1038 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1039 |
archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1040 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1041 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1042 |
archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1043 |
\r (no-eol) (esc) |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1044 |
diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
28034
e7ff258f71df
tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
1045 |
--- cloned.*/.hgsub * (glob) |
e7ff258f71df
tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
1046 |
+++ cloned/.hgsub * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1047 |
@@ -1,2 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1048 |
sub1 = ../sub1 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1049 |
-sub3 = sub3 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1050 |
diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
28034
e7ff258f71df
tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
1051 |
--- cloned.*/.hgsubstate * (glob) |
e7ff258f71df
tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28033
diff
changeset
|
1052 |
+++ cloned/.hgsubstate * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1053 |
@@ -1,2 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1054 |
7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1055 |
-b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1056 |
[1] |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1057 |
|
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
1058 |
$ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1059 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1060 |
archiving [ ] 0/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1061 |
archiving [=============> ] 1/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1062 |
archiving [===========================> ] 2/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1063 |
archiving [==========================================>] 3/3\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1064 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1065 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1066 |
archiving (sub1) [ ] 0/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1067 |
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1068 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1069 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1070 |
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1071 |
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1072 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1073 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1074 |
archiving [ ] 0/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1075 |
archiving [====> ] 1/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1076 |
archiving [=========> ] 2/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1077 |
archiving [===============> ] 3/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1078 |
archiving [====================> ] 4/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1079 |
archiving [=========================> ] 5/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1080 |
archiving [===============================> ] 6/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1081 |
archiving [====================================> ] 7/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1082 |
archiving [==========================================>] 8/8\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1083 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1084 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1085 |
archiving (sub1) [ ] 0/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1086 |
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1087 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1088 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1089 |
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1090 |
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1091 |
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1092 |
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1093 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1094 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1095 |
archiving (sub3) [ ] 0/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1096 |
archiving (sub3) [===================================>] 1/1\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1097 |
\r (no-eol) (esc) |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1098 |
diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1099 |
--- cloned.*/.hglf/b.dat * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1100 |
+++ cloned.*/.hglf/b.dat * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1101 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1102 |
+da39a3ee5e6b4b0d3255bfef95601890afd80709 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1103 |
diff -Nru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1104 |
--- cloned.*/.hglf/foo/bar/large.dat * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1105 |
+++ cloned.*/.hglf/foo/bar/large.dat * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1106 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1107 |
+2f6933b5ee0f5fdd823d9717d8729f3c2523811b |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1108 |
diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1109 |
--- cloned.*/.hglf/large.bin * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1110 |
+++ cloned.*/.hglf/large.bin * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1111 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1112 |
+7f7097b041ccf68cc5561e9600da4655d21c6d18 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1113 |
diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1114 |
--- cloned.*/.hgsub * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1115 |
+++ cloned.*/.hgsub * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1116 |
@@ -1* +1,2 @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1117 |
sub1 = ../sub1 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1118 |
+sub3 = sub3 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1119 |
diff -Nru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1120 |
--- cloned.*/.hgsubstate * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1121 |
+++ cloned.*/.hgsubstate * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1122 |
@@ -1* +1,2 @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1123 |
-fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1124 |
+7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1125 |
+b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1126 |
diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1127 |
--- cloned.*/foo/bar/def * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1128 |
+++ cloned.*/foo/bar/def * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1129 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1130 |
+changed |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1131 |
diff -Nru cloned.*/main cloned.*/main (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1132 |
--- cloned.*/main * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1133 |
+++ cloned.*/main * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1134 |
@@ -1* +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1135 |
-main |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1136 |
+foo |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1137 |
diff -Nru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1138 |
--- cloned.*/sub1/.hgsubstate * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1139 |
+++ cloned.*/sub1/.hgsubstate * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1140 |
@@ -1* +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1141 |
-c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1142 |
+c77908c81ccea3794a896c79e98b0e004aee2e9e sub2 |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1143 |
diff -Nru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1144 |
--- cloned.*/sub1/sub2/folder/test.txt * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1145 |
+++ cloned.*/sub1/sub2/folder/test.txt * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1146 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1147 |
+subfolder |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1148 |
diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1149 |
--- cloned.*/sub1/sub2/sub2 * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1150 |
+++ cloned.*/sub1/sub2/sub2 * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1151 |
@@ -1* +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1152 |
-sub2 |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1153 |
+modified |
28033
0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26421
diff
changeset
|
1154 |
diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1155 |
--- cloned.*/sub3/a.txt * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1156 |
+++ cloned.*/sub3/a.txt * (glob) |
28036
b5069c2b6f62
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28035
diff
changeset
|
1157 |
@@ -*,0 +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1158 |
+xyz |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1159 |
[1] |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1160 |
|
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1161 |
$ echo mod > sub1/sub2/sub2 |
28052
b59ef0c21405
tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28036
diff
changeset
|
1162 |
$ hg --config extensions.extdiff= pdiff -S |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1163 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1164 |
archiving (sub1) [ <=> ] 0\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1165 |
\r (no-eol) (esc) |
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1166 |
\r (no-eol) (esc) |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1167 |
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc) |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1168 |
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc) |
28606
8cc51c5a9365
tests: include progress for test-remove
timeless <timeless@mozdev.org>
parents:
28449
diff
changeset
|
1169 |
\r (no-eol) (esc) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1170 |
--- */cloned.*/sub1/sub2/sub2 * (glob) |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1171 |
+++ */cloned/sub1/sub2/sub2 * (glob) |
28035
c65da6892ae5
tests: make chunk header of external diff glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28034
diff
changeset
|
1172 |
@@ -1* +1* @@ (glob) |
25813
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1173 |
-modified |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1174 |
+mod |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1175 |
[1] |
18bae5eb58c5
extdiff: add support for subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
25690
diff
changeset
|
1176 |
|
17105
7d45730ea1b8
largefiles: fix a traceback when archiving a subrepo in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16073
diff
changeset
|
1177 |
$ cd .. |