view tests/fixtures/revert.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 9c3b4f59e7e6
children
line wrap: on
line source

#!/bin/sh
#
# Generate revert.svndump
#

rm -rf temp
mkdir temp
cd temp
mkdir -p import/trunk/dir
cd import/trunk
echo a > a
echo b > dir/b
cd ../..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import import $svnurl -m init

svn co $svnurl project
cd project
echo a >> trunk/a
echo b >> trunk/dir/b
svn ci -m changefiles
svn up
# Test directory revert
svn rm trunk
svn cp $svnurl/trunk@1 trunk
svn st
svn ci -m revert
svn up
# Test file revert
svn rm trunk/a
svn rm trunk/dir/b
svn cp $svnurl/trunk/a@2 trunk/a
svn cp $svnurl/trunk/dir/b@2 trunk/dir/b
svn ci -m revert2
cd ..

svnadmin dump testrepo > ../revert.svndump