Mercurial > hgsubversion

view tests/fixtures/rename-closed-branch-dir.sh @ 1550:67b28d657f62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b072dc02d1e3
children
line wrap: on
line source

#!/bin/sh
#
# Generate rename-closed-branch-dir.svndump
#

mkdir temp
cd temp

mkdir project
cd project
mkdir trunk
mkdir branches
mkdir tags
cd ..

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

svn co $svnurl project
cd project
svn add *
svn ci -m "init project"

cd trunk
echo a > a.txt
svn add a.txt
svn ci -m "add a.txt in trunk"

# Create a branch
svn up
cd ../branches
svn copy ../trunk async-db
svn ci -m "add branch async-db"
svn up

# Implement feature
cd async-db
echo b > b.txt
svn add b.txt
svn ci -m "Async functionality"

# Merge feature branch
cd ../../trunk
svn merge $svnurl/branches/async-db
svn ci -m "Merged branch async-db"
cd ..
svn up

# Create branch folder for unnecessary branches
svn mkdir $svnurl/branches/dead -m "Create branch folder for unnecessary branches"
svn up

#  We don't need the 'async-db' branch, anymore.
svn copy $svnurl/branches/async-db $svnurl/branches/dead -m "We don't need the 'async-db' branch, anymore."
svn up

# Rename 'dead' folder to 'closed'
svn move $svnurl/branches/dead $svnurl/branches/closed -m "Renamed 'dead' folder to 'closed'"
svn up

# Move 'branches/closed' to 'tags/closed'
svn move $svnurl/branches/closed $svnurl/tags/closed -m "Moved 'branches/closed' to 'tags/closed'."
svn up

# Dump repository
cd ..
svnadmin dump testrepo > ../rename-closed-branch-dir.svndump