Re: [PATCH 4 of 4] mergecopies: rename 'ca' to 'base'

[Yuya Nishihara]

On Sun, 16 Oct 2016 16:47:23 +0200, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David 
> # Date 1476315014 -7200
> #  Thu Oct 13 01:30:14 2016 +0200
> # Node ID b8bb58f87a94f5b78beaa1db710c5ef69967dd4c
> # Parent  6f0dc570c4383ad42c572158af200d2142bbef4f
> # EXP-Topic checkcopies
> mergecopies: rename 'ca' to 'base'

LGTM. Queued the series, thanks.

> diff --git a/mercurial/copies.py b/mercurial/copies.py
> --- a/mercurial/copies.py
> +++ b/mercurial/copies.py
> @@ -285,14 +285,14 @@ def _makegetfctx(ctx):
>  return fctx
>  return util.lrucachefunc(makectx)
>  
> -def mergecopies(repo, c1, c2, ca):
> +def mergecopies(repo, c1, c2, base):
>  """
>  Find moves and copies between context c1 and c2 that are relevant
> -for merging.
> +for merging. 'base' will be used as the merge base.
>  
>  Returns four dicts: "copy", "movewithdir", "diverge", and
>  "renamedelete".
> -
> +`

Removed this garbage character. I wiped my screen physically, but it never
disappeared.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 4 of 4] mergecopies: rename 'ca' to 'base'

[Pierre-Yves David]

# HG changeset patch
# User Pierre-Yves David 
# Date 1476315014 -7200
#  Thu Oct 13 01:30:14 2016 +0200
# Node ID b8bb58f87a94f5b78beaa1db710c5ef69967dd4c
# Parent  6f0dc570c4383ad42c572158af200d2142bbef4f
# EXP-Topic checkcopies
mergecopies: rename 'ca' to 'base'

This variable was named after the common ancestor. It is actually the merge
base that might differ from the common ancestor in the graft case. We rename the
variable before a larger refactoring to clarify the situation. Similar rename
was also applied to 'checkcopies' in a prior changeset.

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -285,14 +285,14 @@ def _makegetfctx(ctx):
 return fctx
 return util.lrucachefunc(makectx)
 
-def mergecopies(repo, c1, c2, ca):
+def mergecopies(repo, c1, c2, base):
 """
 Find moves and copies between context c1 and c2 that are relevant
-for merging.
+for merging. 'base' will be used as the merge base.
 
 Returns four dicts: "copy", "movewithdir", "diverge", and
 "renamedelete".
-
+`
 "copy" is a mapping from destination name -> source name,
 where source is in c1 and destination is in c2 or vice-versa.
 
@@ -329,7 +329,7 @@ def mergecopies(repo, c1, c2, ca):
 
 m1 = c1.manifest()
 m2 = c2.manifest()
-ma = ca.manifest()
+mb = base.manifest()
 
 # gather data from _checkcopies:
 # - diverge = record all diverges in this dict
@@ -346,17 +346,17 @@ def mergecopies(repo, c1, c2, ca):
 }
 
 # find interesting file sets from manifests
-addedinm1 = m1.filesnotin(ma)
-addedinm2 = m2.filesnotin(ma)
+addedinm1 = m1.filesnotin(mb)
+addedinm2 = m2.filesnotin(mb)
 u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
 u1u, u2u = u1r, u2r
 bothnew = sorted(addedinm1 & addedinm2)
 
 for f in u1u:
-_checkcopies(c1, f, m1, m2, ca, limit, data1)
+_checkcopies(c1, f, m1, m2, base, limit, data1)
 
 for f in u2u:
-_checkcopies(c2, f, m2, m1, ca, limit, data2)
+_checkcopies(c2, f, m2, m1, base, limit, data2)
 
 copy = dict(data1['copy'].items() + data2['copy'].items())
 fullcopy = dict(data1['fullcopy'].items() + data2['fullcopy'].items())
@@ -384,8 +384,8 @@ def mergecopies(repo, c1, c2, ca):
 'diverge': bothdiverge,
}
 for f in bothnew:
-_checkcopies(c1, f, m1, m2, ca, limit, bothdata)
-_checkcopies(c2, f, m2, m1, ca, limit, bothdata)
+_checkcopies(c1, f, m1, m2, base, limit, bothdata)
+_checkcopies(c2, f, m2, m1, base, limit, bothdata)
 for of, fl in bothdiverge.items():
 if len(fl) == 2 and fl[0] == fl[1]:
 copy[fl[0]] = of # not actually divergent, just matching renames
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel