equal
deleted
inserted
replaced
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: |