Show More
@@ -124,7 +124,6 b' from mercurial import (' | |||||
124 | from . import ( |
|
124 | from . import ( | |
125 | bundleparts, |
|
125 | bundleparts, | |
126 | common, |
|
126 | common, | |
127 | infinitepushcommands, |
|
|||
128 | ) |
|
127 | ) | |
129 |
|
128 | |||
130 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
|
129 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | |
@@ -160,9 +159,6 b" configitem('scratchbranch', 'storepath'," | |||||
160 | configitem('infinitepush', 'branchpattern', |
|
159 | configitem('infinitepush', 'branchpattern', | |
161 | default='', |
|
160 | default='', | |
162 | ) |
|
161 | ) | |
163 | configitem('infinitepush', 'metadatafilelimit', |
|
|||
164 | default=100, |
|
|||
165 | ) |
|
|||
166 | configitem('experimental', 'server-bundlestore-bookmark', |
|
162 | configitem('experimental', 'server-bundlestore-bookmark', | |
167 | default='', |
|
163 | default='', | |
168 | ) |
|
164 | ) | |
@@ -179,7 +175,6 b" configscratchpush = 'infinitepush-scratc" | |||||
179 | confignonforwardmove = 'non-forward-move' |
|
175 | confignonforwardmove = 'non-forward-move' | |
180 |
|
176 | |||
181 | scratchbranchparttype = bundleparts.scratchbranchparttype |
|
177 | scratchbranchparttype = bundleparts.scratchbranchparttype | |
182 | cmdtable = infinitepushcommands.cmdtable |
|
|||
183 | revsetpredicate = registrar.revsetpredicate() |
|
178 | revsetpredicate = registrar.revsetpredicate() | |
184 | templatekeyword = registrar.templatekeyword() |
|
179 | templatekeyword = registrar.templatekeyword() | |
185 | _scratchbranchmatcher = lambda x: False |
|
180 | _scratchbranchmatcher = lambda x: False |
@@ -211,80 +211,3 b' Strip commit and pull it using hg update' | |||||
211 | (activating bookmark scratch/mybranch) |
|
211 | (activating bookmark scratch/mybranch) | |
212 | $ hg log -r scratch/mybranch -T '{node}' |
|
212 | $ hg log -r scratch/mybranch -T '{node}' | |
213 | d8fde0ddfc962183977f92d2bc52d303b8840f9d (no-eol) |
|
213 | d8fde0ddfc962183977f92d2bc52d303b8840f9d (no-eol) | |
214 |
|
||||
215 | Test debugfillinfinitepushmetadata |
|
|||
216 | $ cd ../repo |
|
|||
217 | $ hg debugfillinfinitepushmetadata |
|
|||
218 | abort: nodes are not specified |
|
|||
219 | [255] |
|
|||
220 | $ hg debugfillinfinitepushmetadata --node randomnode |
|
|||
221 | abort: node randomnode is not found |
|
|||
222 | [255] |
|
|||
223 | $ hg debugfillinfinitepushmetadata --node d8fde0ddfc962183977f92d2bc52d303b8840f9d |
|
|||
224 | $ cat .hg/scratchbranches/index/nodemetadatamap/d8fde0ddfc962183977f92d2bc52d303b8840f9d |
|
|||
225 | {"changed_files": {"testpullbycommithash2": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol) |
|
|||
226 |
|
||||
227 | $ cd ../client |
|
|||
228 | $ hg up d8fde0ddfc962183977f92d2bc52d303b8840f9d |
|
|||
229 | 'd8fde0ddfc962183977f92d2bc52d303b8840f9d' does not exist locally - looking for it remotely... |
|
|||
230 | pulling from ssh://user@dummy/repo |
|
|||
231 | searching for changes |
|
|||
232 | adding changesets |
|
|||
233 | adding manifests |
|
|||
234 | adding file changes |
|
|||
235 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
236 | new changesets 33910bfe6ffe:d8fde0ddfc96 |
|
|||
237 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
|||
238 | 'd8fde0ddfc962183977f92d2bc52d303b8840f9d' found remotely |
|
|||
239 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
240 | $ echo file > file |
|
|||
241 | $ hg add file |
|
|||
242 | $ hg rm testpullbycommithash2 |
|
|||
243 | $ hg ci -m 'add and rm files' |
|
|||
244 | $ hg log -r . -T '{node}\n' |
|
|||
245 | 3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239 |
|
|||
246 | $ hg cp file cpfile |
|
|||
247 | $ hg mv file mvfile |
|
|||
248 | $ hg ci -m 'cpfile and mvfile' |
|
|||
249 | $ hg log -r . -T '{node}\n' |
|
|||
250 | c7ac39f638c6b39bcdacf868fa21b6195670f8ae |
|
|||
251 | $ hg push -r . --bundle-store |
|
|||
252 | pushing to ssh://user@dummy/repo |
|
|||
253 | searching for changes |
|
|||
254 | remote: pushing 4 commits: |
|
|||
255 | remote: 33910bfe6ffe testpullbycommithash1 |
|
|||
256 | remote: d8fde0ddfc96 testpullbycommithash2 |
|
|||
257 | remote: 3edfe7e9089a add and rm files |
|
|||
258 | remote: c7ac39f638c6 cpfile and mvfile |
|
|||
259 | $ cd ../repo |
|
|||
260 | $ hg debugfillinfinitepushmetadata --node 3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239 --node c7ac39f638c6b39bcdacf868fa21b6195670f8ae |
|
|||
261 | $ cat .hg/scratchbranches/index/nodemetadatamap/3edfe7e9089ab9f728eb8e0d0c62a5d18cf19239 |
|
|||
262 | {"changed_files": {"file": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}, "testpullbycommithash2": {"adds": 0, "isbinary": false, "removes": 1, "status": "removed"}}} (no-eol) |
|
|||
263 | $ cat .hg/scratchbranches/index/nodemetadatamap/c7ac39f638c6b39bcdacf868fa21b6195670f8ae |
|
|||
264 | {"changed_files": {"cpfile": {"adds": 1, "copies": "file", "isbinary": false, "removes": 0, "status": "added"}, "file": {"adds": 0, "isbinary": false, "removes": 1, "status": "removed"}, "mvfile": {"adds": 1, "copies": "file", "isbinary": false, "removes": 0, "status": "added"}}} (no-eol) |
|
|||
265 |
|
||||
266 | Test infinitepush.metadatafilelimit number |
|
|||
267 | $ cd ../client |
|
|||
268 | $ echo file > file |
|
|||
269 | $ hg add file |
|
|||
270 | $ echo file1 > file1 |
|
|||
271 | $ hg add file1 |
|
|||
272 | $ echo file2 > file2 |
|
|||
273 | $ hg add file2 |
|
|||
274 | $ hg ci -m 'add many files' |
|
|||
275 | $ hg log -r . -T '{node}' |
|
|||
276 | 09904fb20c53ff351bd3b1d47681f569a4dab7e5 (no-eol) |
|
|||
277 | $ hg push -r . --bundle-store |
|
|||
278 | pushing to ssh://user@dummy/repo |
|
|||
279 | searching for changes |
|
|||
280 | remote: pushing 5 commits: |
|
|||
281 | remote: 33910bfe6ffe testpullbycommithash1 |
|
|||
282 | remote: d8fde0ddfc96 testpullbycommithash2 |
|
|||
283 | remote: 3edfe7e9089a add and rm files |
|
|||
284 | remote: c7ac39f638c6 cpfile and mvfile |
|
|||
285 | remote: 09904fb20c53 add many files |
|
|||
286 |
|
||||
287 | $ cd ../repo |
|
|||
288 | $ hg debugfillinfinitepushmetadata --node 09904fb20c53ff351bd3b1d47681f569a4dab7e5 --config infinitepush.metadatafilelimit=2 |
|
|||
289 | $ cat .hg/scratchbranches/index/nodemetadatamap/09904fb20c53ff351bd3b1d47681f569a4dab7e5 |
|
|||
290 | {"changed_files": {"file": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}, "file1": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}, "changed_files_truncated": true} (no-eol) |
|
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now