Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 5053:47a8ea1eb2c3
del transaction before lock before wlock
This way rollbacks happen while the repo is still locked.
Deleting lock before wlock is not strictly necessary, but is
more consistent with the locking order.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Thu, 02 Aug 2007 01:56:08 -0300 |
| parents | 49059086c634 |
| children | 2ffe3e2a1ac2 |
comparison
equal
deleted
inserted
replaced
| 5052:a11e8a181bd5 | 5053:47a8ea1eb2c3 |
|---|---|
| 542 self.invalidate() | 542 self.invalidate() |
| 543 self.dirstate.invalidate() | 543 self.dirstate.invalidate() |
| 544 else: | 544 else: |
| 545 self.ui.warn(_("no rollback information available\n")) | 545 self.ui.warn(_("no rollback information available\n")) |
| 546 finally: | 546 finally: |
| 547 del wlock, lock | 547 del lock, wlock |
| 548 | 548 |
| 549 def invalidate(self): | 549 def invalidate(self): |
| 550 for a in "changelog manifest".split(): | 550 for a in "changelog manifest".split(): |
| 551 if hasattr(self, a): | 551 if hasattr(self, a): |
| 552 self.__delattr__(a) | 552 self.__delattr__(a) |
| 818 self.dirstate.forget(f) | 818 self.dirstate.forget(f) |
| 819 | 819 |
| 820 self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) | 820 self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) |
| 821 return n | 821 return n |
| 822 finally: | 822 finally: |
| 823 del lock, wlock, tr | 823 del tr, lock, wlock |
| 824 | 824 |
| 825 def walk(self, node=None, files=[], match=util.always, badmatch=None): | 825 def walk(self, node=None, files=[], match=util.always, badmatch=None): |
| 826 ''' | 826 ''' |
| 827 walk recursively through the directory tree or a given | 827 walk recursively through the directory tree or a given |
| 828 changeset, finding all files matched by the match | 828 changeset, finding all files matched by the match |