--- a/mercurial/copies.py Fri Nov 27 17:00:00 2020 -0500
+++ b/mercurial/copies.py Fri Nov 27 17:03:29 2020 -0500
@@ -702,7 +702,7 @@
def _isfullcopytraceable(repo, c1, base):
- """ Checks that if base, source and destination are all no-public branches,
+ """Checks that if base, source and destination are all no-public branches,
if yes let's use the full copytrace algorithm for increased capabilities
since it will be fast enough.
@@ -770,14 +770,16 @@
self.movewithdir = {} if movewithdir is None else movewithdir
def __repr__(self):
- return (
- '<branch_copies\n copy=%r\n renamedelete=%r\n dirmove=%r\n movewithdir=%r\n>'
- % (self.copy, self.renamedelete, self.dirmove, self.movewithdir,)
+ return '<branch_copies\n copy=%r\n renamedelete=%r\n dirmove=%r\n movewithdir=%r\n>' % (
+ self.copy,
+ self.renamedelete,
+ self.dirmove,
+ self.movewithdir,
)
def _fullcopytracing(repo, c1, c2, base):
- """ The full copytracing algorithm which finds all the new files that were
+ """The full copytracing algorithm which finds all the new files that were
added from merge base up to the top commit and for each file it checks if
this file was copied from another file.
@@ -967,7 +969,7 @@
def _heuristicscopytracing(repo, c1, c2, base):
- """ Fast copytracing using filename heuristics
+ """Fast copytracing using filename heuristics
Assumes that moves or renames are of following two types: