Show More
@@ -137,9 +137,10 b' class changelog(revlog):' | |||
|
137 | 137 | pass |
|
138 | 138 | |
|
139 | 139 | class dircache: |
|
140 | def __init__(self, opener): | |
|
140 | def __init__(self, opener, ui): | |
|
141 | 141 | self.opener = opener |
|
142 | 142 | self.dirty = 0 |
|
143 | self.ui = ui | |
|
143 | 144 | self.map = None |
|
144 | 145 | def __del__(self): |
|
145 | 146 | if self.dirty: self.write() |
@@ -190,8 +191,11 b' class dircache:' | |||
|
190 | 191 | self.read() |
|
191 | 192 | self.dirty = 1 |
|
192 | 193 | for f in files: |
|
193 |
try: |
|
|
194 | except KeyError: pass | |
|
194 | try: | |
|
195 | del self.map[f] | |
|
196 | except KeyError: | |
|
197 | self.ui.warn("Not in dircache: %s\n" % f) | |
|
198 | pass | |
|
195 | 199 | |
|
196 | 200 | def clear(self): |
|
197 | 201 | self.map = {} |
@@ -256,7 +260,7 b' class repository:' | |||
|
256 | 260 | self.ignorelist = None |
|
257 | 261 | |
|
258 | 262 | if not self.remote: |
|
259 | self.dircache = dircache(self.opener) | |
|
263 | self.dircache = dircache(self.opener, ui) | |
|
260 | 264 | try: |
|
261 | 265 | self.current = bin(self.opener("current").read()) |
|
262 | 266 | except IOError: |
@@ -399,6 +403,7 b' class repository:' | |||
|
399 | 403 | if co == cn: cn = -1 |
|
400 | 404 | |
|
401 | 405 | edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new]) |
|
406 | edittext += "".join(["HG: removed %s\n" % f for f in remove]) | |
|
402 | 407 | edittext = self.ui.edit(edittext) |
|
403 | 408 | n = self.changelog.add(node, new, edittext, tr, co, cn) |
|
404 | 409 |
General Comments 0
You need to be logged in to leave comments.
Login now