Show More
@@ -172,12 +172,12 b" coreconfigitem('experimental', 'changegr" | |||||
172 | coreconfigitem('experimental', 'clientcompressionengines', |
|
172 | coreconfigitem('experimental', 'clientcompressionengines', | |
173 | default=list, |
|
173 | default=list, | |
174 | ) |
|
174 | ) | |
|
175 | coreconfigitem('experimental', 'copytrace', | |||
|
176 | default='on', | |||
|
177 | ) | |||
175 | coreconfigitem('experimental', 'crecordtest', |
|
178 | coreconfigitem('experimental', 'crecordtest', | |
176 | default=None, |
|
179 | default=None, | |
177 | ) |
|
180 | ) | |
178 | coreconfigitem('experimental', 'disablecopytrace', |
|
|||
179 | default=False, |
|
|||
180 | ) |
|
|||
181 | coreconfigitem('experimental', 'editortmpinhg', |
|
181 | coreconfigitem('experimental', 'editortmpinhg', | |
182 | default=False, |
|
182 | default=False, | |
183 | ) |
|
183 | ) |
@@ -203,7 +203,7 b' def _forwardcopies(a, b, match=None):' | |||||
203 | return cm |
|
203 | return cm | |
204 |
|
204 | |||
205 | def _backwardrenames(a, b): |
|
205 | def _backwardrenames(a, b): | |
206 |
if a._repo.ui.config |
|
206 | if a._repo.ui.config('experimental', 'copytrace') == 'off': | |
207 | return {} |
|
207 | return {} | |
208 |
|
208 | |||
209 | # Even though we're not taking copies into account, 1:n rename situations |
|
209 | # Even though we're not taking copies into account, 1:n rename situations | |
@@ -363,7 +363,7 b' def mergecopies(repo, c1, c2, base):' | |||||
363 | # Copy trace disabling is explicitly below the node == p1 logic above |
|
363 | # Copy trace disabling is explicitly below the node == p1 logic above | |
364 | # because the logic above is required for a simple copy to be kept across a |
|
364 | # because the logic above is required for a simple copy to be kept across a | |
365 | # rebase. |
|
365 | # rebase. | |
366 |
if repo.ui.config |
|
366 | if repo.ui.config('experimental', 'copytrace') == 'off': | |
367 | return {}, {}, {}, {}, {} |
|
367 | return {}, {}, {}, {}, {} | |
368 |
|
368 | |||
369 | # In certain scenarios (e.g. graft, update or rebase), base can be |
|
369 | # In certain scenarios (e.g. graft, update or rebase), base can be | |
@@ -728,8 +728,8 b' def duplicatecopies(repo, rev, fromrev, ' | |||||
728 | ''' |
|
728 | ''' | |
729 | exclude = {} |
|
729 | exclude = {} | |
730 | if (skiprev is not None and |
|
730 | if (skiprev is not None and | |
731 |
|
|
731 | repo.ui.config('experimental', 'copytrace') != 'off'): | |
732 |
# |
|
732 | # copytrace='off' skips this line, but not the entire function because | |
733 | # the line below is O(size of the repo) during a rebase, while the rest |
|
733 | # the line below is O(size of the repo) during a rebase, while the rest | |
734 | # of the function is much faster (and is required for carrying copy |
|
734 | # of the function is much faster (and is required for carrying copy | |
735 | # metadata across the rebase anyway). |
|
735 | # metadata across the rebase anyway). |
@@ -81,7 +81,7 b' Test disabling copy tracing' | |||||
81 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
82 | saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) |
|
82 | saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) | |
83 | $ hg up -qC 2 |
|
83 | $ hg up -qC 2 | |
84 |
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental. |
|
84 | $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF | |
85 | > c |
|
85 | > c | |
86 | > EOF |
|
86 | > EOF | |
87 | rebasing 2:add3f11052fa "other" (tip) |
|
87 | rebasing 2:add3f11052fa "other" (tip) | |
@@ -117,7 +117,7 b' Verify disabling copy tracing still keep' | |||||
117 | | |
|
117 | | | |
118 | o 0 add a |
|
118 | o 0 add a | |
119 |
|
119 | |||
120 |
$ hg rebase -d . -b 2 --config extensions.rebase= --config experimental. |
|
120 | $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.copytrace=off | |
121 | rebasing 2:6adcf8c12e7d "copy b->x" |
|
121 | rebasing 2:6adcf8c12e7d "copy b->x" | |
122 | saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) |
|
122 | saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) | |
123 | $ hg up -q 3 |
|
123 | $ hg up -q 3 | |
@@ -150,7 +150,7 b' Verify we duplicate existing copies, ins' | |||||
150 | |/ |
|
150 | |/ | |
151 | o 0 add a |
|
151 | o 0 add a | |
152 |
|
152 | |||
153 |
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental. |
|
153 | $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off | |
154 | rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) |
|
154 | rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) | |
155 | saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) |
|
155 | saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) | |
156 |
|
156 |
General Comments 0
You need to be logged in to leave comments.
Login now