##// END OF EJS Templates
commitctx: stop using weakref proxy for transaction...
marmoute -
r45788:5d0998cc default
parent child Browse files
Show More
@@ -6,7 +6,6 b''
6 from __future__ import absolute_import
6 from __future__ import absolute_import
7
7
8 import errno
8 import errno
9 import weakref
10
9
11 from .i18n import _
10 from .i18n import _
12 from .node import (
11 from .node import (
@@ -62,8 +61,6 b' def commitctx(repo, ctx, error=False, or'
62 p2copies = ctx.p2copies()
61 p2copies = ctx.p2copies()
63 filesadded, filesremoved = None, None
62 filesadded, filesremoved = None, None
64 with repo.lock(), repo.transaction(b"commit") as tr:
63 with repo.lock(), repo.transaction(b"commit") as tr:
65 trp = weakref.proxy(tr)
66
67 if ctx.manifestnode():
64 if ctx.manifestnode():
68 # reuse an existing manifest revision
65 # reuse an existing manifest revision
69 repo.ui.debug(b'reusing known manifest\n')
66 repo.ui.debug(b'reusing known manifest\n')
@@ -102,7 +99,7 b' def commitctx(repo, ctx, error=False, or'
102 else:
99 else:
103 added.append(f)
100 added.append(f)
104 m[f], is_touched = _filecommit(
101 m[f], is_touched = _filecommit(
105 repo, fctx, m1, m2, linkrev, trp, writefilecopymeta,
102 repo, fctx, m1, m2, linkrev, tr, writefilecopymeta,
106 )
103 )
107 if is_touched:
104 if is_touched:
108 touched.append(f)
105 touched.append(f)
@@ -156,7 +153,7 b' def commitctx(repo, ctx, error=False, or'
156 # case where the merge has files outside of the narrowspec,
153 # case where the merge has files outside of the narrowspec,
157 # so this is safe.
154 # so this is safe.
158 mn = mctx.write(
155 mn = mctx.write(
159 trp,
156 tr,
160 linkrev,
157 linkrev,
161 p1.manifestnode(),
158 p1.manifestnode(),
162 p2.manifestnode(),
159 p2.manifestnode(),
@@ -191,7 +188,7 b' def commitctx(repo, ctx, error=False, or'
191 mn,
188 mn,
192 files,
189 files,
193 ctx.description(),
190 ctx.description(),
194 trp,
191 tr,
195 p1.node(),
192 p1.node(),
196 p2.node(),
193 p2.node(),
197 user,
194 user,
General Comments 0
You need to be logged in to leave comments. Login now