view tests/fixtures/delentries.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 19aabf67c792
children
line wrap: on
line source

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

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk
cd ..

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

svn co $svnurl project
cd project/trunk
# Regular file deletion
echo a > a
# Another file starting like the deleted file
echo aa > aa
mkdir d1
mkdir d1/d2
mkdir d1/d2/d3
echo c > d1/c
# Test directory deletion
echo d > d1/d2/c
# Test subdirectory deletion
echo e > d1/d2/d3/e
echo f > d1/d2/d3/f
# This file starts as the deleted directory, can be confusing
echo d2prefix > d1/d2prefix
svn add a aa d1
svn ci -m "add entries"
svn rm a d1/d2
svn ci -m "remove entries"
cd ../..

svnadmin dump testrepo > ../delentries.svndump