This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9045

tests: update test-share-safe to work with non-zstd versions
ClosedPublic

Authored by pulkit on Sep 18 2020, 8:08 AM.

Details

Reviewers
indygreg
marmoute
Group Reviewers
hg-reviewers
Commits
rHG68906595016c: tests: update test-share-safe to work with non-zstd versions
Summary

zstd is not available always like pure py versions. Hence we wrap that part
around #if zstd. To make sure the functionality is tested on pure version
as well, I have added another requirement addition test.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 18 2020, 8:08 AM
indygreg requested changes to this revision.Sep 22 2020, 9:24 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
tests/test-share-safe.t
175

There is an #if zstd check that should be used instead.

This revision now requires changes to proceed.Sep 22 2020, 9:24 PM
pulkit retitled this revision from tests: update test-share-safe to work with pure-python versions to tests: update test-share-safe to work with non-zstd versions.Sep 23 2020, 3:22 AM
pulkit edited the summary of this revision. (Show Details)
pulkit updated this revision to Diff 22771.
marmoute accepted this revision.Sep 23 2020, 7:32 AM
marmoute added a subscriber: marmoute.

This looks fine

pulkit added a commit: rHG68906595016c: tests: update test-share-safe to work with non-zstd versions.Sep 23 2020, 11:37 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG68906595016c: tests: update test-share-safe to work with non-zstd versions (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-share-safe.t (30 lines)

Diff 22802

tests/test-share-safe.t

hooks.pretxnchangegroup.reject_merge_commits=python:hgext.hooklib.reject_merge_commits.hook hooks.pretxnchangegroup.reject_merge_commits=python:hgext.hooklib.reject_merge_commits.hook
$ hg showconfig hooks --config extensions.untrusted=$TESTTMP/untrusted.py $ hg showconfig hooks --config extensions.untrusted=$TESTTMP/untrusted.py
[1] [1]
Update the source repository format and check that shared repo works Update the source repository format and check that shared repo works
$ cd ../source $ cd ../source
Disable zstd related tests because its not present on pure version
#if zstd
indygregUnsubmitted
Not Done

There is an #if zstd check that should be used instead.

indygreg: There is an `#if zstd` check that should be used instead.
$ echo "[format]" >> .hg/hgrc $ echo "[format]" >> .hg/hgrc
$ echo "revlog-compression=zstd" >> .hg/hgrc $ echo "revlog-compression=zstd" >> .hg/hgrc
$ hg debugupgraderepo --run -q
upgrade will perform the following actions:
requirements
preserved: dotencode, exp-sharesafe, fncache, generaldelta, revlogv1, 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
#endif
$ echo "[format]" >> .hg/hgrc
$ echo "use-persistent-nodemap=True" >> .hg/hgrc
$ hg debugupgraderepo --run -q -R ../shared1 $ hg debugupgraderepo --run -q -R ../shared1
abort: cannot upgrade repository; unsupported source requirement: shared abort: cannot upgrade repository; unsupported source requirement: shared
[255] [255]
$ hg debugupgraderepo --run -q $ hg debugupgraderepo --run -q
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, exp-sharesafe, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, exp-sharesafe, fncache, generaldelta, revlogv1, sparserevlog, store (no-zstd !)
added: revlog-compression-zstd preserved: dotencode, exp-sharesafe, fncache, generaldelta, revlog-compression-zstd, revlogv1, sparserevlog, store (zstd !)
added: persistent-nodemap
$ hg log -r . $ hg log -r .
changeset: 1:5f6d8a4bf34a changeset: 1:5f6d8a4bf34a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: added b summary: added b
Shared one should work Shared one should work
$ cd ../shared1 $ cd ../shared1
$ hg log -r . $ hg log -r .
changeset: 2:155349b645be changeset: 2:155349b645be
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: added c summary: added c