Show More
@@ -1263,9 +1263,7 b' class localrepository(repo.repository):' | |||||
1263 | # if minimal phase was 0 we don't need to retract anything |
|
1263 | # if minimal phase was 0 we don't need to retract anything | |
1264 | phases.retractboundary(self, targetphase, [n]) |
|
1264 | phases.retractboundary(self, targetphase, [n]) | |
1265 | tr.close() |
|
1265 | tr.close() | |
1266 |
|
1266 | self.updatebranchcache() | ||
1267 | if self._branchcache: |
|
|||
1268 | self.updatebranchcache() |
|
|||
1269 | return n |
|
1267 | return n | |
1270 | finally: |
|
1268 | finally: | |
1271 | if tr: |
|
1269 | if tr: |
@@ -69,6 +69,8 b' Non store repo:' | |||||
69 | .hg |
|
69 | .hg | |
70 | .hg/00changelog.i |
|
70 | .hg/00changelog.i | |
71 | .hg/00manifest.i |
|
71 | .hg/00manifest.i | |
|
72 | .hg/cache | |||
|
73 | .hg/cache/branchheads | |||
72 | .hg/data |
|
74 | .hg/data | |
73 | .hg/data/tst.d.hg |
|
75 | .hg/data/tst.d.hg | |
74 | .hg/data/tst.d.hg/foo.i |
|
76 | .hg/data/tst.d.hg/foo.i | |
@@ -95,6 +97,8 b' Non fncache repo:' | |||||
95 | $ find .hg | sort |
|
97 | $ find .hg | sort | |
96 | .hg |
|
98 | .hg | |
97 | .hg/00changelog.i |
|
99 | .hg/00changelog.i | |
|
100 | .hg/cache | |||
|
101 | .hg/cache/branchheads | |||
98 | .hg/dirstate |
|
102 | .hg/dirstate | |
99 | .hg/last-message.txt |
|
103 | .hg/last-message.txt | |
100 | .hg/requires |
|
104 | .hg/requires |
@@ -65,6 +65,8 b' new directories are setgid' | |||||
65 | $ python ../printmodes.py . |
|
65 | $ python ../printmodes.py . | |
66 | 00700 ./.hg/ |
|
66 | 00700 ./.hg/ | |
67 | 00600 ./.hg/00changelog.i |
|
67 | 00600 ./.hg/00changelog.i | |
|
68 | 00770 ./.hg/cache/ | |||
|
69 | 00660 ./.hg/cache/branchheads | |||
68 | 00660 ./.hg/dirstate |
|
70 | 00660 ./.hg/dirstate | |
69 | 00660 ./.hg/last-message.txt |
|
71 | 00660 ./.hg/last-message.txt | |
70 | 00600 ./.hg/requires |
|
72 | 00600 ./.hg/requires |
@@ -29,14 +29,16 b' mq patch on an empty repo' | |||||
29 | $ hg qnew -d '0 0' p1 |
|
29 | $ hg qnew -d '0 0' p1 | |
30 | $ show_branch_cache |
|
30 | $ show_branch_cache | |
31 | tip: 0 |
|
31 | tip: 0 | |
32 | No branch cache |
|
32 | d986d5caac23a7d44a46efc0ddaf5eb9665844cf 0 | |
|
33 | d986d5caac23a7d44a46efc0ddaf5eb9665844cf default | |||
33 |
|
34 | |||
34 | $ echo > pfile |
|
35 | $ echo > pfile | |
35 | $ hg add pfile |
|
36 | $ hg add pfile | |
36 | $ hg qrefresh -m 'patch 1' |
|
37 | $ hg qrefresh -m 'patch 1' | |
37 | $ show_branch_cache |
|
38 | $ show_branch_cache | |
38 | tip: 0 |
|
39 | tip: 0 | |
39 | No branch cache |
|
40 | a7977e38ed2c2942fa6c278030badfef3d180979 0 | |
|
41 | a7977e38ed2c2942fa6c278030badfef3d180979 default | |||
40 |
|
42 | |||
41 | some regular revisions |
|
43 | some regular revisions | |
42 |
|
44 | |||
@@ -65,8 +67,8 b' add some mq patches' | |||||
65 | now at: p1 |
|
67 | now at: p1 | |
66 | $ show_branch_cache |
|
68 | $ show_branch_cache | |
67 | tip: 2 |
|
69 | tip: 2 | |
68 | c229711f16da3d7591f89b1b8d963b79bda22714 1 |
|
70 | 982611f6955f9c48d3365decea203217c945ef0d 2 | |
69 | c229711f16da3d7591f89b1b8d963b79bda22714 bar |
|
71 | 982611f6955f9c48d3365decea203217c945ef0d bar | |
70 | dc25e3827021582e979f600811852e36cbe57341 foo |
|
72 | dc25e3827021582e979f600811852e36cbe57341 foo | |
71 |
|
73 | |||
72 | $ hg qnew -d '0 0' p2 |
|
74 | $ hg qnew -d '0 0' p2 | |
@@ -75,8 +77,8 b' add some mq patches' | |||||
75 | $ hg qrefresh -m 'patch 2' |
|
77 | $ hg qrefresh -m 'patch 2' | |
76 | $ show_branch_cache 1 |
|
78 | $ show_branch_cache 1 | |
77 | tip: 3 |
|
79 | tip: 3 | |
78 | c229711f16da3d7591f89b1b8d963b79bda22714 1 |
|
80 | 982611f6955f9c48d3365decea203217c945ef0d 2 | |
79 | c229711f16da3d7591f89b1b8d963b79bda22714 bar |
|
81 | 982611f6955f9c48d3365decea203217c945ef0d bar | |
80 | dc25e3827021582e979f600811852e36cbe57341 foo |
|
82 | dc25e3827021582e979f600811852e36cbe57341 foo | |
81 | branch foo: 3 |
|
83 | branch foo: 3 | |
82 | branch bar: 2 |
|
84 | branch bar: 2 | |
@@ -119,6 +121,6 b' detect an invalid cache' | |||||
119 | now at: p2 |
|
121 | now at: p2 | |
120 | $ show_branch_cache |
|
122 | $ show_branch_cache | |
121 | tip: 3 |
|
123 | tip: 3 | |
122 | dc25e3827021582e979f600811852e36cbe57341 0 |
|
124 | 3fe2e3b237359b5c55cec6ed172ac41d3850fade 1 | |
123 | dc25e3827021582e979f600811852e36cbe57341 foo |
|
125 | 3fe2e3b237359b5c55cec6ed172ac41d3850fade foo | |
124 |
|
126 |
General Comments 0
You need to be logged in to leave comments.
Login now