Show More
@@ -610,7 +610,7 b' class queue(object):' | |||||
610 | try: |
|
610 | try: | |
611 | wlock = repo.wlock() |
|
611 | wlock = repo.wlock() | |
612 | lock = repo.lock() |
|
612 | lock = repo.lock() | |
613 | tr = repo.transaction() |
|
613 | tr = repo.transaction("qpush") | |
614 | try: |
|
614 | try: | |
615 | ret = self._apply(repo, series, list, update_status, |
|
615 | ret = self._apply(repo, series, list, update_status, | |
616 | strict, patchdir, merge, all_files=all_files) |
|
616 | strict, patchdir, merge, all_files=all_files) |
@@ -554,7 +554,7 b' class localrepository(repo.repository):' | |||||
554 | def wwritedata(self, filename, data): |
|
554 | def wwritedata(self, filename, data): | |
555 | return self._filter("decode", filename, data) |
|
555 | return self._filter("decode", filename, data) | |
556 |
|
556 | |||
557 | def transaction(self): |
|
557 | def transaction(self, desc): | |
558 | tr = self._transref and self._transref() or None |
|
558 | tr = self._transref and self._transref() or None | |
559 | if tr and tr.running(): |
|
559 | if tr and tr.running(): | |
560 | return tr.nest() |
|
560 | return tr.nest() | |
@@ -571,10 +571,12 b' class localrepository(repo.repository):' | |||||
571 | ds = "" |
|
571 | ds = "" | |
572 | self.opener("journal.dirstate", "w").write(ds) |
|
572 | self.opener("journal.dirstate", "w").write(ds) | |
573 | self.opener("journal.branch", "w").write(self.dirstate.branch()) |
|
573 | self.opener("journal.branch", "w").write(self.dirstate.branch()) | |
|
574 | self.opener("journal.desc", "w").write("%d,%s" % (len(self), desc)) | |||
574 |
|
575 | |||
575 | renames = [(self.sjoin("journal"), self.sjoin("undo")), |
|
576 | renames = [(self.sjoin("journal"), self.sjoin("undo")), | |
576 | (self.join("journal.dirstate"), self.join("undo.dirstate")), |
|
577 | (self.join("journal.dirstate"), self.join("undo.dirstate")), | |
577 |
(self.join("journal.branch"), self.join("undo.branch")) |
|
578 | (self.join("journal.branch"), self.join("undo.branch")), | |
|
579 | (self.join("journal.desc"), self.join("undo.desc"))] | |||
578 | tr = transaction.transaction(self.ui.warn, self.sopener, |
|
580 | tr = transaction.transaction(self.ui.warn, self.sopener, | |
579 | self.sjoin("journal"), |
|
581 | self.sjoin("journal"), | |
580 | aftertrans(renames), |
|
582 | aftertrans(renames), | |
@@ -890,7 +892,7 b' class localrepository(repo.repository):' | |||||
890 |
|
892 | |||
891 | lock = self.lock() |
|
893 | lock = self.lock() | |
892 | try: |
|
894 | try: | |
893 | tr = self.transaction() |
|
895 | tr = self.transaction("commit") | |
894 | trp = weakref.proxy(tr) |
|
896 | trp = weakref.proxy(tr) | |
895 |
|
897 | |||
896 | # check in files |
|
898 | # check in files | |
@@ -2003,7 +2005,7 b' class localrepository(repo.repository):' | |||||
2003 | cl.delayupdate() |
|
2005 | cl.delayupdate() | |
2004 | oldheads = len(cl.heads()) |
|
2006 | oldheads = len(cl.heads()) | |
2005 |
|
2007 | |||
2006 | tr = self.transaction() |
|
2008 | tr = self.transaction(",".join([srctype, url])) | |
2007 | try: |
|
2009 | try: | |
2008 | trp = weakref.proxy(tr) |
|
2010 | trp = weakref.proxy(tr) | |
2009 | # pull off the changeset group |
|
2011 | # pull off the changeset group |
@@ -114,7 +114,7 b' def strip(ui, repo, node, backup="all"):' | |||||
114 |
|
114 | |||
115 | mfst = repo.manifest |
|
115 | mfst = repo.manifest | |
116 |
|
116 | |||
117 | tr = repo.transaction() |
|
117 | tr = repo.transaction("strip") | |
118 | offset = len(tr.entries) |
|
118 | offset = len(tr.entries) | |
119 |
|
119 | |||
120 | tr.startgroup() |
|
120 | tr.startgroup() |
@@ -54,6 +54,7 b' adding tst.d/foo' | |||||
54 | .hg/requires |
|
54 | .hg/requires | |
55 | .hg/undo |
|
55 | .hg/undo | |
56 | .hg/undo.branch |
|
56 | .hg/undo.branch | |
|
57 | .hg/undo.desc | |||
57 | .hg/undo.dirstate |
|
58 | .hg/undo.dirstate | |
58 | % non fncache repo |
|
59 | % non fncache repo | |
59 | adding tst.d/Foo |
|
60 | adding tst.d/Foo | |
@@ -70,4 +71,5 b' adding tst.d/Foo' | |||||
70 | .hg/store/data/tst.d.hg/_foo.i |
|
71 | .hg/store/data/tst.d.hg/_foo.i | |
71 | .hg/store/undo |
|
72 | .hg/store/undo | |
72 | .hg/undo.branch |
|
73 | .hg/undo.branch | |
|
74 | .hg/undo.desc | |||
73 | .hg/undo.dirstate |
|
75 | .hg/undo.dirstate |
@@ -4,4 +4,4 b' adding changesets' | |||||
4 | transaction abort! |
|
4 | transaction abort! | |
5 | rollback completed |
|
5 | rollback completed | |
6 | killed! |
|
6 | killed! | |
7 | .hg/00changelog.i .hg/journal.branch .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a |
|
7 | .hg/00changelog.i .hg/journal.branch .hg/journal.desc .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a |
@@ -26,6 +26,7 b' 00660 ./.hg/store/data/foo.i' | |||||
26 | 00660 ./.hg/store/fncache |
|
26 | 00660 ./.hg/store/fncache | |
27 | 00660 ./.hg/store/undo |
|
27 | 00660 ./.hg/store/undo | |
28 | 00660 ./.hg/undo.branch |
|
28 | 00660 ./.hg/undo.branch | |
|
29 | 00660 ./.hg/undo.desc | |||
29 | 00660 ./.hg/undo.dirstate |
|
30 | 00660 ./.hg/undo.dirstate | |
30 | 00700 ./dir/ |
|
31 | 00700 ./dir/ | |
31 | 00600 ./dir/bar |
|
32 | 00600 ./dir/bar | |
@@ -54,4 +55,5 b' 00660 ../push/.hg/store/data/foo.i' | |||||
54 | 00660 ../push/.hg/store/fncache |
|
55 | 00660 ../push/.hg/store/fncache | |
55 | 00660 ../push/.hg/store/undo |
|
56 | 00660 ../push/.hg/store/undo | |
56 | 00660 ../push/.hg/undo.branch |
|
57 | 00660 ../push/.hg/undo.branch | |
|
58 | 00660 ../push/.hg/undo.desc | |||
57 | 00660 ../push/.hg/undo.dirstate |
|
59 | 00660 ../push/.hg/undo.dirstate |
General Comments 0
You need to be logged in to leave comments.
Login now