facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

branchmap: remove extra indent

Browse Source 
This clean up the rest of the previous changeset.
This commit is contained in:
Pierre-Yves David 2016-08-05 15:01:16 +02:00
parent 35ede6eab9
commit d7ae979f6e
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
mercurial/branchmap.py
View File

@ -476,27 +476,23 @@ class revbranchcache(object):
if self._rbcnamescount < len(self._names): if self._rbcnamescount < len(self._names):
step = ' names' step = ' names'
wlock = repo.wlock(wait=False) wlock = repo.wlock(wait=False)
if True: if self._rbcnamescount != 0:
if self._rbcnamescount != 0: f = repo.vfs.open(_rbcnames, 'ab')
f = repo.vfs.open(_rbcnames, 'ab') if f.tell() == self._rbcsnameslen:
if f.tell() == self._rbcsnameslen: f.write('\0')
f.write('\0') else:
else: f.close()
f.close() repo.ui.debug("%s changed - rewriting it\n" % _rbcnames)
repo.ui.debug("%s changed - rewriting it\n" self._rbcnamescount = 0
% _rbcnames) self._rbcrevslen = 0
self._rbcnamescount = 0 if self._rbcnamescount == 0:
self._rbcrevslen = 0 # before rewriting names, make sure references are removed
if self._rbcnamescount == 0: repo.vfs.unlinkpath(_rbcrevs, ignoremissing=True)
# before rewriting names, make sure references are f = repo.vfs.open(_rbcnames, 'wb')
# removed f.write('\0'.join(encoding.fromlocal(b)
repo.vfs.unlinkpath(_rbcrevs, ignoremissing=True) for b in self._names[self._rbcnamescount:]))
f = repo.vfs.open(_rbcnames, 'wb') self._rbcsnameslen = f.tell()
f.write('\0'.join(encoding.fromlocal(b) f.close()
for b in self._names[self._rbcnamescount:]
))
self._rbcsnameslen = f.tell()
f.close()
self._rbcnamescount = len(self._names) self._rbcnamescount = len(self._names)
start = self._rbcrevslen * _rbcrecsize start = self._rbcrevslen * _rbcrecsize
@ -506,19 +502,17 @@ class revbranchcache(object):
wlock = repo.wlock(wait=False) wlock = repo.wlock(wait=False)
revs = min(len(repo.changelog), revs = min(len(repo.changelog),
len(self._rbcrevs) // _rbcrecsize) len(self._rbcrevs) // _rbcrecsize)
if True: f = repo.vfs.open(_rbcrevs, 'ab')
f = repo.vfs.open(_rbcrevs, 'ab') if f.tell() != start:
repo.ui.debug("truncating %s to %s\n" % (_rbcrevs, start))
f.seek(start)
if f.tell() != start: if f.tell() != start:
repo.ui.debug("truncating %s to %s\n" start = 0
% (_rbcrevs, start))
f.seek(start) f.seek(start)
if f.tell() != start: f.truncate()
start = 0 end = revs * _rbcrecsize
f.seek(start) f.write(self._rbcrevs[start:end])
f.truncate() f.close()
end = revs * _rbcrecsize
f.write(self._rbcrevs[start:end])
f.close()
self._rbcrevslen = revs self._rbcrevslen = revs
except (IOError, OSError, error.Abort, error.LockError) as inst: except (IOError, OSError, error.Abort, error.LockError) as inst:
repo.ui.debug("couldn't write revision branch cache%s: %s\n" repo.ui.debug("couldn't write revision branch cache%s: %s\n"