##// END OF EJS Templates
commitctx: gather more preparation code within the lock context...
marmoute -
r45796:bd751527 default
parent child Browse files
Show More
@@ -63,14 +63,14 b' def commitctx(repo, ctx, error=False, or'
63 p1, p2 = ctx.p1(), ctx.p2()
63 p1, p2 = ctx.p1(), ctx.p2()
64 user = ctx.user()
64 user = ctx.user()
65
65
66 writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
66 with repo.lock(), repo.transaction(b"commit") as tr:
67 writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
67
68
68 p1copies, p2copies = None, None
69 p1copies, p2copies = None, None
69 if writechangesetcopy:
70 if writechangesetcopy:
70 p1copies = ctx.p1copies()
71 p1copies = ctx.p1copies()
71 p2copies = ctx.p2copies()
72 p2copies = ctx.p2copies()
72 filesadded, filesremoved = None, None
73 filesadded, filesremoved = None, None
73 with repo.lock(), repo.transaction(b"commit") as tr:
74 if ctx.manifestnode():
74 if ctx.manifestnode():
75 # reuse an existing manifest revision
75 # reuse an existing manifest revision
76 repo.ui.debug(b'reusing known manifest\n')
76 repo.ui.debug(b'reusing known manifest\n')
General Comments 0
You need to be logged in to leave comments. Login now