##// END OF EJS Templates
delta-find: rename `delta-reuse-policy` to `pulled-delta-reuse-policy`...
marmoute -
r51102:f35cf52a default
parent child Browse files
Show More
@@ -1881,7 +1881,7 b' coreconfigitem('
1881 )
1881 )
1882 coreconfigitem(
1882 coreconfigitem(
1883 b'paths',
1883 b'paths',
1884 b'.*:delta-reuse-policy',
1884 b'.*:pulled-delta-reuse-policy',
1885 default=None,
1885 default=None,
1886 generic=True,
1886 generic=True,
1887 )
1887 )
@@ -1924,7 +1924,7 b' The following sub-options can be defined'
1924
1924
1925 .. container:: verbose
1925 .. container:: verbose
1926
1926
1927 ``delta-reuse-policy``
1927 ``pulled-delta-reuse-policy``
1928 Control the policy regarding deltas sent by the remote during pulls.
1928 Control the policy regarding deltas sent by the remote during pulls.
1929
1929
1930 This is an advanced option that non-admin users should not need to understand
1930 This is an advanced option that non-admin users should not need to understand
@@ -742,14 +742,16 b' DELTA_REUSE_POLICIES = {'
742 }
742 }
743
743
744
744
745 @pathsuboption(b'delta-reuse-policy', b'delta_reuse_policy')
745 @pathsuboption(b'pulled-delta-reuse-policy', b'delta_reuse_policy')
746 def delta_reuse_policy(ui, path, value):
746 def delta_reuse_policy(ui, path, value):
747 if value not in DELTA_REUSE_POLICIES:
747 if value not in DELTA_REUSE_POLICIES:
748 path_name = path.name
748 path_name = path.name
749 if path_name is None:
749 if path_name is None:
750 # this is an "anonymous" path, config comes from the global one
750 # this is an "anonymous" path, config comes from the global one
751 path_name = b'*'
751 path_name = b'*'
752 msg = _(b'(paths.%s:delta-reuse-policy has unknown value: "%s")\n')
752 msg = _(
753 b'(paths.%s:pulled-delta-reuse-policy has unknown value: "%s")\n'
754 )
753 msg %= (path_name, value)
755 msg %= (path_name, value)
754 ui.warn(msg)
756 ui.warn(msg)
755 return DELTA_REUSE_POLICIES.get(value)
757 return DELTA_REUSE_POLICIES.get(value)
@@ -193,7 +193,7 b' against the "best" parent. (so not the s'
193 \s*1200 (re)
193 \s*1200 (re)
194
194
195
195
196 Check the path.*:delta-reuse-policy option
196 Check the path.*:pulled-delta-reuse-policy option
197 ==========================================
197 ==========================================
198
198
199 Get a repository with the bad parent picked and a clone ready to pull the merge
199 Get a repository with the bad parent picked and a clone ready to pull the merge
@@ -234,7 +234,7 b' Pull with explicitly the default'
234 default is to reuse the (bad) delta
234 default is to reuse the (bad) delta
235
235
236 $ cp -ar local-pre-pull local-default
236 $ cp -ar local-pre-pull local-default
237 $ hg -R local-default pull --quiet --config 'paths.default:delta-reuse-policy=default'
237 $ hg -R local-default pull --quiet --config 'paths.default:pulled-delta-reuse-policy=default'
238 DBG-DELTAS: CHANGELOG: * (glob)
238 DBG-DELTAS: CHANGELOG: * (glob)
239 DBG-DELTAS: MANIFESTLOG: * (glob)
239 DBG-DELTAS: MANIFESTLOG: * (glob)
240 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
240 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
@@ -245,7 +245,7 b' Pull with no-reuse'
245 We don't reuse the base, so we get a better delta
245 We don't reuse the base, so we get a better delta
246
246
247 $ cp -ar local-pre-pull local-no-reuse
247 $ cp -ar local-pre-pull local-no-reuse
248 $ hg -R local-no-reuse pull --quiet --config 'paths.default:delta-reuse-policy=no-reuse'
248 $ hg -R local-no-reuse pull --quiet --config 'paths.default:pulled-delta-reuse-policy=no-reuse'
249 DBG-DELTAS: CHANGELOG: * (glob)
249 DBG-DELTAS: CHANGELOG: * (glob)
250 DBG-DELTAS: MANIFESTLOG: * (glob)
250 DBG-DELTAS: MANIFESTLOG: * (glob)
251 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=1 * (glob)
251 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=1 * (glob)
@@ -256,7 +256,7 b' Pull with try-base'
256 We requested to use the (bad) delta
256 We requested to use the (bad) delta
257
257
258 $ cp -ar local-pre-pull local-try-base
258 $ cp -ar local-pre-pull local-try-base
259 $ hg -R local-try-base pull --quiet --config 'paths.default:delta-reuse-policy=try-base'
259 $ hg -R local-try-base pull --quiet --config 'paths.default:pulled-delta-reuse-policy=try-base'
260 DBG-DELTAS: CHANGELOG: * (glob)
260 DBG-DELTAS: CHANGELOG: * (glob)
261 DBG-DELTAS: MANIFESTLOG: * (glob)
261 DBG-DELTAS: MANIFESTLOG: * (glob)
262 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
262 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
@@ -288,7 +288,7 b' snapshot again.'
288
288
289 $ cp -ar local-pre-pull-full local-try-base-full
289 $ cp -ar local-pre-pull-full local-try-base-full
290 $ hg -R local-try-base-full pull --quiet \
290 $ hg -R local-try-base-full pull --quiet \
291 > --config 'paths.default:delta-reuse-policy=try-base'
291 > --config 'paths.default:pulled-delta-reuse-policy=try-base'
292 DBG-DELTAS: CHANGELOG: * (glob)
292 DBG-DELTAS: CHANGELOG: * (glob)
293 DBG-DELTAS: CHANGELOG: * (glob)
293 DBG-DELTAS: CHANGELOG: * (glob)
294 DBG-DELTAS: MANIFESTLOG: * (glob)
294 DBG-DELTAS: MANIFESTLOG: * (glob)
@@ -303,7 +303,7 b' A full bundle should be accepted as full'
303
303
304 $ cp -ar local-pre-pull-full local-forced-full
304 $ cp -ar local-pre-pull-full local-forced-full
305 $ hg -R local-forced-full pull --quiet \
305 $ hg -R local-forced-full pull --quiet \
306 > --config 'paths.default:delta-reuse-policy=forced'
306 > --config 'paths.default:pulled-delta-reuse-policy=forced'
307 DBG-DELTAS: CHANGELOG: * (glob)
307 DBG-DELTAS: CHANGELOG: * (glob)
308 DBG-DELTAS: CHANGELOG: * (glob)
308 DBG-DELTAS: CHANGELOG: * (glob)
309 DBG-DELTAS: MANIFESTLOG: * (glob)
309 DBG-DELTAS: MANIFESTLOG: * (glob)
@@ -324,7 +324,7 b' more subtle to test this behavior.'
324 5 changesets found
324 5 changesets found
325 $ cp -ar local-pre-pull-full local-forced-full-p1
325 $ cp -ar local-pre-pull-full local-forced-full-p1
326 $ hg -R local-forced-full-p1 pull --quiet \
326 $ hg -R local-forced-full-p1 pull --quiet \
327 > --config 'paths.*:delta-reuse-policy=forced' all-p1.hg
327 > --config 'paths.*:pulled-delta-reuse-policy=forced' all-p1.hg
328 DBG-DELTAS: CHANGELOG: * (glob)
328 DBG-DELTAS: CHANGELOG: * (glob)
329 DBG-DELTAS: CHANGELOG: * (glob)
329 DBG-DELTAS: CHANGELOG: * (glob)
330 DBG-DELTAS: MANIFESTLOG: * (glob)
330 DBG-DELTAS: MANIFESTLOG: * (glob)
General Comments 0
You need to be logged in to leave comments. Login now