view tests/fixtures/unrelatedbranch.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 ea65fe2b0856
children
line wrap: on
line source

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

mkdir temp
cd temp

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

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

svn co $svnurl project
cd project/trunk
echo a > a
svn add a
svn ci -m "add a in trunk"
cd ../branches
# Create an unrelated branch with another file. It used to lead the converter
# to think branch1 was a copy of trunk, even without copy information.
mkdir branch1
echo b > branch1/b
svn add branch1
svn ci -m "add b in branch1"
# Make a real branch too for comparison
svn cp ../trunk branch2
echo b > branch2/b
svn add branch2/b
svn ci -m "add b to branch2"
# Add a file in the branch root for fun
echo c > c
svn add c
svn ci -m "add c in branches/"
# Even update it
echo c >> c
svn ci -m "change c"
cd ../..

svnadmin dump testrepo > ../unrelatedbranch.svndump