Mercurial > public > mercurial-scm > hg
comparison mercurial/upgrade.py @ 46239:d159d0fafa78
sharesafe: introduce config to disallow outdated shares if upgrade fails
After this patch, we have config option to control all aspects of shares
when share source is upgraded or downgraded.
Differential Revision: https://phab.mercurial-scm.org/D9692
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 08 Jan 2021 21:47:31 +0530 |
parents | 9796cf108e4e |
children | 17176f64a03d |
comparison
equal
deleted
inserted
replaced
46238:9796cf108e4e | 46239:d159d0fafa78 |
---|---|
255 diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) | 255 diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) |
256 scmutil.writerequires(hgvfs, diffrequires) | 256 scmutil.writerequires(hgvfs, diffrequires) |
257 current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) | 257 current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) |
258 ui.warn(_(b'repository upgraded to use share-safe mode\n')) | 258 ui.warn(_(b'repository upgraded to use share-safe mode\n')) |
259 except error.LockError as e: | 259 except error.LockError as e: |
260 if ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'): | 260 if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-fail-error'): |
261 raise error.Abort( | |
262 _(b'failed to upgrade share, got error: %s') | |
263 % stringutil.forcebytestr(e.strerror) | |
264 ) | |
265 elif ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'): | |
261 ui.warn( | 266 ui.warn( |
262 _(b'failed to upgrade share, got error: %s\n') | 267 _(b'failed to upgrade share, got error: %s\n') |
263 % stringutil.forcebytestr(e.strerror) | 268 % stringutil.forcebytestr(e.strerror) |
264 ) | 269 ) |
265 finally: | 270 finally: |