This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9785

share: rework config options to be much clearer and easier
ClosedPublic

Authored by pulkit on Jan 15 2021, 1:47 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG25be21ec6c65: share: rework config options to be much clearer and easier
rHGcc3452d2dfa4: share: rework config options to be much clearer and easier
Summary

Recently I implemented various boolean configs which control how to behave when
there is a share-safe mismatch between source and share repository. Mismatch
means that source supports share-safe where as share does not or vice versa.

However, while discussion and documentation we realized that it's too
complicated and there are some combinations of values which makes no sense.

We decided to introduce a config option with 4 possible values which
makes controlling and understanding things easier.

The config option share.safe-mismatch.source-{not-}safe can have
following 4 values:

  • abort (default): error out if there is mismatch
  • allow: allow to work with respecting share source configuration
  • {up|down}grade-abort: try to {up|down}grade, if it fails, abort
  • {up|down}grade-allow: try to {up|down}grade, if it fails, continue in allow

mode

I am not sure if I can explain 3 config options which I deleted right now in
just 5 lines which is a sign of how complex they became.

No test changes demonstrate that functionality is same, only names have changed.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jan 15 2021, 1:47 AM
marmoute added a subscriber: marmoute.Jan 15 2021, 5:28 AM
marmoute added inline comments.
mercurial/localrepo.py
597–615

If you have a un-recognised value, you should display it.

629–635

This is a bit weird. I would expect something like:

upgraded = False
if upgrade:
    try:
        upgrade()
    else:
        upgraded = True
    except UpgradeError:
        if upgrade_abort:
            raise Abort(…)
if not upgraded:
    behavior_upgrade()

Am I missing something ?

pulkit added inline comments.Jan 15 2021, 7:09 AM
mercurial/localrepo.py
629–635

That logic lives in upgrade.upgrade_share_to_safe(). We only handle abort case here.

marmoute accepted this revision.Jan 15 2021, 2:45 PM

The code organization is a bit weird as I feel like we should only talk about upgrade for the process of actually touching the file on disk. Otherwise, we are only applying requirements logic.

I would prefer this got clarified a bit, but this is not a strong blocker.

marmoute requested changes to this revision.Jan 18 2021, 4:56 AM

We need a distinct option for upgrading and downgrading. The "risk" associated with each operation is quite different and should be dealt with differently.

This revision now requires changes to proceed.Jan 18 2021, 4:56 AM
pulkit updated this revision to Diff 25116.Jan 18 2021, 10:19 AM
pulkit updated this revision to Diff 25121.Jan 18 2021, 10:41 AM
marmoute added a comment.Jan 18 2021, 10:52 AM

The requested distinction happen as a follow up in D9824. It seems fine to me.

marmoute accepted this revision.Jan 18 2021, 10:59 AM
pulkit retitled this revision from share: collapse 3 different bool configs into one enum config to share: rework config options to be much clearer and easier.Jan 18 2021, 11:12 AM
pulkit edited the summary of this revision. (Show Details)
pulkit updated this revision to Diff 25126.
pulkit mentioned this in D9824: share: make different options for upgrade and downgrade share-safe.Jan 18 2021, 11:13 AM
In D9785#148659, @marmoute wrote:

The requested distinction happen as a follow up in D9824. It seems fine to me.

Folded into one.

marmoute accepted this revision.Jan 18 2021, 11:47 AM
mharbison72 added a subscriber: mharbison72.Jan 18 2021, 8:43 PM
mharbison72 added inline comments.
mercurial/localrepo.py
599

Unrelated to this patch, but maybe we should interpolate requirementsmod.SHARESAFE_REQUIREMENT so this doesn't get forgotten about when renaming the requirement?

mharbison72 accepted this revision.Jan 18 2021, 9:08 PM
This revision is now accepted and ready to land.Jan 18 2021, 9:08 PM

Revision Contents
Changeset List

Diff 25126

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'server.stream-narrow-clones', b'server.stream-narrow-clones',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'sharesafe-auto-downgrade-shares',
default=False,
)
coreconfigitem(
b'experimental',
b'sharesafe-auto-upgrade-shares',
default=False,
)
coreconfigitem(
b'experimental',
b'sharesafe-auto-upgrade-fail-error',
default=False,
)
coreconfigitem(
b'experimental',
b'sharesafe-warn-outdated-shares', b'sharesafe-warn-outdated-shares',
default=True, default=True,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch', b'single-head-per-branch',
default=False, default=False,
) )
default=None, default=None,
) )
coreconfigitem( coreconfigitem(
b'share', b'share',
b'poolnaming', b'poolnaming',
default=b'identity', default=b'identity',
) )
coreconfigitem( coreconfigitem(
b'share',
b'safe-mismatch.source-not-safe',
default=b'abort',
)
coreconfigitem(
b'share',
b'safe-mismatch.source-safe',
default=b'abort',
)
coreconfigitem(
b'shelve', b'shelve',
b'maxbackups', b'maxbackups',
default=10, default=10,
) )
coreconfigitem( coreconfigitem(
b'smtp', b'smtp',
b'host', b'host',
default=None, default=None,

mercurial/helptext/config.txt

Control what happens with empty successors that are the result of rewrite Control what happens with empty successors that are the result of rewrite
operations. If set to ``skip``, the successor is not created. If set to operations. If set to ``skip``, the successor is not created. If set to
``keep``, the empty successor is created and kept. ``keep``, the empty successor is created and kept.
Currently, only the rebase and absorb commands consider this configuration. Currently, only the rebase and absorb commands consider this configuration.
(EXPERIMENTAL) (EXPERIMENTAL)
``share``
---------
``safe-mismatch.source-safe``
Controls what happens when the shared repository does not uses share-safe
mechanism but it source repository does.
Possible values are `abort` (default), `allow`, `upgrade-abort` and
`upgrade-abort`.
`abort`: Disallows running any command and aborts
`allow`: Respects the feature presence in share source
`upgrade-abort`: tries to upgrade the share to use sharesafe
if it fails aborts
`upgrade-allow`: tries to upgrade the share, if it fails continue by
respecting the share source setting
``safe-mismatch.source-not-safe``
Controls what happens when the shared repository uses share-safe mechanism
however it source does not.
Possible values are `abort` (default), `allow`, `downgrade-abort` and
`downgrade-abort`.
`abort`: Disallows running any command and aborts
`allow`: Respects the feature presence in share source
`downgrade-abort`: tries to downgrade the share to not use share-safe
if it fails aborts
`downgrade-allow`: tries to downgrade the share to not use share safe
if it fails continue by respecting the shared
source setting
``storage`` ``storage``
----------- -----------
Control the strategy Mercurial uses internally to store history. Options in this Control the strategy Mercurial uses internally to store history. Options in this
category impact performance and repository size. category impact performance and repository size.
``revlog.optimize-delta-parent-choice`` ``revlog.optimize-delta-parent-choice``
When storing a merge revision, both parents will be equally considered as When storing a merge revision, both parents will be equally considered as

mercurial/localrepo.py

# to be reshared # to be reshared
if requirementsmod.SHARESAFE_REQUIREMENT in requirements: if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
if ( if (
shared shared
and requirementsmod.SHARESAFE_REQUIREMENT and requirementsmod.SHARESAFE_REQUIREMENT
not in _readrequires(sharedvfs, True) not in _readrequires(sharedvfs, True)
): ):
if ui.configbool( mismatch_config = ui.config(
b'experimental', b'sharesafe-auto-downgrade-shares' b'share', b'safe-mismatch.source-not-safe'
)
if mismatch_config in (
b'downgrade-allow',
b'allow',
b'downgrade-abort',
): ):
# prevent cyclic import localrepo -> upgrade -> localrepo # prevent cyclic import localrepo -> upgrade -> localrepo
from . import upgrade from . import upgrade
upgrade.downgrade_share_to_non_safe( upgrade.downgrade_share_to_non_safe(
ui, ui,
hgvfs, hgvfs,
sharedvfs, sharedvfs,
requirements, requirements,
mismatch_config,
) )
else: elif mismatch_config == b'abort':
raise error.Abort( raise error.Abort(
_( _(
b"share source does not support exp-sharesafe requirement" b"share source does not support exp-sharesafe requirement"
mharbison72Unsubmitted
Not Done

Unrelated to this patch, but maybe we should interpolate requirementsmod.SHARESAFE_REQUIREMENT so this doesn't get forgotten about when renaming the requirement?

mharbison72: Unrelated to this patch, but maybe we should interpolate `requirementsmod.
) )
) )
else: else:
hint = _(
"run `hg help config.share.safe-mismatch.source-not-safe`"
)
raise error.Abort(
_(
b"share-safe mismatch with source.\nUnrecognized"
b" value '%s 'of `share.safe-mismatch.source-not-safe`"
b" set."
)
% mismatch_config,
hint=hint,
)
else:
marmouteUnsubmitted
Not Done

If you have a un-recognised value, you should display it.

marmoute: If you have a un-recognised value, you should display it.
requirements |= _readrequires(storevfs, False) requirements |= _readrequires(storevfs, False)
elif shared: elif shared:
sourcerequires = _readrequires(sharedvfs, False) sourcerequires = _readrequires(sharedvfs, False)
if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires: if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-shares'): mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
if mismatch_config in (
b'upgrade-allow',
b'allow',
b'upgrade-abort',
):
# prevent cyclic import localrepo -> upgrade -> localrepo # prevent cyclic import localrepo -> upgrade -> localrepo
from . import upgrade from . import upgrade
upgrade.upgrade_share_to_safe( upgrade.upgrade_share_to_safe(
ui, ui,
hgvfs, hgvfs,
storevfs, storevfs,
requirements, requirements,
mismatch_config,
) )
marmouteUnsubmitted
Not Done

This is a bit weird. I would expect something like:

upgraded = False
if upgrade:
    try:
        upgrade()
    else:
        upgraded = True
    except UpgradeError:
        if upgrade_abort:
            raise Abort(…)
if not upgraded:
    behavior_upgrade()

Am I missing something ?

marmoute: This is a bit weird. I would expect something like: ``` upgraded = False if upgrade: try…
pulkitAuthorUnsubmitted
Done

That logic lives in upgrade.upgrade_share_to_safe(). We only handle abort case here.

pulkit: That logic lives in `upgrade.upgrade_share_to_safe()`. We only handle `abort` case here.
else: elif mismatch_config == b'abort':
raise error.Abort( raise error.Abort(
_( _(
b'version mismatch: source uses share-safe' b'version mismatch: source uses share-safe'
b' functionality while current share does not' b' functionality while current share does not'
) )
) )
else:
hint = _("run `hg help config.share.safe-mismatch.source-safe`")
raise error.Abort(
_(
b"share-safe mismatch with source.\nUnrecognized"
b" value '%s' of `share.safe-mismatch.source-safe` set."
)
% mismatch_config,
hint=hint,
)
# The .hg/hgrc file may load extensions or contain config options # The .hg/hgrc file may load extensions or contain config options
# that influence repository construction. Attempt to load it and # that influence repository construction. Attempt to load it and
# process any new extensions that it may have pulled in. # process any new extensions that it may have pulled in.
if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs): if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
afterhgrcload(ui, wdirvfs, hgvfs, requirements) afterhgrcload(ui, wdirvfs, hgvfs, requirements)
extensions.loadall(ui) extensions.loadall(ui)
extensions.populateui(ui) extensions.populateui(ui)

mercurial/upgrade.py

b'it to free up disk space once the upgraded ' b'it to free up disk space once the upgraded '
b'repository is verified\n' b'repository is verified\n'
) )
) )
upgrade_op.print_post_op_messages() upgrade_op.print_post_op_messages()
def upgrade_share_to_safe(ui, hgvfs, storevfs, current_requirements): def upgrade_share_to_safe(
ui, hgvfs, storevfs, current_requirements, mismatch_config
):
"""Upgrades a share to use share-safe mechanism""" """Upgrades a share to use share-safe mechanism"""
wlock = None wlock = None
store_requirements = localrepo._readrequires(storevfs, False) store_requirements = localrepo._readrequires(storevfs, False)
original_crequirements = current_requirements.copy() original_crequirements = current_requirements.copy()
# after upgrade, store requires will be shared, so lets find # after upgrade, store requires will be shared, so lets find
# the requirements which are not present in store and # the requirements which are not present in store and
# write them to share's .hg/requires # write them to share's .hg/requires
diffrequires = current_requirements - store_requirements diffrequires = current_requirements - store_requirements
# add share-safe requirement as it will mark the share as share-safe # add share-safe requirement as it will mark the share as share-safe
diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT)
current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
# in `allow` case, we don't try to upgrade, we just respect the source
# state, update requirements and continue
if mismatch_config == b'allow':
return
try: try:
wlock = lockmod.trylock(ui, hgvfs, b'wlock', 0, 0) wlock = lockmod.trylock(ui, hgvfs, b'wlock', 0, 0)
# some process might change the requirement in between, re-read # some process might change the requirement in between, re-read
# and update current_requirements # and update current_requirements
locked_requirements = localrepo._readrequires(hgvfs, True) locked_requirements = localrepo._readrequires(hgvfs, True)
if locked_requirements != original_crequirements: if locked_requirements != original_crequirements:
removed = current_requirements - locked_requirements removed = current_requirements - locked_requirements
# update current_requirements in place because it's passed # update current_requirements in place because it's passed
# as reference # as reference
current_requirements -= removed current_requirements -= removed
current_requirements |= locked_requirements current_requirements |= locked_requirements
diffrequires = current_requirements - store_requirements diffrequires = current_requirements - store_requirements
# add share-safe requirement as it will mark the share as share-safe # add share-safe requirement as it will mark the share as share-safe
diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT) diffrequires.add(requirementsmod.SHARESAFE_REQUIREMENT)
current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, diffrequires) scmutil.writerequires(hgvfs, diffrequires)
ui.warn(_(b'repository upgraded to use share-safe mode\n')) ui.warn(_(b'repository upgraded to use share-safe mode\n'))
except error.LockError as e: except error.LockError as e:
if ui.configbool(b'experimental', b'sharesafe-auto-upgrade-fail-error'): if mismatch_config == b'upgrade-abort':
raise error.Abort( raise error.Abort(
_(b'failed to upgrade share, got error: %s') _(b'failed to upgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror) % stringutil.forcebytestr(e.strerror)
) )
elif ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'): elif ui.configbool(b'experimental', b'sharesafe-warn-outdated-shares'):
ui.warn( ui.warn(
_(b'failed to upgrade share, got error: %s\n') _(b'failed to upgrade share, got error: %s\n')
% stringutil.forcebytestr(e.strerror) % stringutil.forcebytestr(e.strerror)
) )
finally: finally:
if wlock: if wlock:
wlock.release() wlock.release()
def downgrade_share_to_non_safe( def downgrade_share_to_non_safe(
ui, ui,
hgvfs, hgvfs,
sharedvfs, sharedvfs,
current_requirements, current_requirements,
mismatch_config,
): ):
"""Downgrades a share which use share-safe to not use it""" """Downgrades a share which use share-safe to not use it"""
wlock = None wlock = None
source_requirements = localrepo._readrequires(sharedvfs, True) source_requirements = localrepo._readrequires(sharedvfs, True)
original_crequirements = current_requirements.copy() original_crequirements = current_requirements.copy()
# we cannot be 100% sure on which requirements were present in store when # we cannot be 100% sure on which requirements were present in store when
# the source supported share-safe. However, we do know that working # the source supported share-safe. However, we do know that working
# directory requirements were not there. Hence we remove them # directory requirements were not there. Hence we remove them
source_requirements -= requirementsmod.WORKING_DIR_REQUIREMENTS source_requirements -= requirementsmod.WORKING_DIR_REQUIREMENTS
current_requirements |= source_requirements current_requirements |= source_requirements
current_requirements.remove(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements.remove(requirementsmod.SHARESAFE_REQUIREMENT)
if mismatch_config == b'allow':
return
try: try:
wlock = lockmod.trylock(ui, hgvfs, b'wlock', 0, 0) wlock = lockmod.trylock(ui, hgvfs, b'wlock', 0, 0)
# some process might change the requirement in between, re-read # some process might change the requirement in between, re-read
# and update current_requirements # and update current_requirements
locked_requirements = localrepo._readrequires(hgvfs, True) locked_requirements = localrepo._readrequires(hgvfs, True)
if locked_requirements != original_crequirements: if locked_requirements != original_crequirements:
removed = current_requirements - locked_requirements removed = current_requirements - locked_requirements
# update current_requirements in place because it's passed # update current_requirements in place because it's passed
# as reference # as reference
current_requirements -= removed current_requirements -= removed
current_requirements |= locked_requirements current_requirements |= locked_requirements
current_requirements |= source_requirements current_requirements |= source_requirements
current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT) current_requirements -= set(requirementsmod.SHARESAFE_REQUIREMENT)
scmutil.writerequires(hgvfs, current_requirements) scmutil.writerequires(hgvfs, current_requirements)
ui.warn(_(b'repository downgraded to not use share-safe mode\n')) ui.warn(_(b'repository downgraded to not use share-safe mode\n'))
except error.LockError as e: except error.LockError as e:
# raise error right away because if downgrade failed, we cannot load # If upgrade-abort is set, abort when upgrade fails, else let the
# the repository because it does not have complete set of requirements # process continue as `upgrade-allow` is set
if mismatch_config == b'downgrade-abort':
raise error.Abort( raise error.Abort(
_(b'failed to downgrade share, got error: %s') _(b'failed to downgrade share, got error: %s')
% stringutil.forcebytestr(e.strerror) % stringutil.forcebytestr(e.strerror)
) )
finally: finally:
if wlock: if wlock:
wlock.release() wlock.release()

tests/test-share-safe.t

@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Make sure existing shares dont work with default config Make sure existing shares dont work with default config
$ hg log -GT "{node}: {desc}\n" -R ../nss-share $ hg log -GT "{node}: {desc}\n" -R ../nss-share
abort: version mismatch: source use share-safe functionality while current share does not abort: version mismatch: source uses share-safe functionality while current share does not
[255] [255]
Create a safe share from upgrade one Create a safe share from upgrade one
$ cd .. $ cd ..
$ hg share non-share-safe ss-share $ hg share non-share-safe ss-share
updating working directory updating working directory
$ hg log -GT "{node}: {desc}\n" -R ../ss-share $ hg log -GT "{node}: {desc}\n" -R ../ss-share
abort: share source does not support exp-sharesafe requirement abort: share source does not support exp-sharesafe requirement
[255] [255]
Testing automatic downgrade of shares when config is set Testing automatic downgrade of shares when config is set
$ touch ../ss-share/.hg/wlock $ touch ../ss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../ss-share --config experimental.sharesafe-auto-downgrade-shares=true $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort
abort: failed to downgrade share, got error: Lock held abort: failed to downgrade share, got error: Lock held
[255] [255]
$ rm ../ss-share/.hg/wlock $ rm ../ss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../ss-share --config experimental.sharesafe-auto-downgrade-shares=true $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort
repository downgraded to not use share-safe mode repository downgraded to not use share-safe mode
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg log -GT "{node}: {desc}\n" -R ../ss-share $ hg log -GT "{node}: {desc}\n" -R ../ss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
dotencode dotencode
exp-sharesafe exp-sharesafe
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ hg log -GT "{node}: {desc}\n" -R ../nss-share $ hg log -GT "{node}: {desc}\n" -R ../nss-share
abort: version mismatch: source use share-safe functionality while current share does not abort: version mismatch: source uses share-safe functionality while current share does not
[255] [255]
Check that if lock is taken, upgrade fails but read operation are successful Check that if lock is taken, upgrade fails but read operation are successful
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgra
abort: share-safe mismatch with source.
Unrecognized value 'upgra' of `share.safe-mismatch.source-safe` set.
(run `hg help config.share.safe-mismatch.source-safe`)
[255]
$ touch ../nss-share/.hg/wlock $ touch ../nss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-allow
failed to upgrade share, got error: Lock held failed to upgrade share, got error: Lock held
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true --config experimental.sharesafe-warn-outdated-shares=false $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-allow --config experimental.sharesafe-warn-outdated-shares=false
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true --config experimental.sharesafe-auto-upgrade-fail-error=true $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-abort
abort: failed to upgrade share, got error: Lock held abort: failed to upgrade share, got error: Lock held
[255] [255]
$ rm ../nss-share/.hg/wlock $ rm ../nss-share/.hg/wlock
$ hg log -GT "{node}: {desc}\n" -R ../nss-share --config experimental.sharesafe-auto-upgrade-shares=true $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-abort
repository upgraded to use share-safe mode repository upgraded to use share-safe mode
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo
Test that unshare works Test that unshare works
$ hg unshare -R ../nss-share $ hg unshare -R ../nss-share
$ hg log -GT "{node}: {desc}\n" -R ../nss-share $ hg log -GT "{node}: {desc}\n" -R ../nss-share
@ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar
| |
o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo