equal
deleted
inserted
replaced
65 |
65 |
66 with repo.lock(), repo.transaction(b"commit") as tr: |
66 with repo.lock(), repo.transaction(b"commit") as tr: |
67 r = _prepare_files(tr, ctx, error=error, origctx=origctx) |
67 r = _prepare_files(tr, ctx, error=error, origctx=origctx) |
68 mn, files, p1copies, p2copies, filesadded, filesremoved = r |
68 mn, files, p1copies, p2copies, filesadded, filesremoved = r |
69 |
69 |
|
70 extra = ctx.extra().copy() |
|
71 |
70 # update changelog |
72 # update changelog |
71 repo.ui.note(_(b"committing changelog\n")) |
73 repo.ui.note(_(b"committing changelog\n")) |
72 repo.changelog.delayupdate(tr) |
74 repo.changelog.delayupdate(tr) |
73 n = repo.changelog.add( |
75 n = repo.changelog.add( |
74 mn, |
76 mn, |
77 tr, |
79 tr, |
78 p1.node(), |
80 p1.node(), |
79 p2.node(), |
81 p2.node(), |
80 user, |
82 user, |
81 ctx.date(), |
83 ctx.date(), |
82 ctx.extra().copy(), |
84 extra, |
83 p1copies, |
85 p1copies, |
84 p2copies, |
86 p2copies, |
85 filesadded, |
87 filesadded, |
86 filesremoved, |
88 filesremoved, |
87 ) |
89 ) |