Show More
@@ -1,374 +1,374 b'' | |||||
1 | #testcases flat tree |
|
1 | #testcases flat tree | |
2 |
|
2 | |||
3 | $ . "$TESTDIR/narrow-library.sh" |
|
3 | $ . "$TESTDIR/narrow-library.sh" | |
4 |
|
4 | |||
5 | #if tree |
|
5 | #if tree | |
6 | $ cat << EOF >> $HGRCPATH |
|
6 | $ cat << EOF >> $HGRCPATH | |
7 | > [experimental] |
|
7 | > [experimental] | |
8 | > treemanifest = 1 |
|
8 | > treemanifest = 1 | |
9 | > EOF |
|
9 | > EOF | |
10 | #endif |
|
10 | #endif | |
11 |
|
11 | |||
12 | $ hg init master |
|
12 | $ hg init master | |
13 | $ cd master |
|
13 | $ cd master | |
14 | $ cat >> .hg/hgrc <<EOF |
|
14 | $ cat >> .hg/hgrc <<EOF | |
15 | > [narrow] |
|
15 | > [narrow] | |
16 | > serveellipses=True |
|
16 | > serveellipses=True | |
17 | > EOF |
|
17 | > EOF | |
18 | $ for x in `$TESTDIR/seq.py 0 10` |
|
18 | $ for x in `$TESTDIR/seq.py 0 10` | |
19 | > do |
|
19 | > do | |
20 | > mkdir d$x |
|
20 | > mkdir d$x | |
21 | > echo $x > d$x/f |
|
21 | > echo $x > d$x/f | |
22 | > hg add d$x/f |
|
22 | > hg add d$x/f | |
23 | > hg commit -m "add d$x/f" |
|
23 | > hg commit -m "add d$x/f" | |
24 | > done |
|
24 | > done | |
25 | $ hg log -T "{node|short}: {desc}\n" |
|
25 | $ hg log -T "{node|short}: {desc}\n" | |
26 | *: add d10/f (glob) |
|
26 | *: add d10/f (glob) | |
27 | *: add d9/f (glob) |
|
27 | *: add d9/f (glob) | |
28 | *: add d8/f (glob) |
|
28 | *: add d8/f (glob) | |
29 | *: add d7/f (glob) |
|
29 | *: add d7/f (glob) | |
30 | *: add d6/f (glob) |
|
30 | *: add d6/f (glob) | |
31 | *: add d5/f (glob) |
|
31 | *: add d5/f (glob) | |
32 | *: add d4/f (glob) |
|
32 | *: add d4/f (glob) | |
33 | *: add d3/f (glob) |
|
33 | *: add d3/f (glob) | |
34 | *: add d2/f (glob) |
|
34 | *: add d2/f (glob) | |
35 | *: add d1/f (glob) |
|
35 | *: add d1/f (glob) | |
36 | *: add d0/f (glob) |
|
36 | *: add d0/f (glob) | |
37 | $ cd .. |
|
37 | $ cd .. | |
38 |
|
38 | |||
39 | Error if '.' or '..' are in the directory to track. |
|
39 | Error if '.' or '..' are in the directory to track. | |
40 | $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf |
|
40 | $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf | |
41 | requesting all changes |
|
41 | requesting all changes | |
42 | abort: "." and ".." are not allowed in narrowspec paths |
|
42 | abort: "." and ".." are not allowed in narrowspec paths | |
43 | [255] |
|
43 | [255] | |
44 | $ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. |
|
44 | $ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. | |
45 | requesting all changes |
|
45 | requesting all changes | |
46 | abort: "." and ".." are not allowed in narrowspec paths |
|
46 | abort: "." and ".." are not allowed in narrowspec paths | |
47 | [255] |
|
47 | [255] | |
48 | $ hg clone --narrow ssh://user@dummy/master foo --include a/./c |
|
48 | $ hg clone --narrow ssh://user@dummy/master foo --include a/./c | |
49 | requesting all changes |
|
49 | requesting all changes | |
50 | abort: "." and ".." are not allowed in narrowspec paths |
|
50 | abort: "." and ".." are not allowed in narrowspec paths | |
51 | [255] |
|
51 | [255] | |
52 |
|
52 | |||
53 | Names with '.' in them are OK. |
|
53 | Names with '.' in them are OK. | |
54 |
$ hg clone --narrow ssh://user@dummy/master |
|
54 | $ hg clone --narrow ssh://user@dummy/master should-work --include a/.b/c | |
55 | requesting all changes |
|
55 | requesting all changes | |
56 | adding changesets |
|
56 | adding changesets | |
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 1 changesets with 0 changes to 0 files |
|
59 | added 1 changesets with 0 changes to 0 files | |
60 | new changesets * (glob) |
|
60 | new changesets * (glob) | |
61 | updating to branch default |
|
61 | updating to branch default | |
62 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
62 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
63 |
|
63 | |||
64 | Test repo with local changes |
|
64 | Test repo with local changes | |
65 | $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 |
|
65 | $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 | |
66 | requesting all changes |
|
66 | requesting all changes | |
67 | adding changesets |
|
67 | adding changesets | |
68 | adding manifests |
|
68 | adding manifests | |
69 | adding file changes |
|
69 | adding file changes | |
70 | added 6 changesets with 3 changes to 3 files |
|
70 | added 6 changesets with 3 changes to 3 files | |
71 | new changesets *:* (glob) |
|
71 | new changesets *:* (glob) | |
72 | updating to branch default |
|
72 | updating to branch default | |
73 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
74 | $ cd narrow-local-changes |
|
74 | $ cd narrow-local-changes | |
75 | $ cat >> $HGRCPATH << EOF |
|
75 | $ cat >> $HGRCPATH << EOF | |
76 | > [experimental] |
|
76 | > [experimental] | |
77 | > evolution=createmarkers |
|
77 | > evolution=createmarkers | |
78 | > EOF |
|
78 | > EOF | |
79 | $ echo local change >> d0/f |
|
79 | $ echo local change >> d0/f | |
80 | $ hg ci -m 'local change to d0' |
|
80 | $ hg ci -m 'local change to d0' | |
81 | $ hg co '.^' |
|
81 | $ hg co '.^' | |
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 | $ echo local change >> d3/f |
|
83 | $ echo local change >> d3/f | |
84 | $ hg ci -m 'local hidden change to d3' |
|
84 | $ hg ci -m 'local hidden change to d3' | |
85 | created new head |
|
85 | created new head | |
86 | $ hg ci --amend -m 'local change to d3' |
|
86 | $ hg ci --amend -m 'local change to d3' | |
87 | $ hg tracked --removeinclude d0 |
|
87 | $ hg tracked --removeinclude d0 | |
88 | comparing with ssh://user@dummy/master |
|
88 | comparing with ssh://user@dummy/master | |
89 | searching for changes |
|
89 | searching for changes | |
90 | looking for local changes to affected paths |
|
90 | looking for local changes to affected paths | |
91 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
91 | The following changeset(s) or their ancestors have local changes not on the remote: | |
92 | * (glob) |
|
92 | * (glob) | |
93 | abort: local changes found |
|
93 | abort: local changes found | |
94 | (use --force-delete-local-changes to ignore) |
|
94 | (use --force-delete-local-changes to ignore) | |
95 | [255] |
|
95 | [255] | |
96 | Check that nothing was removed by the failed attempts |
|
96 | Check that nothing was removed by the failed attempts | |
97 | $ hg tracked |
|
97 | $ hg tracked | |
98 | I path:d0 |
|
98 | I path:d0 | |
99 | I path:d3 |
|
99 | I path:d3 | |
100 | I path:d6 |
|
100 | I path:d6 | |
101 | $ hg files |
|
101 | $ hg files | |
102 | d0/f |
|
102 | d0/f | |
103 | d3/f |
|
103 | d3/f | |
104 | d6/f |
|
104 | d6/f | |
105 | $ find * |
|
105 | $ find * | |
106 | d0 |
|
106 | d0 | |
107 | d0/f |
|
107 | d0/f | |
108 | d3 |
|
108 | d3 | |
109 | d3/f |
|
109 | d3/f | |
110 | d6 |
|
110 | d6 | |
111 | d6/f |
|
111 | d6/f | |
112 | $ hg verify -q |
|
112 | $ hg verify -q | |
113 | Force deletion of local changes |
|
113 | Force deletion of local changes | |
114 | $ hg log -T "{node|short}: {desc} {outsidenarrow}\n" |
|
114 | $ hg log -T "{node|short}: {desc} {outsidenarrow}\n" | |
115 | *: local change to d3 (glob) |
|
115 | *: local change to d3 (glob) | |
116 | *: local change to d0 (glob) |
|
116 | *: local change to d0 (glob) | |
117 | *: add d10/f outsidenarrow (glob) |
|
117 | *: add d10/f outsidenarrow (glob) | |
118 | *: add d6/f (glob) |
|
118 | *: add d6/f (glob) | |
119 | *: add d5/f outsidenarrow (glob) |
|
119 | *: add d5/f outsidenarrow (glob) | |
120 | *: add d3/f (glob) |
|
120 | *: add d3/f (glob) | |
121 | *: add d2/f outsidenarrow (glob) |
|
121 | *: add d2/f outsidenarrow (glob) | |
122 | *: add d0/f (glob) |
|
122 | *: add d0/f (glob) | |
123 | $ hg tracked --removeinclude d0 --force-delete-local-changes |
|
123 | $ hg tracked --removeinclude d0 --force-delete-local-changes | |
124 | comparing with ssh://user@dummy/master |
|
124 | comparing with ssh://user@dummy/master | |
125 | searching for changes |
|
125 | searching for changes | |
126 | looking for local changes to affected paths |
|
126 | looking for local changes to affected paths | |
127 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
127 | The following changeset(s) or their ancestors have local changes not on the remote: | |
128 | * (glob) |
|
128 | * (glob) | |
129 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
129 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | |
130 | deleting data/d0/f.i |
|
130 | deleting data/d0/f.i | |
131 | deleting meta/d0/00manifest.i (tree !) |
|
131 | deleting meta/d0/00manifest.i (tree !) | |
132 | $ hg log -T "{node|short}: {desc} {outsidenarrow}\n" |
|
132 | $ hg log -T "{node|short}: {desc} {outsidenarrow}\n" | |
133 | *: local change to d3 (glob) |
|
133 | *: local change to d3 (glob) | |
134 | *: add d10/f outsidenarrow (glob) |
|
134 | *: add d10/f outsidenarrow (glob) | |
135 | *: add d6/f (glob) |
|
135 | *: add d6/f (glob) | |
136 | *: add d5/f outsidenarrow (glob) |
|
136 | *: add d5/f outsidenarrow (glob) | |
137 | *: add d3/f (glob) |
|
137 | *: add d3/f (glob) | |
138 | *: add d2/f outsidenarrow (glob) |
|
138 | *: add d2/f outsidenarrow (glob) | |
139 | *: add d0/f outsidenarrow (glob) |
|
139 | *: add d0/f outsidenarrow (glob) | |
140 | Can restore stripped local changes after widening |
|
140 | Can restore stripped local changes after widening | |
141 | $ hg tracked --addinclude d0 -q |
|
141 | $ hg tracked --addinclude d0 -q | |
142 | $ hg unbundle .hg/strip-backup/*-narrow.hg -q |
|
142 | $ hg unbundle .hg/strip-backup/*-narrow.hg -q | |
143 | $ hg --hidden co -r 'desc("local change to d0")' -q |
|
143 | $ hg --hidden co -r 'desc("local change to d0")' -q | |
144 | $ cat d0/f |
|
144 | $ cat d0/f | |
145 | 0 |
|
145 | 0 | |
146 | local change |
|
146 | local change | |
147 | Pruned commits affecting removed paths should not prevent narrowing |
|
147 | Pruned commits affecting removed paths should not prevent narrowing | |
148 | $ hg co '.^' |
|
148 | $ hg co '.^' | |
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` |
|
150 | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` | |
151 | obsoleted 1 changesets |
|
151 | obsoleted 1 changesets | |
152 | $ hg tracked --removeinclude d0 |
|
152 | $ hg tracked --removeinclude d0 | |
153 | comparing with ssh://user@dummy/master |
|
153 | comparing with ssh://user@dummy/master | |
154 | searching for changes |
|
154 | searching for changes | |
155 | looking for local changes to affected paths |
|
155 | looking for local changes to affected paths | |
156 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
156 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | |
157 | deleting data/d0/f.i |
|
157 | deleting data/d0/f.i | |
158 | deleting meta/d0/00manifest.i (tree !) |
|
158 | deleting meta/d0/00manifest.i (tree !) | |
159 | Updates off of stripped commit if necessary |
|
159 | Updates off of stripped commit if necessary | |
160 | $ hg co -r 'desc("local change to d3")' -q |
|
160 | $ hg co -r 'desc("local change to d3")' -q | |
161 | $ echo local change >> d6/f |
|
161 | $ echo local change >> d6/f | |
162 | $ hg ci -m 'local change to d6' |
|
162 | $ hg ci -m 'local change to d6' | |
163 | $ hg tracked --removeinclude d3 --force-delete-local-changes |
|
163 | $ hg tracked --removeinclude d3 --force-delete-local-changes | |
164 | comparing with ssh://user@dummy/master |
|
164 | comparing with ssh://user@dummy/master | |
165 | searching for changes |
|
165 | searching for changes | |
166 | looking for local changes to affected paths |
|
166 | looking for local changes to affected paths | |
167 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
167 | The following changeset(s) or their ancestors have local changes not on the remote: | |
168 | * (glob) |
|
168 | * (glob) | |
169 | * (glob) |
|
169 | * (glob) | |
170 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
170 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
171 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
171 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | |
172 | deleting data/d3/f.i |
|
172 | deleting data/d3/f.i | |
173 | deleting meta/d3/00manifest.i (tree !) |
|
173 | deleting meta/d3/00manifest.i (tree !) | |
174 | $ hg log -T '{desc}\n' -r . |
|
174 | $ hg log -T '{desc}\n' -r . | |
175 | add d10/f |
|
175 | add d10/f | |
176 | Updates to nullid if necessary |
|
176 | Updates to nullid if necessary | |
177 | $ hg tracked --addinclude d3 -q |
|
177 | $ hg tracked --addinclude d3 -q | |
178 | $ hg co null -q |
|
178 | $ hg co null -q | |
179 | $ mkdir d3 |
|
179 | $ mkdir d3 | |
180 | $ echo local change > d3/f |
|
180 | $ echo local change > d3/f | |
181 | $ hg add d3/f |
|
181 | $ hg add d3/f | |
182 | $ hg ci -m 'local change to d3' |
|
182 | $ hg ci -m 'local change to d3' | |
183 | created new head |
|
183 | created new head | |
184 | $ hg tracked --removeinclude d3 --force-delete-local-changes |
|
184 | $ hg tracked --removeinclude d3 --force-delete-local-changes | |
185 | comparing with ssh://user@dummy/master |
|
185 | comparing with ssh://user@dummy/master | |
186 | searching for changes |
|
186 | searching for changes | |
187 | looking for local changes to affected paths |
|
187 | looking for local changes to affected paths | |
188 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
188 | The following changeset(s) or their ancestors have local changes not on the remote: | |
189 | * (glob) |
|
189 | * (glob) | |
190 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
190 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
191 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
191 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) | |
192 | deleting data/d3/f.i |
|
192 | deleting data/d3/f.i | |
193 | deleting meta/d3/00manifest.i (tree !) |
|
193 | deleting meta/d3/00manifest.i (tree !) | |
194 | $ hg id |
|
194 | $ hg id | |
195 | 000000000000 |
|
195 | 000000000000 | |
196 | $ cd .. |
|
196 | $ cd .. | |
197 |
|
197 | |||
198 | Can remove last include, making repo empty |
|
198 | Can remove last include, making repo empty | |
199 | $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 |
|
199 | $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 | |
200 | adding changesets |
|
200 | adding changesets | |
201 | adding manifests |
|
201 | adding manifests | |
202 | adding file changes |
|
202 | adding file changes | |
203 | added 2 changesets with 1 changes to 1 files |
|
203 | added 2 changesets with 1 changes to 1 files | |
204 | new changesets *:* (glob) |
|
204 | new changesets *:* (glob) | |
205 | updating to branch default |
|
205 | updating to branch default | |
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
207 | $ cd narrow-empty |
|
207 | $ cd narrow-empty | |
208 | $ hg tracked --removeinclude d0 |
|
208 | $ hg tracked --removeinclude d0 | |
209 | comparing with ssh://user@dummy/master |
|
209 | comparing with ssh://user@dummy/master | |
210 | searching for changes |
|
210 | searching for changes | |
211 | looking for local changes to affected paths |
|
211 | looking for local changes to affected paths | |
212 | deleting data/d0/f.i |
|
212 | deleting data/d0/f.i | |
213 | deleting meta/d0/00manifest.i (tree !) |
|
213 | deleting meta/d0/00manifest.i (tree !) | |
214 | $ hg tracked |
|
214 | $ hg tracked | |
215 | $ hg files |
|
215 | $ hg files | |
216 | [1] |
|
216 | [1] | |
217 | $ test -d d0 |
|
217 | $ test -d d0 | |
218 | [1] |
|
218 | [1] | |
219 | Do some work in the empty clone |
|
219 | Do some work in the empty clone | |
220 | $ hg diff --change . |
|
220 | $ hg diff --change . | |
221 | $ hg branch foo |
|
221 | $ hg branch foo | |
222 | marked working directory as branch foo |
|
222 | marked working directory as branch foo | |
223 | (branches are permanent and global, did you want a bookmark?) |
|
223 | (branches are permanent and global, did you want a bookmark?) | |
224 | $ hg ci -m empty |
|
224 | $ hg ci -m empty | |
225 | $ hg pull -q |
|
225 | $ hg pull -q | |
226 | Can widen the empty clone |
|
226 | Can widen the empty clone | |
227 | $ hg tracked --addinclude d0 |
|
227 | $ hg tracked --addinclude d0 | |
228 | comparing with ssh://user@dummy/master |
|
228 | comparing with ssh://user@dummy/master | |
229 | searching for changes |
|
229 | searching for changes | |
230 | no changes found |
|
230 | no changes found | |
231 | saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob) |
|
231 | saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob) | |
232 | adding changesets |
|
232 | adding changesets | |
233 | adding manifests |
|
233 | adding manifests | |
234 | adding file changes |
|
234 | adding file changes | |
235 | added 3 changesets with 1 changes to 1 files |
|
235 | added 3 changesets with 1 changes to 1 files | |
236 | new changesets *:* (glob) |
|
236 | new changesets *:* (glob) | |
237 | $ hg tracked |
|
237 | $ hg tracked | |
238 | I path:d0 |
|
238 | I path:d0 | |
239 | $ hg files |
|
239 | $ hg files | |
240 | d0/f |
|
240 | d0/f | |
241 | $ find * |
|
241 | $ find * | |
242 | d0 |
|
242 | d0 | |
243 | d0/f |
|
243 | d0/f | |
244 | $ cd .. |
|
244 | $ cd .. | |
245 |
|
245 | |||
246 | TODO(martinvonz): test including e.g. d3/g and then removing it once |
|
246 | TODO(martinvonz): test including e.g. d3/g and then removing it once | |
247 | https://bitbucket.org/Google/narrowhg/issues/6 is fixed |
|
247 | https://bitbucket.org/Google/narrowhg/issues/6 is fixed | |
248 |
|
248 | |||
249 | $ hg clone --narrow ssh://user@dummy/master narrow --include d0 --include d3 --include d6 --include d9 |
|
249 | $ hg clone --narrow ssh://user@dummy/master narrow --include d0 --include d3 --include d6 --include d9 | |
250 | requesting all changes |
|
250 | requesting all changes | |
251 | adding changesets |
|
251 | adding changesets | |
252 | adding manifests |
|
252 | adding manifests | |
253 | adding file changes |
|
253 | adding file changes | |
254 | added 8 changesets with 4 changes to 4 files |
|
254 | added 8 changesets with 4 changes to 4 files | |
255 | new changesets *:* (glob) |
|
255 | new changesets *:* (glob) | |
256 | updating to branch default |
|
256 | updating to branch default | |
257 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
257 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
258 | $ cd narrow |
|
258 | $ cd narrow | |
259 | $ hg tracked |
|
259 | $ hg tracked | |
260 | I path:d0 |
|
260 | I path:d0 | |
261 | I path:d3 |
|
261 | I path:d3 | |
262 | I path:d6 |
|
262 | I path:d6 | |
263 | I path:d9 |
|
263 | I path:d9 | |
264 | $ hg tracked --removeinclude d6 |
|
264 | $ hg tracked --removeinclude d6 | |
265 | comparing with ssh://user@dummy/master |
|
265 | comparing with ssh://user@dummy/master | |
266 | searching for changes |
|
266 | searching for changes | |
267 | looking for local changes to affected paths |
|
267 | looking for local changes to affected paths | |
268 | deleting data/d6/f.i |
|
268 | deleting data/d6/f.i | |
269 | deleting meta/d6/00manifest.i (tree !) |
|
269 | deleting meta/d6/00manifest.i (tree !) | |
270 | $ hg tracked |
|
270 | $ hg tracked | |
271 | I path:d0 |
|
271 | I path:d0 | |
272 | I path:d3 |
|
272 | I path:d3 | |
273 | I path:d9 |
|
273 | I path:d9 | |
274 | $ hg debugrebuildfncache |
|
274 | $ hg debugrebuildfncache | |
275 | fncache already up to date |
|
275 | fncache already up to date | |
276 | $ find * |
|
276 | $ find * | |
277 | d0 |
|
277 | d0 | |
278 | d0/f |
|
278 | d0/f | |
279 | d3 |
|
279 | d3 | |
280 | d3/f |
|
280 | d3/f | |
281 | d9 |
|
281 | d9 | |
282 | d9/f |
|
282 | d9/f | |
283 | $ hg verify -q |
|
283 | $ hg verify -q | |
284 | $ hg tracked --addexclude d3/f |
|
284 | $ hg tracked --addexclude d3/f | |
285 | comparing with ssh://user@dummy/master |
|
285 | comparing with ssh://user@dummy/master | |
286 | searching for changes |
|
286 | searching for changes | |
287 | looking for local changes to affected paths |
|
287 | looking for local changes to affected paths | |
288 | deleting data/d3/f.i |
|
288 | deleting data/d3/f.i | |
289 | $ hg tracked |
|
289 | $ hg tracked | |
290 | I path:d0 |
|
290 | I path:d0 | |
291 | I path:d3 |
|
291 | I path:d3 | |
292 | I path:d9 |
|
292 | I path:d9 | |
293 | X path:d3/f |
|
293 | X path:d3/f | |
294 | $ hg debugrebuildfncache |
|
294 | $ hg debugrebuildfncache | |
295 | fncache already up to date |
|
295 | fncache already up to date | |
296 | $ find * |
|
296 | $ find * | |
297 | d0 |
|
297 | d0 | |
298 | d0/f |
|
298 | d0/f | |
299 | d9 |
|
299 | d9 | |
300 | d9/f |
|
300 | d9/f | |
301 | $ hg verify -q |
|
301 | $ hg verify -q | |
302 | $ hg tracked --addexclude d0 |
|
302 | $ hg tracked --addexclude d0 | |
303 | comparing with ssh://user@dummy/master |
|
303 | comparing with ssh://user@dummy/master | |
304 | searching for changes |
|
304 | searching for changes | |
305 | looking for local changes to affected paths |
|
305 | looking for local changes to affected paths | |
306 | deleting data/d0/f.i |
|
306 | deleting data/d0/f.i | |
307 | deleting meta/d0/00manifest.i (tree !) |
|
307 | deleting meta/d0/00manifest.i (tree !) | |
308 | $ hg tracked |
|
308 | $ hg tracked | |
309 | I path:d3 |
|
309 | I path:d3 | |
310 | I path:d9 |
|
310 | I path:d9 | |
311 | X path:d0 |
|
311 | X path:d0 | |
312 | X path:d3/f |
|
312 | X path:d3/f | |
313 | $ hg debugrebuildfncache |
|
313 | $ hg debugrebuildfncache | |
314 | fncache already up to date |
|
314 | fncache already up to date | |
315 | $ find * |
|
315 | $ find * | |
316 | d9 |
|
316 | d9 | |
317 | d9/f |
|
317 | d9/f | |
318 |
|
318 | |||
319 | Make a 15 of changes to d9 to test the path without --verbose |
|
319 | Make a 15 of changes to d9 to test the path without --verbose | |
320 | (Note: using regexes instead of "* (glob)" because if the test fails, it |
|
320 | (Note: using regexes instead of "* (glob)" because if the test fails, it | |
321 | produces more sensible diffs) |
|
321 | produces more sensible diffs) | |
322 | $ hg tracked |
|
322 | $ hg tracked | |
323 | I path:d3 |
|
323 | I path:d3 | |
324 | I path:d9 |
|
324 | I path:d9 | |
325 | X path:d0 |
|
325 | X path:d0 | |
326 | X path:d3/f |
|
326 | X path:d3/f | |
327 | $ for x in `$TESTDIR/seq.py 1 15` |
|
327 | $ for x in `$TESTDIR/seq.py 1 15` | |
328 | > do |
|
328 | > do | |
329 | > echo local change >> d9/f |
|
329 | > echo local change >> d9/f | |
330 | > hg commit -m "change $x to d9/f" |
|
330 | > hg commit -m "change $x to d9/f" | |
331 | > done |
|
331 | > done | |
332 | $ hg tracked --removeinclude d9 |
|
332 | $ hg tracked --removeinclude d9 | |
333 | comparing with ssh://user@dummy/master |
|
333 | comparing with ssh://user@dummy/master | |
334 | searching for changes |
|
334 | searching for changes | |
335 | looking for local changes to affected paths |
|
335 | looking for local changes to affected paths | |
336 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
336 | The following changeset(s) or their ancestors have local changes not on the remote: | |
337 | ^[0-9a-f]{12}$ (re) |
|
337 | ^[0-9a-f]{12}$ (re) | |
338 | ^[0-9a-f]{12}$ (re) |
|
338 | ^[0-9a-f]{12}$ (re) | |
339 | ^[0-9a-f]{12}$ (re) |
|
339 | ^[0-9a-f]{12}$ (re) | |
340 | ^[0-9a-f]{12}$ (re) |
|
340 | ^[0-9a-f]{12}$ (re) | |
341 | ^[0-9a-f]{12}$ (re) |
|
341 | ^[0-9a-f]{12}$ (re) | |
342 | ^[0-9a-f]{12}$ (re) |
|
342 | ^[0-9a-f]{12}$ (re) | |
343 | ^[0-9a-f]{12}$ (re) |
|
343 | ^[0-9a-f]{12}$ (re) | |
344 | ^[0-9a-f]{12}$ (re) |
|
344 | ^[0-9a-f]{12}$ (re) | |
345 | ^[0-9a-f]{12}$ (re) |
|
345 | ^[0-9a-f]{12}$ (re) | |
346 | ^[0-9a-f]{12}$ (re) |
|
346 | ^[0-9a-f]{12}$ (re) | |
347 | ...and 5 more, use --verbose to list all |
|
347 | ...and 5 more, use --verbose to list all | |
348 | abort: local changes found |
|
348 | abort: local changes found | |
349 | (use --force-delete-local-changes to ignore) |
|
349 | (use --force-delete-local-changes to ignore) | |
350 | [255] |
|
350 | [255] | |
351 | Now test it *with* verbose. |
|
351 | Now test it *with* verbose. | |
352 | $ hg tracked --removeinclude d9 --verbose |
|
352 | $ hg tracked --removeinclude d9 --verbose | |
353 | comparing with ssh://user@dummy/master |
|
353 | comparing with ssh://user@dummy/master | |
354 | searching for changes |
|
354 | searching for changes | |
355 | looking for local changes to affected paths |
|
355 | looking for local changes to affected paths | |
356 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
356 | The following changeset(s) or their ancestors have local changes not on the remote: | |
357 | ^[0-9a-f]{12}$ (re) |
|
357 | ^[0-9a-f]{12}$ (re) | |
358 | ^[0-9a-f]{12}$ (re) |
|
358 | ^[0-9a-f]{12}$ (re) | |
359 | ^[0-9a-f]{12}$ (re) |
|
359 | ^[0-9a-f]{12}$ (re) | |
360 | ^[0-9a-f]{12}$ (re) |
|
360 | ^[0-9a-f]{12}$ (re) | |
361 | ^[0-9a-f]{12}$ (re) |
|
361 | ^[0-9a-f]{12}$ (re) | |
362 | ^[0-9a-f]{12}$ (re) |
|
362 | ^[0-9a-f]{12}$ (re) | |
363 | ^[0-9a-f]{12}$ (re) |
|
363 | ^[0-9a-f]{12}$ (re) | |
364 | ^[0-9a-f]{12}$ (re) |
|
364 | ^[0-9a-f]{12}$ (re) | |
365 | ^[0-9a-f]{12}$ (re) |
|
365 | ^[0-9a-f]{12}$ (re) | |
366 | ^[0-9a-f]{12}$ (re) |
|
366 | ^[0-9a-f]{12}$ (re) | |
367 | ^[0-9a-f]{12}$ (re) |
|
367 | ^[0-9a-f]{12}$ (re) | |
368 | ^[0-9a-f]{12}$ (re) |
|
368 | ^[0-9a-f]{12}$ (re) | |
369 | ^[0-9a-f]{12}$ (re) |
|
369 | ^[0-9a-f]{12}$ (re) | |
370 | ^[0-9a-f]{12}$ (re) |
|
370 | ^[0-9a-f]{12}$ (re) | |
371 | ^[0-9a-f]{12}$ (re) |
|
371 | ^[0-9a-f]{12}$ (re) | |
372 | abort: local changes found |
|
372 | abort: local changes found | |
373 | (use --force-delete-local-changes to ignore) |
|
373 | (use --force-delete-local-changes to ignore) | |
374 | [255] |
|
374 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now