| Mon, 03 Oct 2016 13:29:59 +0200 |
Gábor Stefanik |
copies: don't record divergence for files needing no merge
|
file |
diff |
annotate
|
| Mon, 03 Oct 2016 13:24:56 +0200 |
Gábor Stefanik |
copies: mark checkcopies as internal with the _ prefix
|
file |
diff |
annotate
|
| Mon, 03 Oct 2016 13:23:19 +0200 |
Gábor Stefanik |
copies: split u1/u2 to u1u/u2u and u1r/u2r
|
file |
diff |
annotate
|
| Mon, 03 Oct 2016 13:18:31 +0200 |
Gábor Stefanik |
copies: style fixes and add comment
|
file |
diff |
annotate
|
| Mon, 03 Oct 2016 16:19:55 +0200 |
Gábor Stefanik |
copies: limit is an optimization, and doesn't provide guarantees
|
file |
diff |
annotate
|
| Mon, 16 May 2016 21:30:53 +0000 |
timeless |
py3: convert to next() function
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 13:23:24 -0800 |
Durham Goode |
copies: optimize forward copy detection logic for rebases
|
file |
diff |
annotate
|
| Wed, 13 Jan 2016 10:10:05 -0600 |
Matt Mackall |
copies: fix detection of divergent directory renames
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 15:40:13 -0500 |
Matt Mackall |
copies: group bothnew with other sets
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 15:32:27 -0500 |
Matt Mackall |
copies: rename renamedelete to renamedeleteset for clarity
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 15:26:08 -0500 |
Matt Mackall |
copies: move _makegetfctx calls into checkcopies
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 15:17:33 -0500 |
Matt Mackall |
copies: factor out setupctx into _makegetfctx
|
file |
diff |
annotate
|
| Fri, 21 Aug 2015 15:12:58 -0500 |
Matt Mackall |
copies: avoid reference to c1/c2 in makectx
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 15:11:17 -0500 |
Matt Mackall |
copies: move debug statement to appropriate place
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 14:04:54 -0500 |
Matt Mackall |
copies: rename diverge2 to divergeset for clarity
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 13:40:18 -0500 |
Matt Mackall |
copies: begin separating mergecopies sides
|
file |
diff |
annotate
|
| Wed, 19 Aug 2015 13:09:54 -0500 |
Matt Mackall |
copies: rename ctx() to getfctx() for clarity
|
file |
diff |
annotate
|
| Tue, 27 Jan 2015 11:26:27 -0800 |
Durham Goode |
copy: add flag for disabling copy tracing
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 00:41:13 -0700 |
Gregory Szorc |
copies: use absolute_import
|
file |
diff |
annotate
|
| Tue, 26 May 2015 14:52:47 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 22 May 2015 14:02:04 -0700 |
Martin von Zweigbergk |
copies: document hack for adding '' to set of dirs
|
file |
diff |
annotate
|
| Fri, 22 May 2015 12:58:27 -0700 |
Durham Goode |
copies: switch to using pathutil.dirname
|
file |
diff |
annotate
|
| Tue, 26 May 2015 06:45:18 -0500 |
Matt Mackall |
mergecopies: avoid slowdown from linkrev adjustment (issue4680)
stable
|
file |
diff |
annotate
|
| Thu, 16 Apr 2015 11:29:30 -0700 |
Durham Goode |
copies: add matcher parameter to copy logic
|
file |
diff |
annotate
|
| Fri, 03 Apr 2015 15:18:34 -0700 |
Durham Goode |
copies: pass changectx instead of manifest to _computenonoverlap
|
file |
diff |
annotate
|
| Fri, 20 Mar 2015 17:30:38 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 20 Mar 2015 00:30:35 -0700 |
Pierre-Yves David |
mergecopies: reuse ancestry context when traversing file history (issue4537)
stable
|
file |
diff |
annotate
|
| Tue, 10 Mar 2015 13:56:05 -0700 |
Durham Goode |
copies: added manifests to computenonoverlap
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 14:26:22 -0800 |
Martin von Zweigbergk |
copies: only calculate 'addedinm[12]' sets once
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 14:03:01 -0800 |
Martin von Zweigbergk |
copies: calculate 'bothnew' from manifestdict.filesnotin()
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 14:02:30 -0800 |
Martin von Zweigbergk |
copies: replace _nonoverlap() by calls to manifestdict.filesnotin()
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 13:57:37 -0800 |
Martin von Zweigbergk |
copies: move code into new manifestdict.filesnotin() method
|
file |
diff |
annotate
|
| Tue, 27 Jan 2015 17:24:12 -0800 |
Durham Goode |
copy: move _forwardcopies file logic to a function
|
file |
diff |
annotate
|
| Tue, 27 Jan 2015 17:23:18 -0800 |
Durham Goode |
copy: move mergecopies file logic to a function
|
file |
diff |
annotate
|
| Sun, 01 Feb 2015 16:25:12 -0600 |
Matt Mackall |
copies: use linkrev for file tracing limit
stable
|
file |
diff |
annotate
|
| Fri, 30 Jan 2015 16:02:28 +0000 |
Pierre-Yves David |
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)
stable
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
file |
diff |
annotate
|
| Thu, 16 Oct 2014 06:35:06 -0700 |
Ryan McElroy |
amend: fix amending rename commit with diverged topologies (issue4405)
stable
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 14:33:13 -0500 |
Matt Mackall |
duplicatecopies: move from cmdutil to copies
|
file |
diff |
annotate
|
| Tue, 25 Feb 2014 20:31:53 +0100 |
Mads Kiilerich |
copies: guard debug section with ui.debugflag
|
file |
diff |
annotate
|
| Tue, 25 Feb 2014 20:31:51 +0100 |
Mads Kiilerich |
copies: remove _checkcopies wrapper - it does no good
|
file |
diff |
annotate
|
| Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
diff: search beyond ancestor when detecting renames
|
file |
diff |
annotate
|
| Wed, 01 May 2013 10:44:21 -0700 |
Durham Goode |
copies: refactor checkcopies() into a top level method
|
file |
diff |
annotate
|
| Wed, 10 Apr 2013 15:08:26 -0700 |
Bryan O'Sullivan |
scmutil: use new dirs class in dirstate and context
|
file |
diff |
annotate
|
| Thu, 04 Apr 2013 20:22:29 -0700 |
Siddharth Agarwal |
copies._forwardcopies: use set operations to find missing files
|
file |
diff |
annotate
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
copies: report found copies sorted
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
copies: make the loss in _backwardcopies more stable
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 15:04:07 -0800 |
Siddharth Agarwal |
copies: do not track backward copies, only renames (issue3739)
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 15:03:58 -0800 |
Siddharth Agarwal |
copies: make debug messages more sensible
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 14:50:17 -0800 |
Siddharth Agarwal |
copies: separate moves via directory renames from explicit copies
|
file |
diff |
annotate
|
| Wed, 27 Jun 2012 13:41:04 -0500 |
Matt Mackall |
copies: re-include root directory in directory rename detection (issue3511)
|
file |
diff |
annotate
|
| Wed, 23 May 2012 21:34:29 +0200 |
Thomas Arendsen Hein |
merge: show renamed on one and deleted on the other side in debug output
|
file |
diff |
annotate
|
| Wed, 23 May 2012 20:50:16 +0200 |
Thomas Arendsen Hein |
merge: warn about file deleted in one branch and renamed in other (issue3074)
|
file |
diff |
annotate
|
| Wed, 23 May 2012 17:25:48 +0200 |
Thomas Arendsen Hein |
merge: do not warn about copy and rename in the same transaction (issue2113)
|
file |
diff |
annotate
|
| Sun, 26 Feb 2012 16:45:59 -0600 |
Matt Mackall |
copies: use ctx.dirs() for directory rename detection
|
file |
diff |
annotate
|
| Sun, 26 Feb 2012 15:51:56 -0600 |
Matt Mackall |
copies: fix mergecopies doc mapping direction
|
file |
diff |
annotate
|
| Sat, 25 Feb 2012 14:22:58 -0600 |
Matt Mackall |
copies: remove checkdirs options
|
file |
diff |
annotate
|
| Fri, 24 Feb 2012 18:21:06 -0600 |
Matt Mackall |
copies: add docstring for mergecopies
|
file |
diff |
annotate
|