( )⚙ D8660 upgrade: support running upgrade if repository has share-safe requirement

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8660

upgrade: support running upgrade if repository has share-safe requirement
ClosedPublic

Authored by pulkit on Jun 25 2020, 4:54 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHG78f0bb37f52d: upgrade: support running upgrade if repository has share-safe requirement
Summary

This helps us in testing changing requirements of source repository and checking
that the shared repository works.

Diff Detail

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

Event Timeline

pulkit created this revision.Jun 25 2020, 4:54 AM
pulkit updated this revision to Diff 21754.Jul 2 2020, 7:17 AM
marmoute accepted this revision.Jul 15 2020, 2:12 PM
marmoute added a subscriber: marmoute.

Silly question: what happens when debugupdate repo is ran on a share ?

pulkit added a comment.Jul 17 2020, 6:06 AM
In D8660#130732, @marmoute wrote:

Silly question: what happens when debugupdate repo is ran on a share ?

Nice question. We don't support running debugupgraderepo on shared repositories.

pulkit updated this revision to Diff 21979.Jul 20 2020, 8:16 AM
pulkit updated this revision to Diff 22384.Aug 10 2020, 11:29 AM
pulkit updated this revision to Diff 22399.Aug 11 2020, 5:06 AM
indygreg accepted this revision.Sep 17 2020, 9:51 PM
This revision is now accepted and ready to land.Sep 17 2020, 9:51 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (1 line)
Mtests/test-share-safe.t (28 lines)

Diff 21754

mercurial/upgrade.py

b'fncache', b'fncache',
b'generaldelta', b'generaldelta',
b'revlogv1', b'revlogv1',
b'store', b'store',
localrepo.SPARSEREVLOG_REQUIREMENT, localrepo.SPARSEREVLOG_REQUIREMENT,
localrepo.SIDEDATA_REQUIREMENT, localrepo.SIDEDATA_REQUIREMENT,
localrepo.COPIESSDC_REQUIREMENT, localrepo.COPIESSDC_REQUIREMENT,
localrepo.NODEMAP_REQUIREMENT, localrepo.NODEMAP_REQUIREMENT,
localrepo.SHARESAFE_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
if engine.available() and engine.revlogheader(): if engine.available() and engine.revlogheader():
supported.add(b'exp-compression-%s' % name) supported.add(b'exp-compression-%s' % name)
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported

tests/test-share-safe.t

adding manifests adding manifests
adding file changes adding file changes
error: pretxnchangegroup.reject_merge_commits hook failed: bcde3522682d rejected as merge on the same branch. Please consider rebase. error: pretxnchangegroup.reject_merge_commits hook failed: bcde3522682d rejected as merge on the same branch. Please consider rebase.
transaction abort! transaction abort!
rollback completed rollback completed
abort: bcde3522682d rejected as merge on the same branch. Please consider rebase. abort: bcde3522682d rejected as merge on the same branch. Please consider rebase.
[255] [255]
Update the source repository format and check that shared repo works
$ cd ../source
$ echo "[format]" >> .hg/hgrc
$ echo "revlog-compression=zstd" >> .hg/hgrc
$ hg debugupgraderepo --run -q
upgrade will perform the following actions:
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sharesafe, sparserevlog, store
added: revlog-compression-zstd
$ hg log -r .
changeset: 1:5f6d8a4bf34a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added b
Shared one should work
$ cd ../shared1
$ hg log -r .
changeset: 2:155349b645be
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added c
Unsharing works Unsharing works
$ cd ../shared1 $ cd ../shared1
$ hg unshare $ hg unshare