equal
deleted
inserted
replaced
167 else: |
167 else: |
168 with self.repo.vfs("rebasestate", "w") as f: |
168 with self.repo.vfs("rebasestate", "w") as f: |
169 self._writestatus(f) |
169 self._writestatus(f) |
170 |
170 |
171 def _writestatus(self, f): |
171 def _writestatus(self, f): |
172 repo = self.repo |
172 repo = self.repo.unfiltered() |
173 f.write(repo[self.originalwd].hex() + '\n') |
173 f.write(repo[self.originalwd].hex() + '\n') |
174 f.write(repo[self.target].hex() + '\n') |
174 f.write(repo[self.target].hex() + '\n') |
175 f.write(repo[self.external].hex() + '\n') |
175 f.write(repo[self.external].hex() + '\n') |
176 f.write('%d\n' % int(self.collapsef)) |
176 f.write('%d\n' % int(self.collapsef)) |
177 f.write('%d\n' % int(self.keepf)) |
177 f.write('%d\n' % int(self.keepf)) |