equal
deleted
inserted
replaced
303 hgvfs, |
303 hgvfs, |
304 storevfs, |
304 storevfs, |
305 current_requirements, |
305 current_requirements, |
306 mismatch_config, |
306 mismatch_config, |
307 mismatch_warn, |
307 mismatch_warn, |
|
308 mismatch_verbose_upgrade, |
308 ): |
309 ): |
309 """Upgrades a share to use share-safe mechanism""" |
310 """Upgrades a share to use share-safe mechanism""" |
310 wlock = None |
311 wlock = None |
311 store_requirements = localrepo._readrequires(storevfs, False) |
312 store_requirements = localrepo._readrequires(storevfs, False) |
312 original_crequirements = current_requirements.copy() |
313 original_crequirements = current_requirements.copy() |
335 diffrequires = current_requirements - store_requirements |
336 diffrequires = current_requirements - store_requirements |
336 # add share-safe requirement as it will mark the share as share-safe |
337 # add share-safe requirement as it will mark the share as share-safe |
337 diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) |
338 diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) |
338 current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
339 current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
339 scmutil.writerequires(hgvfs, diffrequires) |
340 scmutil.writerequires(hgvfs, diffrequires) |
340 ui.warn(_(b'repository upgraded to use share-safe mode\n')) |
341 if mismatch_verbose_upgrade: |
|
342 ui.warn(_(b'repository upgraded to use share-safe mode\n')) |
341 except error.LockError as e: |
343 except error.LockError as e: |
342 hint = _( |
344 hint = _( |
343 b"see `hg help config.format.use-share-safe` for more information" |
345 b"see `hg help config.format.use-share-safe` for more information" |
344 ) |
346 ) |
345 if mismatch_config == b'upgrade-abort': |
347 if mismatch_config == b'upgrade-abort': |
364 hgvfs, |
366 hgvfs, |
365 sharedvfs, |
367 sharedvfs, |
366 current_requirements, |
368 current_requirements, |
367 mismatch_config, |
369 mismatch_config, |
368 mismatch_warn, |
370 mismatch_warn, |
|
371 mismatch_verbose_upgrade, |
369 ): |
372 ): |
370 """Downgrades a share which use share-safe to not use it""" |
373 """Downgrades a share which use share-safe to not use it""" |
371 wlock = None |
374 wlock = None |
372 source_requirements = localrepo._readrequires(sharedvfs, True) |
375 source_requirements = localrepo._readrequires(sharedvfs, True) |
373 original_crequirements = current_requirements.copy() |
376 original_crequirements = current_requirements.copy() |
392 current_requirements -= removed |
395 current_requirements -= removed |
393 current_requirements |= locked_requirements |
396 current_requirements |= locked_requirements |
394 current_requirements |= source_requirements |
397 current_requirements |= source_requirements |
395 current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT) |
398 current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT) |
396 scmutil.writerequires(hgvfs, current_requirements) |
399 scmutil.writerequires(hgvfs, current_requirements) |
397 ui.warn(_(b'repository downgraded to not use share-safe mode\n')) |
400 if mismatch_verbose_upgrade: |
|
401 ui.warn(_(b'repository downgraded to not use share-safe mode\n')) |
398 except error.LockError as e: |
402 except error.LockError as e: |
399 hint = _( |
403 hint = _( |
400 b"see `hg help config.format.use-share-safe` for more information" |
404 b"see `hg help config.format.use-share-safe` for more information" |
401 ) |
405 ) |
402 # If upgrade-abort is set, abort when upgrade fails, else let the |
406 # If upgrade-abort is set, abort when upgrade fails, else let the |