Mercurial > hgsubversion
view tests/fixtures/copyafterclose.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 | ba8485b9fee0 |
children |
line wrap: on
line source
#!/bin/sh rm -rf temp mkdir temp cd temp svnadmin create repo repo=file://`pwd`/repo svn co $repo wc cd wc mkdir branches trunk tags svn add * svn ci -m 'btt' cd trunk echo trunk1 > file mkdir dir echo trunk1 > dir/file svn add file dir svn ci -m 'Add file and dir.' cd .. svn up svn cp trunk branches/test svn ci -m 'Branch.' svn up cd branches/test/ echo branch1 > file echo branch1 > dir/file svn ci -m 'edit on branch.' cd ../../ svn up cd trunk echo trunk2 > file echo trunk2 > dir/file svn ci -m 'edit on trunk' cd .. svn up svn rm trunk svn ci -m 'Close trunk.' svn up cd branches/test svn rm file svn cp $repo/trunk/file@5 file svn rm dir svn cp $repo/trunk/dir@5 dir svn ci -m 'copy from trunk before close' cd ../.. svn up cd ../.. svnadmin dump temp/repo > copyafterclose.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in copyafterclose.svndump' exit 0