Show More
@@ -1230,7 +1230,7 b' class dirstate(object):' | |||
|
1230 | 1230 | # end of this transaction |
|
1231 | 1231 | tr.registertmp(filename, location='plain') |
|
1232 | 1232 | |
|
1233 | self._opener.write(prefix + filename + suffix, | |
|
1233 | self._opener.write(prefix + self._filename + suffix, | |
|
1234 | 1234 | self._opener.tryread(filename)) |
|
1235 | 1235 | |
|
1236 | 1236 | def restorebackup(self, tr, suffix='', prefix=''): |
@@ -1239,9 +1239,10 b' class dirstate(object):' | |||
|
1239 | 1239 | # changes of dirstate out after restoring from backup file |
|
1240 | 1240 | self.invalidate() |
|
1241 | 1241 | filename = self._actualfilename(tr) |
|
1242 | self._opener.rename(prefix + filename + suffix, filename) | |
|
1242 | # using self._filename to avoid having "pending" in the backup filename | |
|
1243 | self._opener.rename(prefix + self._filename + suffix, filename) | |
|
1243 | 1244 | |
|
1244 | 1245 | def clearbackup(self, tr, suffix='', prefix=''): |
|
1245 | 1246 | '''Clear backup file with suffix''' |
|
1246 | filename = self._actualfilename(tr) | |
|
1247 | self._opener.unlink(prefix + filename + suffix) | |
|
1247 | # using self._filename to avoid having "pending" in the backup filename | |
|
1248 | self._opener.unlink(prefix + self._filename + suffix) |
General Comments 0
You need to be logged in to leave comments.
Login now