svnrepo: fix issue 187: ignore pushable bookmarks in hg 1.6 Mercurial 1.6 introduces two new methods for repo subclasses -- pushkey and listkeys -- to support pushing/pulling bookmarks between hg repositories. (See mpm's blog post http://www.selenic.com/blog/?p=644 for details.) Unfortunately, these are only defined in the subclasses, and not in the repo base class. Perhaps the bookmarks extension should also be checking the repo for pushkeys capability by calling repo.capable('pushkey') to check. It doesn't. In the meantime, we can implement these ourselves. svnrepo should declare these methods since it is derived directly from repo. They do nothing -- listkeys merely returns an empty dictionary; pushkey returns False; this is the behaviour of httprepo or sshrepo when the remote end is running an earlier version of Mercurial. svnlocalrepo should not declare these methods since it derives from a subclass of localrepo, which already will have them, unless some other badly behaved extensions are doing something intensely weird.

#!/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