Mercurial > hgsubversion
view tests/fixtures/renametagdir.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 | d380e7e4175a |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: b3e24de6-f874-406f-9561-e48db081ff5e Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-01-20T12:58:05.107637Z PROPS-END Revision-number: 1 Prop-content-length: 104 Content-length: 104 K 7 svn:log V 3 btt K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:06.111903Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 110 Content-length: 110 K 7 svn:log V 9 Add file. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:07.088858Z PROPS-END Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Revision-number: 3 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 Branch. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:10.062719Z PROPS-END Node-path: branches/test Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 First tag. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.060717Z PROPS-END Node-path: tags/test-0.1 Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: branches/test Revision-number: 5 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 Weird tag. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.110400Z PROPS-END Node-path: tags/test-0.1/test Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: branches/test Revision-number: 6 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Fix tag pt 1. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.169328Z PROPS-END Node-path: tags/test-0.1/test Node-action: delete Node-path: tags/test-0.1-real Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: tags/test-0.1/test Revision-number: 7 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Remove weird. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.212355Z PROPS-END Node-path: tags/test-0.1 Node-action: delete Revision-number: 8 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Fix tag pt 2. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.317421Z PROPS-END Node-path: tags/test-0.1 Node-kind: dir Node-action: add Node-copyfrom-rev: 7 Node-copyfrom-path: tags/test-0.1-real Node-path: tags/test-0.1-real Node-action: delete