Mercurial > hg
view tests/test-acl @ 5096:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 12 Aug 2007 12:15:10 -0300 |
parents | 85237110c371 |
children | 0d488f7f321d |
line wrap: on
line source
#!/bin/sh do_push() { user=$1 shift echo "Pushing as user $user" echo 'hgrc = """' sed -e 1,2d b/.hg/hgrc echo '"""' if test -f acl.config; then echo 'acl.config = """' cat acl.config echo '"""' fi LOGNAME=$user hg --cwd a --debug push ../b hg --cwd b rollback hg --cwd b --quiet tip echo } hg init a cd a mkdir foo foo/Bar quux echo 'in foo' > foo/file.txt echo 'in foo/Bar' > foo/Bar/file.txt echo 'in quux' > quux/file.py hg add -q hg ci -m 'add files' -d '1000000 0' echo >> foo/file.txt hg ci -m 'change foo/file' -d '1000001 0' echo >> foo/Bar/file.txt hg ci -m 'change foo/Bar/file' -d '1000002 0' echo >> quux/file.py hg ci -m 'change quux/file' -d '1000003 0' hg tip --quiet cd .. hg clone -r 0 a b echo '[extensions]' >> $HGRCPATH echo 'hgext.acl =' >> $HGRCPATH config=b/.hg/hgrc echo echo 'Extension disabled for lack of a hook' do_push fred echo '[hooks]' >> $config echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config echo 'Extension disabled for lack of acl.sources' do_push fred echo 'No [acl.allow]/[acl.deny]' echo '[acl]' >> $config echo 'sources = push' >> $config do_push fred echo 'Empty [acl.allow]' echo '[acl.allow]' >> $config do_push fred echo 'fred is allowed inside foo/' echo 'foo/** = fred' >> $config do_push fred echo 'Empty [acl.deny]' echo '[acl.deny]' >> $config do_push barney echo 'fred is allowed inside foo/, but not foo/bar/ (case matters)' echo 'foo/bar/** = fred' >> $config do_push fred echo 'fred is allowed inside foo/, but not foo/Bar/' echo 'foo/Bar/** = fred' >> $config do_push fred echo 'barney is not mentioned => not allowed anywhere' do_push barney echo 'barney is allowed everywhere' echo '[acl.allow]' >> $config echo '** = barney' >> $config do_push barney echo 'wilma can change files with a .txt extension' echo '**/*.txt = wilma' >> $config do_push wilma echo 'file specified by acl.config does not exist' echo '[acl]' >> $config echo 'config = ../acl.config' >> $config do_push barney echo 'betty is allowed inside foo/ by a acl.config file' echo '[acl.allow]' >> acl.config echo 'foo/** = betty' >> acl.config do_push betty echo 'acl.config can set only [acl.allow]/[acl.deny]' echo '[hooks]' >> acl.config echo 'changegroup.acl = false' >> acl.config do_push barney