Mercurial > hgsubversion
view tests/fixtures/test_files_copied_from_outside_btt.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 | 496c0354019c |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-10-07T22:49:12.059692Z PROPS-END Revision-number: 1 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 11 Empty dirs. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T22:49:41.118037Z 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: 108 Content-length: 108 K 7 svn:log V 9 Add alpha K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T23:23:02.991743Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 12 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17 Content-length: 22 PROPS-END file: alpha Revision-number: 3 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Add third_party K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:13.831333Z PROPS-END Node-path: third_party Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic/the_magic_software Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 7 Text-content-md5: bc82cb068ef102a1f4e296992e5979ef Content-length: 17 PROPS-END magic! Revision-number: 4 Prop-content-length: 131 Content-length: 131 K 7 svn:log V 31 Copy magic in from third_party. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:32.737023Z PROPS-END Node-path: trunk/magic Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: third_party/magic Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END