equal
deleted
inserted
replaced
591 |
591 |
592 def wwritedata(self, filename, data): |
592 def wwritedata(self, filename, data): |
593 return self._filter("decode", filename, data) |
593 return self._filter("decode", filename, data) |
594 |
594 |
595 def transaction(self): |
595 def transaction(self): |
596 if self._transref and self._transref(): |
596 tr = self._transref and self._transref() or None |
597 return self._transref().nest() |
597 if tr and tr.running(): |
|
598 return tr.nest() |
598 |
599 |
599 # abort here if the journal already exists |
600 # abort here if the journal already exists |
600 if os.path.exists(self.sjoin("journal")): |
601 if os.path.exists(self.sjoin("journal")): |
601 raise error.RepoError(_("journal already exists - run hg recover")) |
602 raise error.RepoError(_("journal already exists - run hg recover")) |
602 |
603 |