equal
deleted
inserted
replaced
811 self.wvfs.setflags(filename, False, True) |
811 self.wvfs.setflags(filename, False, True) |
812 |
812 |
813 def wwritedata(self, filename, data): |
813 def wwritedata(self, filename, data): |
814 return self._filter(self._decodefilterpats, filename, data) |
814 return self._filter(self._decodefilterpats, filename, data) |
815 |
815 |
816 def transaction(self, desc): |
816 def transaction(self, desc, report=None): |
817 tr = self._transref and self._transref() or None |
817 tr = self._transref and self._transref() or None |
818 if tr and tr.running(): |
818 if tr and tr.running(): |
819 return tr.nest() |
819 return tr.nest() |
820 |
820 |
821 # abort here if the journal already exists |
821 # abort here if the journal already exists |
823 raise error.RepoError( |
823 raise error.RepoError( |
824 _("abandoned transaction found - run hg recover")) |
824 _("abandoned transaction found - run hg recover")) |
825 |
825 |
826 self._writejournal(desc) |
826 self._writejournal(desc) |
827 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
827 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
828 |
828 rp = report and report or self.ui.warn |
829 tr = transaction.transaction(self.ui.warn, self.sopener, |
829 tr = transaction.transaction(rp, self.sopener, |
830 self.sjoin("journal"), |
830 self.sjoin("journal"), |
831 aftertrans(renames), |
831 aftertrans(renames), |
832 self.store.createmode) |
832 self.store.createmode) |
833 self._transref = weakref.ref(tr) |
833 self._transref = weakref.ref(tr) |
834 return tr |
834 return tr |