Show More
@@ -1367,7 +1367,7 b' class localrepository(object):' | |||
|
1367 | 1367 | # if minimal phase was 0 we don't need to retract anything |
|
1368 | 1368 | phases.retractboundary(self, targetphase, [n]) |
|
1369 | 1369 | tr.close() |
|
1370 | branchmap.updatecache(self) | |
|
1370 | branchmap.updatecache(self.filtered('served')) | |
|
1371 | 1371 | return n |
|
1372 | 1372 | finally: |
|
1373 | 1373 | if tr: |
@@ -2388,7 +2388,7 b' class localrepository(object):' | |||
|
2388 | 2388 | # During strip, branchcache is invalid but coming call to |
|
2389 | 2389 | # `destroyed` will repair it. |
|
2390 | 2390 | # In other case we can safely update cache on disk. |
|
2391 | branchmap.updatecache(self) | |
|
2391 | branchmap.updatecache(self.filtered('served')) | |
|
2392 | 2392 | def runhooks(): |
|
2393 | 2393 | # forcefully update the on-disk branch cache |
|
2394 | 2394 | self.ui.debug("updating the branch cache\n") |
@@ -579,6 +579,7 b' Commit and show expansion in original an' | |||
|
579 | 579 | invalid branchheads cache (served): tip differs |
|
580 | 580 | c |
|
581 | 581 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
582 | invalid branchheads cache (served): tip differs | |
|
582 | 583 | overwriting c expanding keywords |
|
583 | 584 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
|
584 | 585 | $ cat a c |
@@ -762,7 +763,6 b' Commit with multi-line message and custo' | |||
|
762 | 763 | $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
|
763 | 764 | invalid branchheads cache (served): tip differs |
|
764 | 765 | a |
|
765 | invalid branchheads cache: tip differs | |
|
766 | 766 | invalid branchheads cache (served): tip differs |
|
767 | 767 | overwriting a expanding keywords |
|
768 | 768 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
@@ -805,7 +805,6 b' remove with status checks' | |||
|
805 | 805 | $ hg debugrebuildstate |
|
806 | 806 | $ hg remove a |
|
807 | 807 | $ hg --debug commit -m rma |
|
808 | invalid branchheads cache: tip differs | |
|
809 | 808 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
|
810 | 809 | $ hg status |
|
811 | 810 | ? c |
@@ -918,7 +917,6 b' kwexpand x/a should abort' | |||
|
918 | 917 | $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
|
919 | 918 | x/a |
|
920 | 919 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
|
921 | invalid branchheads cache: tip differs | |
|
922 | 920 | overwriting x/a expanding keywords |
|
923 | 921 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
|
924 | 922 | $ cat a |
@@ -45,6 +45,7 b' test updating a symlink' | |||
|
45 | 45 | popping updatelink |
|
46 | 46 | now at: symlink.patch |
|
47 | 47 | $ hg qpush --debug |
|
48 | invalid branchheads cache (served): tip differs | |
|
48 | 49 | applying updatelink |
|
49 | 50 | patching file a |
|
50 | 51 | a |
@@ -177,16 +177,26 b' check that branch cache with "unserved" ' | |||
|
177 | 177 | |
|
178 | 178 | $ ls ../push-dest/.hg/cache/branchheads* |
|
179 | 179 | ../push-dest/.hg/cache/branchheads-served |
|
180 | $ cat ../push-dest/.hg/cache/branchheads-served | |
|
181 | 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 | |
|
182 | b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default | |
|
183 | 6d6770faffce199f1fddd1cf87f6f026138cf061 default | |
|
184 | $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too | |
|
185 | 6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft | |
|
186 | 5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret | |
|
187 | 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft | |
|
188 | $ ls ../push-dest/.hg/cache/branchheads* | |
|
189 | ../push-dest/.hg/cache/branchheads-served | |
|
180 | 190 | ../push-dest/.hg/cache/branchheads-visible |
|
191 | $ cat ../push-dest/.hg/cache/branchheads-served | |
|
192 | 6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722 | |
|
193 | b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default | |
|
194 | 6d6770faffce199f1fddd1cf87f6f026138cf061 default | |
|
181 | 195 | $ cat ../push-dest/.hg/cache/branchheads-visible |
|
182 | 196 | 6d6770faffce199f1fddd1cf87f6f026138cf061 6 |
|
183 | 197 | b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default |
|
184 | 198 | 2713879da13d6eea1ff22b442a5a87cb31a7ce6a default |
|
185 | 199 | 6d6770faffce199f1fddd1cf87f6f026138cf061 default |
|
186 | $ cat ../push-dest/.hg/cache/branchheads-served | |
|
187 | cf9fe039dfd67e829edf6522a45de057b5c86519 4 | |
|
188 | b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default | |
|
189 | cf9fe039dfd67e829edf6522a45de057b5c86519 default | |
|
190 | 200 | |
|
191 | 201 | |
|
192 | 202 | Restore condition prior extra insertion. |
General Comments 0
You need to be logged in to leave comments.
Login now