Mercurial > hgsubversion
view tests/fixtures/ignores.svndump @ 1550:67b28d657f62
sqliterevmap: break ".hashes()" cycle in a safer way
The `fromsvn()` revset implementation could cause weakref error when using
sqliterevmap like:
File "hgsubversion/util.py", line 357, in <lambda>
return subset.filter(lambda r: tonode(r) in hashes)
File "hgsubversion/maps.py", line 542, in __contains__
return self.get(key) != None
File "hgsubversion/maps.py", line 533, in get
for row in self.revmap._query(
ReferenceError: weakly-referenced object no longer exists
Basically the seemingly harmless assignment could break surprisingly:
# dangerous: `hashes` does not have a reference of `meta.revmap` and may
# become unavailable after `meta`, `revmap` being released by refcount.
hashes = meta.revmap.hashes()
The above syntax is nice to support while avoiding cycles is also nice.
This patch removes `revmap._hashes` so the revmap no longer owns a reference
of a `ReverseRevMap` object so the `ReverseRevMap` object no longer needs to
use weakref for `self.revmap`.
This could actually be caught by `comprehensive/test_sqlite_revmap.py`.
I was not careful enough verifying the "fromsvn()" patch.
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Thu, 21 Dec 2017 17:39:52 -0800 |
| parents | 91db8fc049b0 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 8ad10f29-7a81-4fb6-a789-b0b0ade2ec54 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-02-24T20:04:33.977054Z PROPS-END Revision-number: 1 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 11 Add a file. K 10 svn:author V 5 durin K 8 svn:date V 27 2009-02-24T20:05:12.825468Z PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/bar Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 4 Text-content-md5: d3b07384d113edec49eaa6238ad5ff00 Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 Content-length: 14 PROPS-END foo Revision-number: 2 Prop-content-length: 105 Content-length: 105 K 7 svn:log V 6 ignore K 10 svn:author V 5 durin K 8 svn:date V 27 2009-02-24T20:05:49.334191Z PROPS-END Node-path: trunk Node-kind: dir Node-action: change Prop-content-length: 47 Content-length: 47 K 10 svn:ignore V 15 blah otherblah PROPS-END Revision-number: 3 Prop-content-length: 124 Content-length: 124 K 7 svn:log V 24 another file and ignore. K 10 svn:author V 5 durin K 8 svn:date V 27 2009-02-24T20:07:13.884019Z PROPS-END Node-path: trunk/baz Node-kind: dir Node-action: add Prop-content-length: 37 Content-length: 37 K 10 svn:ignore V 6 magic PROPS-END Node-path: trunk/baz/xyzzy Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 89d447eb9afaeb94e463615e8ded6479 Text-content-sha1: 9b3802ecbad114267dd0d1a431e57b0bca95930a Content-length: 16 PROPS-END xyzzy