Mercurial > hgsubversion
view tests/fixtures/rename_tag_test.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 | 76e9504db03b |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: b94d0721-81cf-435e-ab14-c40b19ce1924 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-01-17T19:05:32.787484Z PROPS-END Revision-number: 1 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 11 Empty dirs. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:33.116308Z 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 alpha K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:34.099166Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 12 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17 Text-content-sha1: f552a50b53177d35b29a4a0ab1cece918b5b5e9b Content-length: 22 PROPS-END file: alpha Revision-number: 3 Prop-content-length: 109 Content-length: 109 K 7 svn:log V 8 Add beta K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:36.110949Z PROPS-END Node-path: trunk/beta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 13 Text-content-md5: 981d1eb5fd0bbe05354c292105944863 Text-content-sha1: 5d40e0a9ceda69f3d98d4851a6bee02c10a6e277 Content-length: 23 PROPS-END Data of beta Revision-number: 4 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 tagging r3 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:38.066217Z PROPS-END Node-path: tags/tag_r3 Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: trunk Revision-number: 5 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 14 tag from a tag K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:38.116376Z PROPS-END Node-path: tags/copied_tag Node-kind: dir Node-action: add Node-copyfrom-rev: 4 Node-copyfrom-path: tags/tag_r3 Revision-number: 6 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 rename a tag K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-17T19:05:38.179177Z PROPS-END Node-path: tags/other_tag_r3 Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: tags/copied_tag Node-path: tags/copied_tag Node-action: delete