Show More
@@ -1038,6 +1038,14 b' def clone(' | |||||
1038 | _update(destrepo, uprev) |
|
1038 | _update(destrepo, uprev) | |
1039 | if update in destrepo._bookmarks: |
|
1039 | if update in destrepo._bookmarks: | |
1040 | bookmarks.activate(destrepo, update) |
|
1040 | bookmarks.activate(destrepo, update) | |
|
1041 | if destlock is not None: | |||
|
1042 | release(destlock) | |||
|
1043 | # here is a tiny windows were someone could end up writing the | |||
|
1044 | # repository before the cache are sure to be warm. This if "fine" | |||
|
1045 | # as the only "bad" outcome would be some slowness. That potential | |||
|
1046 | # slowness already affect reader. | |||
|
1047 | with destrepo.lock(): | |||
|
1048 | destrepo.updatecaches(full=True) | |||
1041 | finally: |
|
1049 | finally: | |
1042 | release(srclock, destlock) |
|
1050 | release(srclock, destlock) | |
1043 | if cleandir is not None: |
|
1051 | if cleandir is not None: |
@@ -807,6 +807,7 b' fred is not blocked from moving bookmark' | |||||
807 | acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" |
|
807 | acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" | |
808 | bundle2-input-bundle: 7 parts total |
|
808 | bundle2-input-bundle: 7 parts total | |
809 | updating the branch cache |
|
809 | updating the branch cache | |
|
810 | invalid branch cache (served.hidden): tip differs | |||
810 | added 1 changesets with 1 changes to 1 files |
|
811 | added 1 changesets with 1 changes to 1 files | |
811 | bundle2-output-bundle: "HG20", 1 parts total |
|
812 | bundle2-output-bundle: "HG20", 1 parts total | |
812 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
813 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
@@ -1788,6 +1789,7 b' No branch acls specified' | |||||
1788 | bundle2-input-part: total payload size 48 |
|
1789 | bundle2-input-part: total payload size 48 | |
1789 | bundle2-input-bundle: 5 parts total |
|
1790 | bundle2-input-bundle: 5 parts total | |
1790 | updating the branch cache |
|
1791 | updating the branch cache | |
|
1792 | invalid branch cache (served.hidden): tip differs | |||
1791 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
1793 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
1792 | bundle2-output-bundle: "HG20", 1 parts total |
|
1794 | bundle2-output-bundle: "HG20", 1 parts total | |
1793 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1795 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
@@ -2094,6 +2096,7 b' Branch acl allow other' | |||||
2094 | bundle2-input-part: total payload size 48 |
|
2096 | bundle2-input-part: total payload size 48 | |
2095 | bundle2-input-bundle: 5 parts total |
|
2097 | bundle2-input-bundle: 5 parts total | |
2096 | updating the branch cache |
|
2098 | updating the branch cache | |
|
2099 | invalid branch cache (served.hidden): tip differs | |||
2097 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
2100 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
2098 | bundle2-output-bundle: "HG20", 1 parts total |
|
2101 | bundle2-output-bundle: "HG20", 1 parts total | |
2099 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2102 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
@@ -2185,6 +2188,7 b' push foobar into the remote' | |||||
2185 | bundle2-input-part: total payload size 48 |
|
2188 | bundle2-input-part: total payload size 48 | |
2186 | bundle2-input-bundle: 5 parts total |
|
2189 | bundle2-input-bundle: 5 parts total | |
2187 | updating the branch cache |
|
2190 | updating the branch cache | |
|
2191 | invalid branch cache (served.hidden): tip differs | |||
2188 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
2192 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
2189 | bundle2-output-bundle: "HG20", 1 parts total |
|
2193 | bundle2-output-bundle: "HG20", 1 parts total | |
2190 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2194 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
@@ -2348,6 +2352,7 b" User 'astro' must not be denied" | |||||
2348 | bundle2-input-part: total payload size 48 |
|
2352 | bundle2-input-part: total payload size 48 | |
2349 | bundle2-input-bundle: 5 parts total |
|
2353 | bundle2-input-bundle: 5 parts total | |
2350 | updating the branch cache |
|
2354 | updating the branch cache | |
|
2355 | invalid branch cache (served.hidden): tip differs | |||
2351 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
2356 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
2352 | bundle2-output-bundle: "HG20", 1 parts total |
|
2357 | bundle2-output-bundle: "HG20", 1 parts total | |
2353 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2358 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
@@ -128,9 +128,9 b' clone, commit, pull' | |||||
128 | new changesets d02f48003e62 |
|
128 | new changesets d02f48003e62 | |
129 | (run 'hg update' to get a working copy) |
|
129 | (run 'hg update' to get a working copy) | |
130 | $ hg blackbox -l 6 |
|
130 | $ hg blackbox -l 6 | |
131 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull |
|
|||
132 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (served) in * seconds (glob) |
|
|||
133 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (served) with 1 labels and 2 nodes |
|
131 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (served) with 1 labels and 2 nodes | |
|
132 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (served.hidden) in * seconds (glob) | |||
|
133 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (served.hidden) with 1 labels and 2 nodes | |||
134 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62 |
|
134 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62 | |
135 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob) |
|
135 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob) | |
136 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 |
|
136 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | |
@@ -193,8 +193,8 b' backup bundles get logged' | |||||
193 | $ hg blackbox -l 6 |
|
193 | $ hg blackbox -l 6 | |
194 | 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip |
|
194 | 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip | |
195 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg |
|
195 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg | |
196 |
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache ( |
|
196 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (immutable) in * seconds (glob) | |
197 |
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache ( |
|
197 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (immutable) with 1 labels and 2 nodes | |
198 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) |
|
198 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) | |
199 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 |
|
199 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | |
200 |
|
200 |
@@ -192,9 +192,17 b' Basic clone' | |||||
192 | transferred 96.5 KB in * seconds (* */sec) (glob) |
|
192 | transferred 96.5 KB in * seconds (* */sec) (glob) | |
193 |
|
193 | |||
194 | $ ls -1 clone1/.hg/cache |
|
194 | $ ls -1 clone1/.hg/cache | |
|
195 | branch2-base | |||
|
196 | branch2-immutable | |||
195 | branch2-served |
|
197 | branch2-served | |
|
198 | branch2-served.hidden | |||
|
199 | branch2-visible | |||
|
200 | branch2-visible-hidden | |||
|
201 | hgtagsfnodes1 | |||
196 | rbc-names-v1 |
|
202 | rbc-names-v1 | |
197 | rbc-revs-v1 |
|
203 | rbc-revs-v1 | |
|
204 | tags2 | |||
|
205 | tags2-served | |||
198 | #endif |
|
206 | #endif | |
199 |
|
207 | |||
200 | getbundle requests with stream=1 are uncompressed |
|
208 | getbundle requests with stream=1 are uncompressed | |
@@ -265,6 +273,7 b' Clone with background file closing enabl' | |||||
265 | bundle2-input-part: total payload size 24 |
|
273 | bundle2-input-part: total payload size 24 | |
266 | bundle2-input-bundle: 2 parts total |
|
274 | bundle2-input-bundle: 2 parts total | |
267 | checking for updated bookmarks |
|
275 | checking for updated bookmarks | |
|
276 | updating the branch cache | |||
268 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
277 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
269 | #endif |
|
278 | #endif | |
270 | #if stream-bundle2 |
|
279 | #if stream-bundle2 | |
@@ -287,6 +296,7 b' Clone with background file closing enabl' | |||||
287 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
296 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
288 | bundle2-input-bundle: 2 parts total |
|
297 | bundle2-input-bundle: 2 parts total | |
289 | checking for updated bookmarks |
|
298 | checking for updated bookmarks | |
|
299 | updating the branch cache | |||
290 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
300 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) | |
291 | #endif |
|
301 | #endif | |
292 |
|
302 |
@@ -56,9 +56,17 b' Default operation:' | |||||
56 | Ensure branchcache got copied over: |
|
56 | Ensure branchcache got copied over: | |
57 |
|
57 | |||
58 | $ ls .hg/cache |
|
58 | $ ls .hg/cache | |
|
59 | branch2-base | |||
|
60 | branch2-immutable | |||
59 | branch2-served |
|
61 | branch2-served | |
|
62 | branch2-served.hidden | |||
|
63 | branch2-visible | |||
|
64 | branch2-visible-hidden | |||
|
65 | hgtagsfnodes1 | |||
60 | rbc-names-v1 |
|
66 | rbc-names-v1 | |
61 | rbc-revs-v1 |
|
67 | rbc-revs-v1 | |
|
68 | tags2 | |||
|
69 | tags2-served | |||
62 |
|
70 | |||
63 | $ cat a |
|
71 | $ cat a | |
64 | a |
|
72 | a | |
@@ -99,6 +107,7 b' No update, with debug option:' | |||||
99 | linking: 17 files (reposimplestore !) |
|
107 | linking: 17 files (reposimplestore !) | |
100 | linking: 18 files (reposimplestore !) |
|
108 | linking: 18 files (reposimplestore !) | |
101 | linked 18 files (reposimplestore !) |
|
109 | linked 18 files (reposimplestore !) | |
|
110 | updating the branch cache | |||
102 | #else |
|
111 | #else | |
103 | $ hg --debug clone -U . ../c --config progress.debug=true |
|
112 | $ hg --debug clone -U . ../c --config progress.debug=true | |
104 | linking: 1 files |
|
113 | linking: 1 files | |
@@ -127,9 +136,17 b' No update, with debug option:' | |||||
127 | Ensure branchcache got copied over: |
|
136 | Ensure branchcache got copied over: | |
128 |
|
137 | |||
129 | $ ls .hg/cache |
|
138 | $ ls .hg/cache | |
|
139 | branch2-base | |||
|
140 | branch2-immutable | |||
130 | branch2-served |
|
141 | branch2-served | |
|
142 | branch2-served.hidden | |||
|
143 | branch2-visible | |||
|
144 | branch2-visible-hidden | |||
|
145 | hgtagsfnodes1 | |||
131 | rbc-names-v1 |
|
146 | rbc-names-v1 | |
132 | rbc-revs-v1 |
|
147 | rbc-revs-v1 | |
|
148 | tags2 | |||
|
149 | tags2-served | |||
133 |
|
150 | |||
134 | $ cat a 2>/dev/null || echo "a not present" |
|
151 | $ cat a 2>/dev/null || echo "a not present" | |
135 | a not present |
|
152 | a not present |
@@ -597,6 +597,7 b' on a 32MB system.' | |||||
597 | added 2 changesets with 2 changes to 2 files |
|
597 | added 2 changesets with 2 changes to 2 files | |
598 | new changesets 53245c60e682:aaff8d2ffbbf |
|
598 | new changesets 53245c60e682:aaff8d2ffbbf | |
599 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles |
|
599 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles | |
|
600 | updating the branch cache | |||
600 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
601 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) | |
601 |
|
602 | |||
602 | $ hg clone -U --debug --config ui.available-memory=32MB http://localhost:$HGPORT gzip-too-large2 |
|
603 | $ hg clone -U --debug --config ui.available-memory=32MB http://localhost:$HGPORT gzip-too-large2 | |
@@ -634,5 +635,6 b' on a 32MB system.' | |||||
634 | checking for updated bookmarks |
|
635 | checking for updated bookmarks | |
635 | 2 local changesets published |
|
636 | 2 local changesets published | |
636 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles |
|
637 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles | |
|
638 | updating the branch cache | |||
637 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
639 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) | |
638 | $ killdaemons.py |
|
640 | $ killdaemons.py |
@@ -44,6 +44,7 b' Poke at a clone:' | |||||
44 | checked 0 changesets with 0 changes to 0 files |
|
44 | checked 0 changesets with 0 changes to 0 files | |
45 | $ ls .hg |
|
45 | $ ls .hg | |
46 | 00changelog.i |
|
46 | 00changelog.i | |
|
47 | cache | |||
47 | hgrc |
|
48 | hgrc | |
48 | requires |
|
49 | requires | |
49 | store |
|
50 | store |
@@ -89,6 +89,7 b' the source repo:' | |||||
89 | a.txt: remote created -> g |
|
89 | a.txt: remote created -> g | |
90 | getting a.txt |
|
90 | getting a.txt | |
91 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
92 | updating the branch cache | |||
92 | $ cd repo-3 |
|
93 | $ cd repo-3 | |
93 |
|
94 | |||
94 | $ cat a.txt |
|
95 | $ cat a.txt |
@@ -69,6 +69,7 b' Create hardlinked clone r2:' | |||||
69 | linking: 6 files |
|
69 | linking: 6 files | |
70 | linking: 7 files |
|
70 | linking: 7 files | |
71 | linked 7 files |
|
71 | linked 7 files | |
|
72 | updating the branch cache | |||
72 |
|
73 | |||
73 | Create non-hardlinked clone r3: |
|
74 | Create non-hardlinked clone r3: | |
74 |
|
75 | |||
@@ -238,9 +239,16 b' r4 has hardlinks in the working dir (not' | |||||
238 | 2 r4/.hg/00changelog.i |
|
239 | 2 r4/.hg/00changelog.i | |
239 | 2 r4/.hg/branch |
|
240 | 2 r4/.hg/branch | |
240 | 2 r4/.hg/cache/branch2-base |
|
241 | 2 r4/.hg/cache/branch2-base | |
|
242 | 2 r4/.hg/cache/branch2-immutable | |||
241 | 2 r4/.hg/cache/branch2-served |
|
243 | 2 r4/.hg/cache/branch2-served | |
|
244 | 2 r4/.hg/cache/branch2-served.hidden | |||
|
245 | 2 r4/.hg/cache/branch2-visible | |||
|
246 | 2 r4/.hg/cache/branch2-visible-hidden | |||
|
247 | 2 r4/.hg/cache/hgtagsfnodes1 | |||
242 | 2 r4/.hg/cache/rbc-names-v1 |
|
248 | 2 r4/.hg/cache/rbc-names-v1 | |
243 | 2 r4/.hg/cache/rbc-revs-v1 |
|
249 | 2 r4/.hg/cache/rbc-revs-v1 | |
|
250 | 2 r4/.hg/cache/tags2 | |||
|
251 | 2 r4/.hg/cache/tags2-served | |||
244 | 2 r4/.hg/dirstate |
|
252 | 2 r4/.hg/dirstate | |
245 | 2 r4/.hg/fsmonitor.state (fsmonitor !) |
|
253 | 2 r4/.hg/fsmonitor.state (fsmonitor !) | |
246 | 2 r4/.hg/hgrc |
|
254 | 2 r4/.hg/hgrc | |
@@ -289,9 +297,16 b' Update back to revision 12 in r4 should ' | |||||
289 | 2 r4/.hg/00changelog.i |
|
297 | 2 r4/.hg/00changelog.i | |
290 | 1 r4/.hg/branch |
|
298 | 1 r4/.hg/branch | |
291 | 2 r4/.hg/cache/branch2-base |
|
299 | 2 r4/.hg/cache/branch2-base | |
|
300 | 2 r4/.hg/cache/branch2-immutable | |||
292 | 2 r4/.hg/cache/branch2-served |
|
301 | 2 r4/.hg/cache/branch2-served | |
|
302 | 2 r4/.hg/cache/branch2-served.hidden | |||
|
303 | 2 r4/.hg/cache/branch2-visible | |||
|
304 | 2 r4/.hg/cache/branch2-visible-hidden | |||
|
305 | 2 r4/.hg/cache/hgtagsfnodes1 | |||
293 | 2 r4/.hg/cache/rbc-names-v1 |
|
306 | 2 r4/.hg/cache/rbc-names-v1 | |
294 | 2 r4/.hg/cache/rbc-revs-v1 |
|
307 | 2 r4/.hg/cache/rbc-revs-v1 | |
|
308 | 2 r4/.hg/cache/tags2 | |||
|
309 | 2 r4/.hg/cache/tags2-served | |||
295 | 1 r4/.hg/dirstate |
|
310 | 1 r4/.hg/dirstate | |
296 | 1 r4/.hg/fsmonitor.state (fsmonitor !) |
|
311 | 1 r4/.hg/fsmonitor.state (fsmonitor !) | |
297 | 2 r4/.hg/hgrc |
|
312 | 2 r4/.hg/hgrc |
@@ -158,6 +158,7 b' Blob URIs are correct when --prefix is u' | |||||
158 | getting lfs.bin |
|
158 | getting lfs.bin | |
159 | lfs: found f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e in the local lfs store |
|
159 | lfs: found f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e in the local lfs store | |
160 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
160 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
161 | updating the branch cache | |||
161 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
162 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) | |
162 |
|
163 | |||
163 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
|
164 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
@@ -608,8 +608,17 b' The persistent nodemap should exist afte' | |||||
608 |
|
608 | |||
609 | $ hg clone -U test-repo local-clone |
|
609 | $ hg clone -U test-repo local-clone | |
610 | $ ls -1 local-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' |
|
610 | $ ls -1 local-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' | |
611 | [1] |
|
611 | 00changelog-*.nd (glob) | |
|
612 | 00changelog.n | |||
|
613 | 00manifest-*.nd (glob) | |||
|
614 | 00manifest.n | |||
612 | $ hg -R local-clone debugnodemap --metadata |
|
615 | $ hg -R local-clone debugnodemap --metadata | |
|
616 | uid: * (glob) | |||
|
617 | tip-rev: 5005 | |||
|
618 | tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe | |||
|
619 | data-length: 121088 | |||
|
620 | data-unused: 0 | |||
|
621 | data-unused: 0.000% | |||
613 |
|
622 | |||
614 | stream clone |
|
623 | stream clone | |
615 | ------------ |
|
624 | ------------ | |
@@ -618,5 +627,14 b' The persistent nodemap should exist afte' | |||||
618 |
|
627 | |||
619 | $ hg clone -U --stream --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/test-repo stream-clone --quiet |
|
628 | $ hg clone -U --stream --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/test-repo stream-clone --quiet | |
620 | $ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' |
|
629 | $ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' | |
621 | [1] |
|
630 | 00changelog-*.nd (glob) | |
|
631 | 00changelog.n | |||
|
632 | 00manifest-*.nd (glob) | |||
|
633 | 00manifest.n | |||
622 | $ hg -R stream-clone debugnodemap --metadata |
|
634 | $ hg -R stream-clone debugnodemap --metadata | |
|
635 | uid: * (glob) | |||
|
636 | tip-rev: 5005 | |||
|
637 | tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe | |||
|
638 | data-length: 121088 | |||
|
639 | data-unused: 0 | |||
|
640 | data-unused: 0.000% |
@@ -62,9 +62,17 b' Cloning a shared repo should pick up the' | |||||
62 | updating to branch default |
|
62 | updating to branch default | |
63 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
63 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
64 | $ ls -1 ../repo2-clone/.hg/cache |
|
64 | $ ls -1 ../repo2-clone/.hg/cache | |
|
65 | branch2-base | |||
|
66 | branch2-immutable | |||
65 | branch2-served |
|
67 | branch2-served | |
|
68 | branch2-served.hidden | |||
|
69 | branch2-visible | |||
|
70 | branch2-visible-hidden | |||
|
71 | hgtagsfnodes1 | |||
66 | rbc-names-v1 |
|
72 | rbc-names-v1 | |
67 | rbc-revs-v1 |
|
73 | rbc-revs-v1 | |
|
74 | tags2 | |||
|
75 | tags2-served | |||
68 | tags2-visible |
|
76 | tags2-visible | |
69 |
|
77 | |||
70 | Some sed versions appends newline, some don't, and some just fails |
|
78 | Some sed versions appends newline, some don't, and some just fails |
@@ -84,8 +84,8 b' clone bookmarks via stream' | |||||
84 | $ hg -R local-stream book mybook |
|
84 | $ hg -R local-stream book mybook | |
85 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2 |
|
85 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2 | |
86 | streaming all changes |
|
86 | streaming all changes | |
87 |
|
|
87 | 16 files to transfer, * of data (glob) | |
88 |
transferred |
|
88 | transferred * in * seconds (*) (glob) | |
89 | updating to branch default |
|
89 | updating to branch default | |
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 | $ cd stream2 |
|
91 | $ cd stream2 |
@@ -117,6 +117,7 b' Test that we can apply the bundle as a s' | |||||
117 | E: remote created -> g |
|
117 | E: remote created -> g | |
118 | getting E |
|
118 | getting E | |
119 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
119 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
120 | updating the branch cache | |||
120 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
121 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) | |
121 |
|
122 | |||
122 | $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug |
|
123 | $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug | |
@@ -173,4 +174,5 b' Test that we can apply the bundle as a s' | |||||
173 | E: remote created -> g |
|
174 | E: remote created -> g | |
174 | getting E |
|
175 | getting E | |
175 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
176 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
177 | updating the branch cache | |||
176 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
178 | (sent 4 HTTP requests and * bytes; received * bytes in responses) (glob) |
@@ -721,19 +721,26 b' Missing tags2* files means the cache was' | |||||
721 |
|
721 | |||
722 | $ ls tagsclient/.hg/cache |
|
722 | $ ls tagsclient/.hg/cache | |
723 | branch2-base |
|
723 | branch2-base | |
|
724 | branch2-immutable | |||
|
725 | branch2-served | |||
|
726 | branch2-served.hidden | |||
|
727 | branch2-visible | |||
|
728 | branch2-visible-hidden | |||
724 | hgtagsfnodes1 |
|
729 | hgtagsfnodes1 | |
725 | rbc-names-v1 |
|
730 | rbc-names-v1 | |
726 | rbc-revs-v1 |
|
731 | rbc-revs-v1 | |
|
732 | tags2 | |||
|
733 | tags2-served | |||
727 |
|
734 | |||
728 | Cache should contain the head only, even though other nodes have tags data |
|
735 | Cache should contain the head only, even though other nodes have tags data | |
729 |
|
736 | |||
730 | $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 |
|
737 | $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 | |
731 | tagsclient/.hg/cache/hgtagsfnodes1: size=96 |
|
738 | tagsclient/.hg/cache/hgtagsfnodes1: size=96 | |
732 | 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
739 | 0000: 96 ee 1d 73 00 00 00 00 00 00 00 00 00 00 00 00 |...s............| | |
733 | 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
740 | 0010: 00 00 00 00 00 00 00 00 c4 da b0 c2 94 65 e1 c6 |.............e..| | |
734 | 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
741 | 0020: 0d f7 f0 dd 32 04 ea 57 78 c8 97 97 79 fc d5 95 |....2..Wx...y...| | |
735 | 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
742 | 0030: f6 3c c8 fe 94 65 e1 c6 0d f7 f0 dd 32 04 ea 57 |.<...e......2..W| | |
736 |
0040: |
|
743 | 0040: 78 c8 97 97 79 fc d5 95 40 f0 35 8c 19 e0 a7 d3 |x...y...@.5.....| | |
737 | 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.| |
|
744 | 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.| | |
738 |
|
745 | |||
739 | Running hg tags should produce tags2* file and not change cache |
|
746 | Running hg tags should produce tags2* file and not change cache | |
@@ -745,18 +752,25 b' Running hg tags should produce tags2* fi' | |||||
745 |
|
752 | |||
746 | $ ls tagsclient/.hg/cache |
|
753 | $ ls tagsclient/.hg/cache | |
747 | branch2-base |
|
754 | branch2-base | |
|
755 | branch2-immutable | |||
|
756 | branch2-served | |||
|
757 | branch2-served.hidden | |||
|
758 | branch2-visible | |||
|
759 | branch2-visible-hidden | |||
748 | hgtagsfnodes1 |
|
760 | hgtagsfnodes1 | |
749 | rbc-names-v1 |
|
761 | rbc-names-v1 | |
750 | rbc-revs-v1 |
|
762 | rbc-revs-v1 | |
|
763 | tags2 | |||
|
764 | tags2-served | |||
751 | tags2-visible |
|
765 | tags2-visible | |
752 |
|
766 | |||
753 | $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 |
|
767 | $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 | |
754 | tagsclient/.hg/cache/hgtagsfnodes1: size=96 |
|
768 | tagsclient/.hg/cache/hgtagsfnodes1: size=96 | |
755 | 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
769 | 0000: 96 ee 1d 73 00 00 00 00 00 00 00 00 00 00 00 00 |...s............| | |
756 | 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
770 | 0010: 00 00 00 00 00 00 00 00 c4 da b0 c2 94 65 e1 c6 |.............e..| | |
757 | 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
771 | 0020: 0d f7 f0 dd 32 04 ea 57 78 c8 97 97 79 fc d5 95 |....2..Wx...y...| | |
758 | 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| |
|
772 | 0030: f6 3c c8 fe 94 65 e1 c6 0d f7 f0 dd 32 04 ea 57 |.<...e......2..W| | |
759 |
0040: |
|
773 | 0040: 78 c8 97 97 79 fc d5 95 40 f0 35 8c 19 e0 a7 d3 |x...y...@.5.....| | |
760 | 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.| |
|
774 | 0050: 8a 5c 6a 82 4d cf fb a5 87 d0 2f a3 1e 4f 2f 8a |.\j.M...../..O/.| | |
761 |
|
775 | |||
762 | Check that the bundle includes cache data |
|
776 | Check that the bundle includes cache data | |
@@ -779,6 +793,8 b' Check that local clone includes cache da' | |||||
779 | updating to branch default |
|
793 | updating to branch default | |
780 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
794 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
781 | $ (cd tags-local-clone/.hg/cache/; ls -1 tag*) |
|
795 | $ (cd tags-local-clone/.hg/cache/; ls -1 tag*) | |
|
796 | tags2 | |||
|
797 | tags2-served | |||
782 | tags2-visible |
|
798 | tags2-visible | |
783 |
|
799 | |||
784 | Avoid writing logs on trying to delete an already deleted tag |
|
800 | Avoid writing logs on trying to delete an already deleted tag |
@@ -792,7 +792,7 b' Stream clone with basicstore' | |||||
792 | $ hg clone --config experimental.changegroup3=True --stream -U \ |
|
792 | $ hg clone --config experimental.changegroup3=True --stream -U \ | |
793 | > http://localhost:$HGPORT1 stream-clone-basicstore |
|
793 | > http://localhost:$HGPORT1 stream-clone-basicstore | |
794 | streaming all changes |
|
794 | streaming all changes | |
795 |
2 |
|
795 | 29 files to transfer, * of data (glob) | |
796 | transferred * in * seconds (*) (glob) |
|
796 | transferred * in * seconds (*) (glob) | |
797 | $ hg -R stream-clone-basicstore verify |
|
797 | $ hg -R stream-clone-basicstore verify | |
798 | checking changesets |
|
798 | checking changesets | |
@@ -806,7 +806,7 b' Stream clone with encodedstore' | |||||
806 | $ hg clone --config experimental.changegroup3=True --stream -U \ |
|
806 | $ hg clone --config experimental.changegroup3=True --stream -U \ | |
807 | > http://localhost:$HGPORT2 stream-clone-encodedstore |
|
807 | > http://localhost:$HGPORT2 stream-clone-encodedstore | |
808 | streaming all changes |
|
808 | streaming all changes | |
809 |
2 |
|
809 | 29 files to transfer, * of data (glob) | |
810 | transferred * in * seconds (*) (glob) |
|
810 | transferred * in * seconds (*) (glob) | |
811 | $ hg -R stream-clone-encodedstore verify |
|
811 | $ hg -R stream-clone-encodedstore verify | |
812 | checking changesets |
|
812 | checking changesets |
@@ -111,6 +111,7 b' Output is flaky, save it in a file and c' | |||||
111 | } |
|
111 | } | |
112 | updating the branch cache |
|
112 | updating the branch cache | |
113 | new changesets 3390ef850073:caa2a465451d (3 drafts) |
|
113 | new changesets 3390ef850073:caa2a465451d (3 drafts) | |
|
114 | updating the branch cache | |||
114 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
115 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
115 |
|
116 | |||
116 | $ cat clone-output | grep "received frame" |
|
117 | $ cat clone-output | grep "received frame" | |
@@ -239,6 +240,7 b' Output is flaky, save it in a file and c' | |||||
239 | } |
|
240 | } | |
240 | updating the branch cache |
|
241 | updating the branch cache | |
241 | new changesets 3390ef850073:4432d83626e8 |
|
242 | new changesets 3390ef850073:4432d83626e8 | |
|
243 | updating the branch cache | |||
242 | (sent 6 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
244 | (sent 6 HTTP requests and * bytes; received * bytes in responses) (glob) | |
243 |
|
245 | |||
244 | $ cat clone-output | grep "received frame" |
|
246 | $ cat clone-output | grep "received frame" | |
@@ -557,6 +559,7 b' Output is flaky, save it in a file and c' | |||||
557 | } |
|
559 | } | |
558 | updating the branch cache |
|
560 | updating the branch cache | |
559 | new changesets 3390ef850073:caa2a465451d (1 drafts) |
|
561 | new changesets 3390ef850073:caa2a465451d (1 drafts) | |
|
562 | updating the branch cache | |||
560 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
563 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
561 |
|
564 | |||
562 | $ cat clone-output | grep "received frame" |
|
565 | $ cat clone-output | grep "received frame" | |
@@ -758,6 +761,7 b' Output is flaky, save it in a file and c' | |||||
758 | } |
|
761 | } | |
759 | updating the branch cache |
|
762 | updating the branch cache | |
760 | new changesets 3390ef850073:97765fc3cd62 |
|
763 | new changesets 3390ef850073:97765fc3cd62 | |
|
764 | updating the branch cache | |||
761 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
765 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
762 |
|
766 | |||
763 | $ cat clone-output | grep "received frame" |
|
767 | $ cat clone-output | grep "received frame" | |
@@ -872,6 +876,7 b' Output is flaky, save it in a file and c' | |||||
872 | } |
|
876 | } | |
873 | updating the branch cache |
|
877 | updating the branch cache | |
874 | new changesets 3390ef850073:97765fc3cd62 |
|
878 | new changesets 3390ef850073:97765fc3cd62 | |
|
879 | updating the branch cache | |||
875 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
880 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
876 |
|
881 | |||
877 | $ cat clone-output | grep "received frame" |
|
882 | $ cat clone-output | grep "received frame" | |
@@ -988,6 +993,7 b' Output is flaky, save it in a file and c' | |||||
988 | } |
|
993 | } | |
989 | updating the branch cache |
|
994 | updating the branch cache | |
990 | new changesets 3390ef850073:97765fc3cd62 |
|
995 | new changesets 3390ef850073:97765fc3cd62 | |
|
996 | updating the branch cache | |||
991 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
997 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
992 |
|
998 | |||
993 | $ cat clone-output | grep "received frame" |
|
999 | $ cat clone-output | grep "received frame" | |
@@ -1087,6 +1093,7 b' Output is flaky, save it in a file and c' | |||||
1087 | } |
|
1093 | } | |
1088 | ] |
|
1094 | ] | |
1089 | } |
|
1095 | } | |
|
1096 | updating the branch cache | |||
1090 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
1097 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
1091 |
|
1098 | |||
1092 | $ cat clone-output | grep "received frame" |
|
1099 | $ cat clone-output | grep "received frame" | |
@@ -1183,6 +1190,7 b' Output is flaky, save it in a file and c' | |||||
1183 | } |
|
1190 | } | |
1184 | ] |
|
1191 | ] | |
1185 | } |
|
1192 | } | |
|
1193 | updating the branch cache | |||
1186 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
1194 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
1187 |
|
1195 | |||
1188 | $ cat clone-output | grep "received frame" |
|
1196 | $ cat clone-output | grep "received frame" |
General Comments 0
You need to be logged in to leave comments.
Login now