Show More
@@ -207,6 +207,7 b' def createlog(ui, directory=None, root="' | |||||
207 | # state machine begins here |
|
207 | # state machine begins here | |
208 | tags = {} # dictionary of revisions on current file with their tags |
|
208 | tags = {} # dictionary of revisions on current file with their tags | |
209 | branchmap = {} # mapping between branch names and revision numbers |
|
209 | branchmap = {} # mapping between branch names and revision numbers | |
|
210 | rcsmap = {} | |||
210 | state = 0 |
|
211 | state = 0 | |
211 | store = False # set when a new record can be appended |
|
212 | store = False # set when a new record can be appended | |
212 |
|
213 | |||
@@ -439,6 +440,8 b' def createlog(ui, directory=None, root="' | |||||
439 |
|
440 | |||
440 | log.append(e) |
|
441 | log.append(e) | |
441 |
|
442 | |||
|
443 | rcsmap[e.rcs.replace('/Attic/', '/')] = e.rcs | |||
|
444 | ||||
442 | if len(log) % 100 == 0: |
|
445 | if len(log) % 100 == 0: | |
443 | ui.status(util.ellipsis('%d %s' % (len(log), e.file), 80)+'\n') |
|
446 | ui.status(util.ellipsis('%d %s' % (len(log), e.file), 80)+'\n') | |
444 |
|
447 | |||
@@ -446,6 +449,13 b' def createlog(ui, directory=None, root="' | |||||
446 |
|
449 | |||
447 | # find parent revisions of individual files |
|
450 | # find parent revisions of individual files | |
448 | versions = {} |
|
451 | versions = {} | |
|
452 | for e in sorted(oldlog, key=lambda x: (x.rcs, x.revision)): | |||
|
453 | rcs = e.rcs.replace('/Attic/', '/') | |||
|
454 | if rcs in rcsmap: | |||
|
455 | e.rcs = rcsmap[rcs] | |||
|
456 | branch = e.revision[:-1] | |||
|
457 | versions[(e.rcs, branch)] = e.revision | |||
|
458 | ||||
449 | for e in log: |
|
459 | for e in log: | |
450 | branch = e.revision[:-1] |
|
460 | branch = e.revision[:-1] | |
451 | p = versions.get((e.rcs, branch), None) |
|
461 | p = versions.get((e.rcs, branch), None) |
@@ -333,13 +333,29 b' convert again' | |||||
333 | testing debugcvsps |
|
333 | testing debugcvsps | |
334 |
|
334 | |||
335 | $ cd src |
|
335 | $ cd src | |
336 | $ hg debugcvsps --fuzz=2 |
|
336 | $ hg debugcvsps --fuzz=2 -x >/dev/null | |
|
337 | ||||
|
338 | commit a new revision changing a and removing b/c | |||
|
339 | ||||
|
340 | $ cvscall -q update -A | |||
|
341 | U a | |||
|
342 | U b/c | |||
|
343 | $ sleep 1 | |||
|
344 | $ echo h >> a | |||
|
345 | $ cvscall -Q remove -f b/c | |||
|
346 | $ cvscall -q commit -mci | grep '<--' | |||
|
347 | $TESTTMP/cvsrepo/src/a,v <-- a | |||
|
348 | $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) | |||
|
349 | ||||
|
350 | update and verify the cvsps cache | |||
|
351 | ||||
|
352 | $ hg debugcvsps --fuzz=2 -u | |||
337 | collecting CVS rlog |
|
353 | collecting CVS rlog | |
338 |
1 |
|
354 | 13 log entries | |
339 |
cvslog hook: 1 |
|
355 | cvslog hook: 13 entries | |
340 | creating changesets |
|
356 | creating changesets | |
341 |
1 |
|
357 | 11 changeset entries | |
342 |
cvschangesets hook: 1 |
|
358 | cvschangesets hook: 11 changesets | |
343 | --------------------- |
|
359 | --------------------- | |
344 | PatchSet 1 |
|
360 | PatchSet 1 | |
345 | Date: * (glob) |
|
361 | Date: * (glob) | |
@@ -466,5 +482,18 b' testing debugcvsps' | |||||
466 | Members: |
|
482 | Members: | |
467 | b/c:1.1.2.1->1.1.2.2 |
|
483 | b/c:1.1.2.1->1.1.2.2 | |
468 |
|
484 | |||
|
485 | --------------------- | |||
|
486 | PatchSet 11 | |||
|
487 | Date: * (glob) | |||
|
488 | Author: * (glob) | |||
|
489 | Branch: HEAD | |||
|
490 | Tag: (none) | |||
|
491 | Log: | |||
|
492 | ci | |||
|
493 | ||||
|
494 | Members: | |||
|
495 | a:1.2->1.3 | |||
|
496 | b/c:1.3->1.4(DEAD) | |||
|
497 | ||||
469 |
|
498 | |||
470 | $ cd .. |
|
499 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now