equal
deleted
inserted
replaced
521 def writetags(fp, names, munge, prevtags): |
521 def writetags(fp, names, munge, prevtags): |
522 fp.seek(0, 2) |
522 fp.seek(0, 2) |
523 if prevtags and prevtags[-1] != '\n': |
523 if prevtags and prevtags[-1] != '\n': |
524 fp.write('\n') |
524 fp.write('\n') |
525 for name in names: |
525 for name in names: |
526 m = munge and munge(name) or name |
526 if munge: |
|
527 m = munge(name) |
|
528 else: |
|
529 m = name |
|
530 |
527 if (self._tagscache.tagtypes and |
531 if (self._tagscache.tagtypes and |
528 name in self._tagscache.tagtypes): |
532 name in self._tagscache.tagtypes): |
529 old = self.tags().get(name, nullid) |
533 old = self.tags().get(name, nullid) |
530 fp.write('%s %s\n' % (hex(old), m)) |
534 fp.write('%s %s\n' % (hex(old), m)) |
531 fp.write('%s %s\n' % (hex(node), m)) |
535 fp.write('%s %s\n' % (hex(node), m)) |
891 def wwritedata(self, filename, data): |
895 def wwritedata(self, filename, data): |
892 return self._filter(self._decodefilterpats, filename, data) |
896 return self._filter(self._decodefilterpats, filename, data) |
893 |
897 |
894 def currenttransaction(self): |
898 def currenttransaction(self): |
895 """return the current transaction or None if non exists""" |
899 """return the current transaction or None if non exists""" |
896 tr = self._transref and self._transref() or None |
900 if self._transref: |
|
901 tr = self._transref() |
|
902 else: |
|
903 tr = None |
|
904 |
897 if tr and tr.running(): |
905 if tr and tr.running(): |
898 return tr |
906 return tr |
899 return None |
907 return None |
900 |
908 |
901 def transaction(self, desc, report=None): |
909 def transaction(self, desc, report=None): |
911 |
919 |
912 self.hook('pretxnopen', throw=True, txnname=desc) |
920 self.hook('pretxnopen', throw=True, txnname=desc) |
913 |
921 |
914 self._writejournal(desc) |
922 self._writejournal(desc) |
915 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
923 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
916 rp = report and report or self.ui.warn |
924 if report: |
|
925 rp = report |
|
926 else: |
|
927 rp = self.ui.warn |
917 vfsmap = {'plain': self.vfs} # root of .hg/ |
928 vfsmap = {'plain': self.vfs} # root of .hg/ |
918 # we must avoid cyclic reference between repo and transaction. |
929 # we must avoid cyclic reference between repo and transaction. |
919 reporef = weakref.ref(self) |
930 reporef = weakref.ref(self) |
920 def validate(tr): |
931 def validate(tr): |
921 """will run pre-closing hooks""" |
932 """will run pre-closing hooks""" |