Show More
@@ -932,7 +932,7 b' class localrepository(repo.repository):' | |||||
932 | def unlock(): |
|
932 | def unlock(): | |
933 | self.store.write() |
|
933 | self.store.write() | |
934 | if self._dirtyphases: |
|
934 | if self._dirtyphases: | |
935 | phases.writeroots(self) |
|
935 | phases.writeroots(self, self._phaseroots) | |
936 | self._dirtyphases = False |
|
936 | self._dirtyphases = False | |
937 | for k, ce in self._filecache.items(): |
|
937 | for k, ce in self._filecache.items(): | |
938 | if k == 'dirstate': |
|
938 | if k == 'dirstate': |
@@ -156,14 +156,13 b' def readroots(repo, phasedefaults=None):' | |||||
156 | dirty = True |
|
156 | dirty = True | |
157 | return roots, dirty |
|
157 | return roots, dirty | |
158 |
|
158 | |||
159 | def writeroots(repo): |
|
159 | def writeroots(repo, phaseroots): | |
160 | """Write phase roots from disk""" |
|
160 | """Write phase roots from disk""" | |
161 | f = repo.sopener('phaseroots', 'w', atomictemp=True) |
|
161 | f = repo.sopener('phaseroots', 'w', atomictemp=True) | |
162 | try: |
|
162 | try: | |
163 |
for phase, roots in enumerate( |
|
163 | for phase, roots in enumerate(phaseroots): | |
164 | for h in roots: |
|
164 | for h in roots: | |
165 | f.write('%i %s\n' % (phase, hex(h))) |
|
165 | f.write('%i %s\n' % (phase, hex(h))) | |
166 | repo._dirtyphases = False |
|
|||
167 | finally: |
|
166 | finally: | |
168 | f.close() |
|
167 | f.close() | |
169 |
|
168 |
General Comments 0
You need to be logged in to leave comments.
Login now