Mercurial > hg
changeset 32559:c8c9feffbd35
copies: rename m1 to msrc
Small refactoring that renames `m1` parameter name to a more clearer name
`msrc`.
| author | Stanislau Hlebik <stash@fb.com> |
|---|---|
| date | Mon, 29 May 2017 05:52:15 -0700 |
| parents | aa91085cadf3 |
| children | 931b7707179f |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Fri May 26 13:27:21 2017 -0700 +++ b/mercurial/copies.py Mon May 29 05:52:15 2017 -0700 @@ -598,13 +598,13 @@ except StopIteration: return False -def _checkcopies(ctx, f, m1, m2, base, tca, remotebase, limit, data): +def _checkcopies(ctx, f, msrc, m2, base, tca, remotebase, limit, data): """ - check possible copies of f from m1 to m2 + check possible copies of f from msrc to m2 - ctx = starting context for f in m1 - f = the filename to check (as in m1) - m1 = the source manifest + ctx = starting context for f in msrc + f = the filename to check (as in msrc) + msrc = the source manifest m2 = the destination manifest base = the changectx used as a merge base tca = topological common ancestor for graft-like scenarios @@ -632,13 +632,13 @@ backwards = not remotebase and base != tca and f in mb getfctx = _makegetfctx(ctx) - if m1[f] == mb.get(f) and not remotebase: + if msrc[f] == mb.get(f) and not remotebase: # Nothing to merge return of = None seen = {f} - for oc in getfctx(f, m1[f]).ancestors(): + for oc in getfctx(f, msrc[f]).ancestors(): ocr = oc.linkrev() of = oc.path() if of in seen: