Pulkit Goyal <pulkit@yandex-team.ru> [Sun, 23 Sep 2018 23:35:38 +0300] rev 39788
py3: use '%d' for integers instead of '%s'
Python 3 does not allow using "%s" for integers.
This makes the test works on Python 3. The test still does not pass because
there is a deprecation warning.
Differential Revision: https://phab.mercurial-scm.org/D4696
Pulkit Goyal <pulkit@yandex-team.ru> [Sun, 23 Sep 2018 23:34:22 +0300] rev 39787
py3: add b'' prefixes in tests/test-bdiff.py
This makes the test close to passing
# skip-blame because just b'' prefixes
Differential Revision: https://phab.mercurial-scm.org/D4695
Pulkit Goyal <pulkit@yandex-team.ru> [Sun, 23 Sep 2018 22:57:17 +0300] rev 39786
py3: fix kwargs handling in hgext/absorb.py
This fixes couple of tests on Python 3. There is only one absorb test left
failing on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D4694
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 19:26:44 -0700] rev 39785
filelog: stop proxying headrevs() (API)
The previous commit removed the last user of this method. It is
redundant with heads() and adds little to no value other than
convenience. Let's nuke it.
Differential Revision: https://phab.mercurial-scm.org/D4663
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 19:00:17 -0700] rev 39784
hgweb: use heads() instead of headrevs()
These appear to be the only callers of headrevs() on file storage
objects. Let's port to heads() so we can remove headrevs().
Differential Revision: https://phab.mercurial-scm.org/D4662
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 18:56:02 -0700] rev 39783
filelog: record what's using attributes
filelog and the file storage interface have some attributes that
ideally shouldn't be there. This commit annotates some of those
attributes with their users so we know where to look when it comes
time to removing them.
This exercise exposed a theme: many attributes are used by LFS,
repo upgrade, verify, and special repo types (like bundlerepo). That
points to missing abstractions on file storage to facilitate these
special needs.
Differential Revision: https://phab.mercurial-scm.org/D4661
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 18:21:47 -0700] rev 39782
filelog: stop proxying datafile (API)
It appears the censor code was the last user of this proxy. With
there being a dedicated censor API, we can drop the proxy.
Differential Revision: https://phab.mercurial-scm.org/D4660
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 18:03:41 -0700] rev 39781
filelog: stop proxying _addrevision() (API)
There are no callers of this API in core. And I'm not sure why this
proxy was added in the first place, as the commit that added it
(
1541e1a8e87d) didn't appear to have any callers in the repo either.
Who knows.
Differential Revision: https://phab.mercurial-scm.org/D4659
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 17:57:36 -0700] rev 39780
filelog: stop proxying compress() (API)
The censoring code was previously relying on this. With a dedicated
censoring API on the interface, no consumers are left and we can
stop proxying this method.
Differential Revision: https://phab.mercurial-scm.org/D4658
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 17:56:15 -0700] rev 39779
filelog: stop proxying start(), end(), and length() (API)
These were needed by the censoring code, which formerly lived in the
censor extension. Now that there is a censoring API on the file storage
interface, nothing uses these methods and we can stop proxying them.
Differential Revision: https://phab.mercurial-scm.org/D4657
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 17:51:43 -0700] rev 39778
revlog: move censor logic out of censor extension
The censor extension is doing very low-level things with revlogs.
It is fundamentally impossible for this logic to remain in the censor
extension while support multiple storage backends: we need each
storage backend to implement censor in its own storage-specific
way.
This commit effectively moves the revlog-specific censoring code to
be a method of revlogs themselves.
We've defined a new API on the file storage interface for censoring
an individual node. Even though the current censoring code doesn't
use it, the API requires a transaction instance because it logically
makes sense for storage backends to require an active transaction
(which implies a held write lock) in order to rewrite storage.
After this commit, the censor extension has been reduced to
boilerplate precondition checking before invoking the generic
storage API.
I tried to keep the code as similar as possible. But some minor
changes were made:
* We use self._io instead of instantiating a new revlogio instance.
* We compare self.version against REVLOGV0 instead of != REVLOGV1
because presumably all future revlog versions will support censoring.
* We use self.opener instead of going through repo.svfs (we don't have
a handle on the repo instance from a revlog).
* "revlog" dropped
* Replace "flog" with "self".
Differential Revision: https://phab.mercurial-scm.org/D4656
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:47:09 -0700] rev 39777
global: replace most uses of RevlogError with StorageError (API)
When catching errors in storage, we should be catching
StorageError instead of RevlogError. When throwing errors related
to storage, we shouldn't be using RevlogError unless we know
the error stemmed from revlogs. And we only reliably know that
if we're in revlog.py or are inheriting from a type defined in
revlog.py.
Differential Revision: https://phab.mercurial-scm.org/D4655
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:45:13 -0700] rev 39776
error: introduce StorageError
Errors in revlogs are often represented by RevlogError. It's fine
for revlogs to raise a revlog-specific exception. But in the context
of multiple storage backends, it doesn't make sense to be throwing or
catching an exception with "revlog" in its name when revlogs may not
even be in play.
This commit introduces a new generic StorageError type for representing
errors in the storage layer.
RevlogError is an instance of this type.
Interface documentation and tests referencing RevlogError has been
updated to specify StorageError should be used.
.. api::
``error.StorageError`` has been introduced to represent errors in
storage. It should be used in place of ``error.RevlogError`` unless
the error is known to come from a revlog.
Differential Revision: https://phab.mercurial-scm.org/D4654
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:28:17 -0700] rev 39775
revlog: drop LookupError alias (API)
This alias is especially bad because it shadows the built-in
LookupError type. This has caused me confusion in the past
when reading revlog code. Qualifying all uses with "error." will
make it obvious that we're using a Mercurial error type.
Differential Revision: https://phab.mercurial-scm.org/D4653
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:24:36 -0700] rev 39774
revlog: drop some more error aliases (API)
These should be lightly used and I doubt that will be any
strong objections to removing the aliases.
Note that some uses of ProgrammingError in this file use
translated messages. I'm pretty sure that's a bug. But the
linters don't complain, so meh.
Differential Revision: https://phab.mercurial-scm.org/D4652
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:18:37 -0700] rev 39773
revlog: drop RevlogError alias (API)
error.RevlogError was moved from revlog.py in
08cabecfa8a8 in
2009. revlog.RevlogError has remained as an alias ever since.
Let's drop the alias and use error.RevlogError directly.
Differential Revision: https://phab.mercurial-scm.org/D4651
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 16:52:11 -0700] rev 39772
testing: add interface unit tests for file storage
Our strategy for supporting alternate storage backends is to define
interfaces for everything then "code to the interface."
We already have interfaces for various primitives, including file
and manifest storage.
What we don't have is generic unit tests for those interfaces. Up
to this point we've been relying on high-level integration tests
(mainly in the form of existing .t tests) to test alternate storage
backends. And my experience with developing the "simple store" test
extension is that such testing is very tedious: it takes several
minutes to run all tests and when you find a failure, it is often
non-trivial to debug.
This commit starts to change that.
This commit introduces the mercurial.testing.storage module. It
contains testing code for storage. Currently, it defines some
unittest.TestCase classes for testing the file storage interfaces.
It also defines some factory functions that allow a caller to easily
spawn a custom TestCase "bound" to a specific file storage backend
implementation.
A new .py test has been added. It simply defines a callable to produce
filelog and transaction instances on demand and then "registers" the
various test classes so the filelog class can be tested with the
storage interface unit tests.
As part of writing the tests, I identified a couple of apparent
bugs in revlog.py and filelog.py! These are tracked with inline
TODO comments.
Writing the tests makes it more obvious where the storage interface
is lacking. For example, we raise either IndexError or
error.LookupError for missing revisions depending on whether we
use an integer revision or a node. Also, we raise error.RevlogError
in various places when we should be raising a storage-agnostic
error type.
The storage interfaces are currently far from perfect and there is much
work to be done to improve them. But at least with this commit we
finally have the start of unit tests that can be used to "qualify"
the behavior of a storage backend. And when implementing and debugging
new storage backends, we now have an obvious place to define new
tests and have obvious places to insert breakpoints to facilitate
debugging. This should be invaluable when implementing new storage
backends.
I added the mercurial.testing package because these interface
conformance tests are generic and need to be usable by all storage
backends. Having the code live in tests/ would make it difficult for
storage backends implemented in extensions to test their interface
conformance. First, it would require obtaining a copy of Mercurial's
storage test code in order to test. Second, it would make testing
against multiple Mercurial versions difficult, as you would need to
import N copies of the storage testing code in order to achieve test
coverage. By making the test code part of the Mercurial distribution
itself, extensions can `import mercurial.testing.*` to access and run
the test code. The test will run against whatever Mercurial version
is active.
FWIW I've always wanted to move parts of run-tests.py into the
mercurial.* package to make the testing story simpler (e.g. imagine an
`hg debugruntests` command that could invoke the test harness). While I
have no plans to do that in the near future, establishing the
mercurial.testing package does provide a natural home for that code
should someone do this in the future.
Differential Revision: https://phab.mercurial-scm.org/D4650
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 18 Sep 2018 15:32:11 -0700] rev 39771
narrow: remove narrowrevlog
Core now automatically enables ellipsis support on revlogs when
repositories have narrow enabled. So, we no longer need to globally
register the revlog flag as part of activating the narrow extension
and this code can be deleted.
A side effect of this change is that repositories will now raise an
error on encountering an ellipsis flag when the narrow extension is
loaded. Previously, loading the narrow extension on a non-narrow repo
could result in silent usage of the ellipsis flag. This could lead
to undetected bugs. I think the new behavior is more correct.
Differential Revision: https://phab.mercurial-scm.org/D4649
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 13 Sep 2018 15:57:18 -0700] rev 39770
localrepo: enable ellipsis flag on revlogs when repo is narrow
If the narrow requirement is present, revlogs created for that
repository will have the ellipsis flag enabled.
This is the same behavior that the narrow extension exhibits. Except
the ellipsis flag won't be enabled on repos/revlogs that don't have
the narrow requirement.
Differential Revision: https://phab.mercurial-scm.org/D4648
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 13 Sep 2018 15:52:42 -0700] rev 39769
revlog: add opener option to enable ellipsis flag processor
The ellipsis flag processor can now be registered by specifying
an opener option when constructing a revlog instance. This allows
us to enable ellipsis flags on a per-revlog basis.
Differential Revision: https://phab.mercurial-scm.org/D4647
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 13 Sep 2018 15:48:53 -0700] rev 39768
revlog: store flag processors per revlog
Previously, revlog flag processing would consult a global dict
when processing flags. This was simple. But it had the undesired
side-effect that any extension could load flag processors once
and those flag processors would be available to any revlog that was
subsequent loaded in the process. e.g. in hgweb, if the narrow
extension were loaded for repo A but not repo B, repo B would be
able to decode ellipsis flags even though it shouldn't be able to.
Making the flag processors dict per-revlog allows us to have per-revlog
controls over what flag processors are available, thus preserving
desired granular access to flag processors depending on the revlog's
needs.
If a flag processor is globally registered, it is still globally
available. So this commit should not meaningfully change behavior.
Differential Revision: https://phab.mercurial-scm.org/D4646
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 05 Sep 2018 13:29:22 -0700] rev 39767
revlog: define ellipsis flag processors in core
We will soon be teaching core to honor the ellipsis flag on revlogs.
Moving the definition of the processor functions to core is the first
step in this.
The processor is still not registered unless the narrow extension is
loaded.
Differential Revision: https://phab.mercurial-scm.org/D4645
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 05 Sep 2018 12:44:25 -0700] rev 39766
narrow: remove custom filelog type
This functionality is now handled by core as of the previous commit.
I wanted this to be a standalone commit because the deleted code
makes a reference to remotefilelog's file type missing a node() method
and this may have implications to narrow+remotefilelog usage. The code
in core doesn't perform this check and therefore behavior may be subtly
different and buggy.
But I /think/ the check is merely a performance optimization and
nothing more. So I'm optimistic this will continue to "just work."
Differential Revision: https://phab.mercurial-scm.org/D4644
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 13 Sep 2018 16:02:22 -0700] rev 39765
filelog: custom filelog to be used with narrow repos
Narrow repos may have file revisions whose copy/rename metadata
references files not in the store. This can pose problems when
consumers attempt to access a missing referenced file revision.
The narrow extension hacks around this problem by implementing a
derived filelog type that provides custom implementations of
renamed(), size(), and cmp() which handle renames against files not
in the narrow spec by silently removing the rename metadata.
While silently dropping metadata isn't the most robust solution,
it is the easiest to implement.
This commit ports the custom narrow filelog class to core.
When a narrow repo is constructed, its ifilestorage creation
function will automatically use the new filelog type. This means
the extra logic is 0 cost for non-narrow repos and shouldn't
interfere with their operation.
Differential Revision: https://phab.mercurial-scm.org/D4643