Mercurial > hg
comparison mercurial/branchmap.py @ 29746:3dbc95f3eb31
branchmap: remove extra indent
This clean up the rest of the previous changeset.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 05 Aug 2016 15:01:16 +0200 |
| parents | 3b184adfb5be |
| children | 22fbca1d11ed |
comparison
equal
deleted
inserted
replaced
| 29745:3b184adfb5be | 29746:3dbc95f3eb31 |
|---|---|
| 474 step = '' | 474 step = '' |
| 475 try: | 475 try: |
| 476 if self._rbcnamescount < len(self._names): | 476 if self._rbcnamescount < len(self._names): |
| 477 step = ' names' | 477 step = ' names' |
| 478 wlock = repo.wlock(wait=False) | 478 wlock = repo.wlock(wait=False) |
| 479 if True: | 479 if self._rbcnamescount != 0: |
| 480 if self._rbcnamescount != 0: | 480 f = repo.vfs.open(_rbcnames, 'ab') |
| 481 f = repo.vfs.open(_rbcnames, 'ab') | 481 if f.tell() == self._rbcsnameslen: |
| 482 if f.tell() == self._rbcsnameslen: | 482 f.write('\0') |
| 483 f.write('\0') | 483 else: |
| 484 else: | 484 f.close() |
| 485 f.close() | 485 repo.ui.debug("%s changed - rewriting it\n" % _rbcnames) |
| 486 repo.ui.debug("%s changed - rewriting it\n" | 486 self._rbcnamescount = 0 |
| 487 % _rbcnames) | 487 self._rbcrevslen = 0 |
| 488 self._rbcnamescount = 0 | 488 if self._rbcnamescount == 0: |
| 489 self._rbcrevslen = 0 | 489 # before rewriting names, make sure references are removed |
| 490 if self._rbcnamescount == 0: | 490 repo.vfs.unlinkpath(_rbcrevs, ignoremissing=True) |
| 491 # before rewriting names, make sure references are | 491 f = repo.vfs.open(_rbcnames, 'wb') |
| 492 # removed | 492 f.write('\0'.join(encoding.fromlocal(b) |
| 493 repo.vfs.unlinkpath(_rbcrevs, ignoremissing=True) | 493 for b in self._names[self._rbcnamescount:])) |
| 494 f = repo.vfs.open(_rbcnames, 'wb') | 494 self._rbcsnameslen = f.tell() |
| 495 f.write('\0'.join(encoding.fromlocal(b) | 495 f.close() |
| 496 for b in self._names[self._rbcnamescount:] | |
| 497 )) | |
| 498 self._rbcsnameslen = f.tell() | |
| 499 f.close() | |
| 500 self._rbcnamescount = len(self._names) | 496 self._rbcnamescount = len(self._names) |
| 501 | 497 |
| 502 start = self._rbcrevslen * _rbcrecsize | 498 start = self._rbcrevslen * _rbcrecsize |
| 503 if start != len(self._rbcrevs): | 499 if start != len(self._rbcrevs): |
| 504 step = '' | 500 step = '' |
| 505 if wlock is None: | 501 if wlock is None: |
| 506 wlock = repo.wlock(wait=False) | 502 wlock = repo.wlock(wait=False) |
| 507 revs = min(len(repo.changelog), | 503 revs = min(len(repo.changelog), |
| 508 len(self._rbcrevs) // _rbcrecsize) | 504 len(self._rbcrevs) // _rbcrecsize) |
| 509 if True: | 505 f = repo.vfs.open(_rbcrevs, 'ab') |
| 510 f = repo.vfs.open(_rbcrevs, 'ab') | 506 if f.tell() != start: |
| 507 repo.ui.debug("truncating %s to %s\n" % (_rbcrevs, start)) | |
| 508 f.seek(start) | |
| 511 if f.tell() != start: | 509 if f.tell() != start: |
| 512 repo.ui.debug("truncating %s to %s\n" | 510 start = 0 |
| 513 % (_rbcrevs, start)) | |
| 514 f.seek(start) | 511 f.seek(start) |
| 515 if f.tell() != start: | 512 f.truncate() |
| 516 start = 0 | 513 end = revs * _rbcrecsize |
| 517 f.seek(start) | 514 f.write(self._rbcrevs[start:end]) |
| 518 f.truncate() | 515 f.close() |
| 519 end = revs * _rbcrecsize | |
| 520 f.write(self._rbcrevs[start:end]) | |
| 521 f.close() | |
| 522 self._rbcrevslen = revs | 516 self._rbcrevslen = revs |
| 523 except (IOError, OSError, error.Abort, error.LockError) as inst: | 517 except (IOError, OSError, error.Abort, error.LockError) as inst: |
| 524 repo.ui.debug("couldn't write revision branch cache%s: %s\n" | 518 repo.ui.debug("couldn't write revision branch cache%s: %s\n" |
| 525 % (step, inst)) | 519 % (step, inst)) |
| 526 finally: | 520 finally: |