Show More
@@ -94,6 +94,9 b' class transaction(object):' | |||||
94 | self._abort() |
|
94 | self._abort() | |
95 |
|
95 | |||
96 | def _abort(self): |
|
96 | def _abort(self): | |
|
97 | self.count = 0 | |||
|
98 | self.file.close() | |||
|
99 | ||||
97 | if not self.entries: return |
|
100 | if not self.entries: return | |
98 |
|
101 | |||
99 | self.report(_("transaction abort!\n")) |
|
102 | self.report(_("transaction abort!\n")) | |
@@ -109,13 +112,14 b' class transaction(object):' | |||||
109 | self.entries = [] |
|
112 | self.entries = [] | |
110 |
|
113 | |||
111 | if not failed: |
|
114 | if not failed: | |
112 | self.file.close() |
|
|||
113 | os.unlink(self.journal) |
|
115 | os.unlink(self.journal) | |
114 | self.journal = None |
|
|||
115 | self.report(_("rollback completed\n")) |
|
116 | self.report(_("rollback completed\n")) | |
116 | else: |
|
117 | else: | |
117 | self.report(_("rollback failed - please run hg recover\n")) |
|
118 | self.report(_("rollback failed - please run hg recover\n")) | |
118 |
|
119 | |||
|
120 | self.journal = None | |||
|
121 | ||||
|
122 | ||||
119 | def rollback(opener, file): |
|
123 | def rollback(opener, file): | |
120 | files = {} |
|
124 | files = {} | |
121 | for l in open(file).readlines(): |
|
125 | for l in open(file).readlines(): |
General Comments 0
You need to be logged in to leave comments.
Login now