Mercurial > hg
view tests/svn/svndump-replace.sh @ 31454:a5bad127128d
branchmap: handle nullrev in setcachedata
906be86990 recently changed to switch from:
self._rbcrevs[rbcrevidx:rbcrevidx + _rbcrecsize] = rec
to
pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx)
This causes an exception if rbcrevidx is -1 (i.e. the nullrev). The old code
handled this because python handles out of bound sets to arrays gracefully. The
new code throws because the self._rbcrevs buffer isn't long enough to write 8
bytes to. Normally it would've been resized by the immediately preceding line,
but because the 0 length buffer is greater than the idx (-1) times the size, no
resize happens.
Setting the branch for the nullrev doesn't make sense anyway, so let's skip it.
This was caught by external tests in the Facebook extensions repo, but I've
added a test here that catches the issue.
author | Durham Goode <durham@fb.com> |
---|---|
date | Wed, 15 Mar 2017 15:48:57 -0700 |
parents | 5fb924ee44d5 |
children |
line wrap: on
line source
#!/bin/sh RSVN="`pwd`/rsvn.py" export PATH=/bin:/usr/bin mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir trunk branches cd trunk echo a > a mkdir d echo b > d/b ln -s d dlink ln -s d dlink2 ln -s d dlink3 mkdir d2 echo a > d2/a cd .. svn add * svn ci -m 'initial' # Clobber symlink with file with similar content cd trunk ls -Alh readlink dlink3 > dlink3tmp rm dlink3 mv dlink3tmp dlink3 svn propdel svn:special dlink3 svn ci -m 'clobber symlink' cd .. svn up # Clobber files and symlink with directories cd .. cat > clobber.rsvn <<EOF rdelete trunk/a rdelete trunk/dlink rcopy trunk/d trunk/a rcopy trunk/d trunk/dlink EOF python $RSVN --message=clobber1 --username=evil `pwd`/repo < clobber.rsvn # Clobber non-symlink with symlink with same content (kudos openwrt) cat > clobber.rsvn <<EOF rdelete trunk/dlink3 rcopy trunk/dlink2 trunk/dlink3 EOF python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn # Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2, # 'b' is in trunk/d2 and 'c' is in branch/d2 cd wc/trunk echo b > d2/b svn add d2/b svn ci -m adddb cd .. svn up svn cp trunk branches/branch cd branches/branch svn rm d2/b echo c > d2/c svn add d2/c cd ../.. svn ci -m branch svn up cd .. cat > clobber.rsvn <<EOF rdelete trunk/d2 rcopy branches/branch/d2 trunk/d2 EOF python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn svn log -v file://`pwd`/repo svnadmin dump repo > ../replace.svndump