Mercurial > hgsubversion
view tests/fixtures/rename-closed-branch-dir.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 | b072dc02d1e3 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 2efdcfe9-9dfd-40a7-a9cc-bf5b70806ff3 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2016-01-27T15:35:29.673334Z PROPS-END Revision-number: 1 Prop-content-length: 112 Content-length: 112 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:30.079847Z K 7 svn:log V 12 init project 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: 118 Content-length: 118 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:31.065912Z K 7 svn:log V 18 add a.txt in trunk PROPS-END Node-path: trunk/a.txt 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: 119 Content-length: 119 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:34.051261Z K 7 svn:log V 19 add branch async-db PROPS-END Node-path: branches/async-db Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 119 Content-length: 119 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:36.101507Z K 7 svn:log V 19 Async functionality PROPS-END Node-path: branches/async-db/b.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Content-length: 12 PROPS-END b Revision-number: 5 Prop-content-length: 122 Content-length: 122 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:38.055736Z K 7 svn:log V 22 Merged branch async-db PROPS-END Node-path: trunk Node-kind: dir Node-action: change Prop-content-length: 57 Content-length: 57 K 13 svn:mergeinfo V 22 /branches/async-db:3-4 PROPS-END Node-path: trunk/b.txt Node-kind: file Node-action: add Node-copyfrom-rev: 4 Node-copyfrom-path: branches/async-db/b.txt Text-copy-source-md5: 3b5d5c3712955042212316173ccf37be Text-copy-source-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Revision-number: 6 Prop-content-length: 145 Content-length: 145 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:40.046670Z K 7 svn:log V 45 Create branch folder for unnecessary branches PROPS-END Node-path: branches/dead Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 7 Prop-content-length: 145 Content-length: 145 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:41.048576Z K 7 svn:log V 45 We don't need the 'async-db' branch, anymore. PROPS-END Node-path: branches/dead/async-db Node-kind: dir Node-action: add Node-copyfrom-rev: 6 Node-copyfrom-path: branches/async-db Revision-number: 8 Prop-content-length: 133 Content-length: 133 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:42.046536Z K 7 svn:log V 33 Renamed 'dead' folder to 'closed' PROPS-END Node-path: branches/closed Node-kind: dir Node-action: add Node-copyfrom-rev: 7 Node-copyfrom-path: branches/dead Node-path: branches/dead Node-action: delete Revision-number: 9 Prop-content-length: 141 Content-length: 141 K 10 svn:author V 5 augie K 8 svn:date V 27 2016-01-27T15:35:43.048056Z K 7 svn:log V 41 Moved 'branches/closed' to 'tags/closed'. PROPS-END Node-path: branches/closed Node-action: delete Node-path: tags/closed Node-kind: dir Node-action: add Node-copyfrom-rev: 8 Node-copyfrom-path: branches/closed