When possible, lets avoid recomputing the same information again.
This is part of a larger refactoring/cleanup of the commitctx code to clarify
and augment the logic gathering metadata useful for copy tracing. The current
code is a tad too long and entangled to make such update easy. We start with
easy and small cleanup.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| mctx = m1ctx.copy() | mctx = m1ctx.copy() | ||||
| m = mctx.read() | m = mctx.read() | ||||
| m1 = m1ctx.read() | m1 = m1ctx.read() | ||||
| m2 = m2ctx.read() | m2 = m2ctx.read() | ||||
| # check in files | # check in files | ||||
| added = [] | added = [] | ||||
| filesadded = [] | |||||
| changed = [] | changed = [] | ||||
| removed = list(ctx.removed()) | removed = list(ctx.removed()) | ||||
| linkrev = len(self) | linkrev = len(self) | ||||
| self.ui.note(_(b"committing files:\n")) | self.ui.note(_(b"committing files:\n")) | ||||
| uipathfn = scmutil.getuipathfn(self) | uipathfn = scmutil.getuipathfn(self) | ||||
| for f in sorted(ctx.modified() + ctx.added()): | for f in sorted(ctx.modified() + ctx.added()): | ||||
| self.ui.note(uipathfn(f) + b"\n") | self.ui.note(uipathfn(f) + b"\n") | ||||
| try: | try: | ||||
| fctx = ctx[f] | fctx = ctx[f] | ||||
| if fctx is None: | if fctx is None: | ||||
| removed.append(f) | removed.append(f) | ||||
| else: | else: | ||||
| added.append(f) | added.append(f) | ||||
| m[f], is_touched = self._filecommit( | m[f], is_touched = self._filecommit( | ||||
| fctx, m1, m2, linkrev, trp, writefilecopymeta, | fctx, m1, m2, linkrev, trp, writefilecopymeta, | ||||
| ) | ) | ||||
| if is_touched: | if is_touched: | ||||
| changed.append(f) | changed.append(f) | ||||
| if writechangesetcopy and is_touched == 'added': | |||||
| filesadded.append(f) | |||||
| m.setflag(f, fctx.flags()) | m.setflag(f, fctx.flags()) | ||||
| except OSError: | except OSError: | ||||
| self.ui.warn( | self.ui.warn( | ||||
| _(b"trouble committing %s!\n") % uipathfn(f) | _(b"trouble committing %s!\n") % uipathfn(f) | ||||
| ) | ) | ||||
| raise | raise | ||||
| except IOError as inst: | except IOError as inst: | ||||
| errcode = getattr(inst, 'errno', errno.ENOENT) | errcode = getattr(inst, 'errno', errno.ENOENT) | ||||
| p1.manifestnode(), | p1.manifestnode(), | ||||
| p2.manifestnode(), | p2.manifestnode(), | ||||
| added, | added, | ||||
| drop, | drop, | ||||
| match=self.narrowmatch(), | match=self.narrowmatch(), | ||||
| ) | ) | ||||
| if writechangesetcopy: | if writechangesetcopy: | ||||
| filesadded = [ | |||||
| f for f in changed if not (f in m1 or f in m2) | |||||
| ] | |||||
| filesremoved = removed | filesremoved = removed | ||||
| else: | else: | ||||
| self.ui.debug( | self.ui.debug( | ||||
| b'reusing manifest from p1 (listed files ' | b'reusing manifest from p1 (listed files ' | ||||
| b'actually unchanged)\n' | b'actually unchanged)\n' | ||||
| ) | ) | ||||
| mn = p1.manifestnode() | mn = p1.manifestnode() | ||||
| else: | else: | ||||