Mercurial > hgsubversion
view tests/fixtures/subprojects.sh @ 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 | 9a7e3dbd0f6e |
children |
line wrap: on
line source
#!/usr/bin/env bash set -e mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir -p branches mkdir -p tags svn add trunk branches tags svn commit -m "Initial commit" mkdir trunk/project trunk/other echo "project trunk" > trunk/project/file echo "other trunk" > trunk/other/phile svn add trunk/project trunk/other svn commit -m "Added file and phile in trunk" svn up svn cp trunk tags/tag_from_trunk svn ci -m 'created tag from trunk' svn up svn cp trunk branches/branch svn ci -m 'created branch from trunk' svn up echo "project branch" > branches/branch/project/file svn ci -m "committed to the project branch" svn up echo "trunk2" > trunk/project/file svn ci -m "committed to trunk again" svn up echo "other branch" > branches/branch/other/phile svn ci -m "committed to the other branch" svn up svn cp branches/branch tags/tag_from_branch svn ci -m "create tag from branch" cd .. svnadmin dump testrepo > ../subprojects.svndump echo "Created subprojects.svndump" echo "You might want to clean up ${PWD} now"