Mercurial > hg
view tests/test-encoding.t @ 32697:19b9fc40cc51
revlog: skeleton support for version 2 revlogs
There are a number of improvements we want to make to revlogs
that will require a new version - version 2. It is unclear what the
full set of improvements will be or when we'll be done with them.
What I do know is that the process will likely take longer than a
single release, will require input from various stakeholders to
evaluate changes, and will have many contentious debates and
bikeshedding.
It is unrealistic to develop revlog version 2 up front: there
are just too many uncertainties that we won't know until things
are implemented and experiments are run. Some changes will also
be invasive and prone to bit rot, so sitting on dozens of patches
is not practical.
This commit introduces skeleton support for version 2 revlogs in
a way that is flexible and not bound by backwards compatibility
concerns.
An experimental repo requirement for denoting revlog v2 has been
added. The requirement string has a sub-version component to it.
This will allow us to declare multiple requirements in the course
of developing revlog v2. Whenever we change the in-development
revlog v2 format, we can tweak the string, creating a new
requirement and locking out old clients. This will allow us to
make as many backwards incompatible changes and experiments to
revlog v2 as we want. In other words, we can land code and make
meaningful progress towards revlog v2 while still maintaining
extreme format flexibility up until the point we freeze the
format and remove the experimental labels.
To enable the new repo requirement, you must supply an experimental
and undocumented config option. But not just any boolean flag
will do: you need to explicitly use a value that no sane person
should ever type. This is an additional guard against enabling
revlog v2 on an installation it shouldn't be enabled on. The
specific scenario I'm trying to prevent is say a user with a
4.4 client with a frozen format enabling the option but then
downgrading to 4.3 and accidentally creating repos with an
outdated and unsupported repo format. Requiring a "challenge"
string should prevent this.
Because the format is not yet finalized and I don't want to take
any chances, revlog v2's version is currently 0xDEAD. I figure
squatting on a value we're likely never to use as an actual revlog
version to mean "internal testing only" is acceptable. And
"dead" is easily recognized as something meaningful.
There is a bunch of cleanup that is needed before work on revlog
v2 begins in earnest. I plan on doing that work once this patch
is accepted and we're comfortable with the idea of starting down
this path.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 19 May 2017 20:29:11 -0700 |
parents | 51fa43a3cd58 |
children | 8e6f4939a69a |
line wrap: on
line source
Test character encoding $ hg init t $ cd t we need a repo with some legacy latin-1 changesets $ hg unbundle "$TESTDIR/bundles/legacy-encoding.hg" adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (run 'hg update' to get a working copy) $ hg co 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ python << EOF > f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close() > f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close() > f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close() > EOF should fail with encoding error $ echo "plain old ascii" > a $ hg st M a ? latin-1 ? latin-1-tag ? utf-8 $ HGENCODING=ascii hg ci -l latin-1 transaction abort! rollback completed abort: decoding near ' encoded: \xe9': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! (esc) [255] these should work $ echo "latin-1" > a $ HGENCODING=latin-1 hg ci -l latin-1 $ echo "utf-8" > a $ HGENCODING=utf-8 hg ci -l utf-8 $ HGENCODING=latin-1 hg tag `cat latin-1-tag` $ HGENCODING=latin-1 hg branch `cat latin-1-tag` marked working directory as branch \xe9 (esc) (branches are permanent and global, did you want a bookmark?) $ HGENCODING=latin-1 hg ci -m 'latin1 branch' $ hg -q rollback $ HGENCODING=latin-1 hg branch \xe9 (esc) $ HGENCODING=latin-1 hg ci -m 'latin1 branch' $ rm .hg/branch hg log (ascii) $ hg --encoding ascii log changeset: 5:a52c0692f24a branch: ? tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin1 branch changeset: 4:94db611b4196 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added tag ? for changeset ca661e7520de changeset: 3:ca661e7520de tag: ? user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: utf-8 e' encoded: ? changeset: 2:650c6f3d55dd user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin-1 e' encoded: ? changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': ? = u'\xe9' hg log (latin-1) $ hg --encoding latin-1 log changeset: 5:a52c0692f24a branch: \xe9 (esc) tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin1 branch changeset: 4:94db611b4196 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added tag \xe9 for changeset ca661e7520de (esc) changeset: 3:ca661e7520de tag: \xe9 (esc) user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: utf-8 e' encoded: \xe9 (esc) changeset: 2:650c6f3d55dd user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin-1 e' encoded: \xe9 (esc) changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: \xd2\xd4\xd5\xd4\xd8 = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': \xe9 = u'\\xe9' (esc) hg log (utf-8) $ hg --encoding utf-8 log changeset: 5:a52c0692f24a branch: \xc3\xa9 (esc) tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin1 branch changeset: 4:94db611b4196 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added tag \xc3\xa9 for changeset ca661e7520de (esc) changeset: 3:ca661e7520de tag: \xc3\xa9 (esc) user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: utf-8 e' encoded: \xc3\xa9 (esc) changeset: 2:650c6f3d55dd user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin-1 e' encoded: \xc3\xa9 (esc) changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: \xc3\x92\xc3\x94\xc3\x95\xc3\x94\xc3\x98 = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': \xc3\xa9 = u'\\xe9' (esc) hg tags (ascii) $ HGENCODING=ascii hg tags tip 5:a52c0692f24a ? 3:ca661e7520de hg tags (latin-1) $ HGENCODING=latin-1 hg tags tip 5:a52c0692f24a \xe9 3:ca661e7520de (esc) hg tags (utf-8) $ HGENCODING=utf-8 hg tags tip 5:a52c0692f24a \xc3\xa9 3:ca661e7520de (esc) hg tags (JSON) $ hg tags -Tjson [ { "node": "a52c0692f24ad921c0a31e1736e7635a8b23b670", "rev": 5, "tag": "tip", "type": "" }, { "node": "ca661e7520dec3f5438a63590c350bebadb04989", "rev": 3, "tag": "\xc3\xa9", (esc) "type": "" } ] hg branches (ascii) $ HGENCODING=ascii hg branches ? 5:a52c0692f24a default 4:94db611b4196 (inactive) hg branches (latin-1) $ HGENCODING=latin-1 hg branches \xe9 5:a52c0692f24a (esc) default 4:94db611b4196 (inactive) hg branches (utf-8) $ HGENCODING=utf-8 hg branches \xc3\xa9 5:a52c0692f24a (esc) default 4:94db611b4196 (inactive) $ echo '[ui]' >> .hg/hgrc $ echo 'fallbackencoding = koi8-r' >> .hg/hgrc hg log (utf-8) $ HGENCODING=utf-8 hg log changeset: 5:a52c0692f24a branch: \xc3\xa9 (esc) tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin1 branch changeset: 4:94db611b4196 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added tag \xc3\xa9 for changeset ca661e7520de (esc) changeset: 3:ca661e7520de tag: \xc3\xa9 (esc) user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: utf-8 e' encoded: \xc3\xa9 (esc) changeset: 2:650c6f3d55dd user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: latin-1 e' encoded: \xc3\xa9 (esc) changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: \xd1\x80\xd1\x82\xd1\x83\xd1\x82\xd1\x8c = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': \xd0\x98 = u'\\xe9' (esc) hg log (dolphin) $ HGENCODING=dolphin hg log abort: unknown encoding: dolphin (please check your locale settings) [255] $ HGENCODING=ascii hg branch `cat latin-1-tag` abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc) [255] $ cp latin-1-tag .hg/branch $ HGENCODING=latin-1 hg ci -m 'auto-promote legacy name' Test roundtrip encoding of lookup tables when not using UTF-8 (issue2763) $ HGENCODING=latin-1 hg up `cat latin-1-tag` 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cd .. Test roundtrip encoding/decoding of utf8b for generated data #if hypothesis >>> from hypothesishelpers import * >>> from mercurial import encoding >>> roundtrips(st.binary(), encoding.fromutf8b, encoding.toutf8b) Round trip OK #endif