Mercurial > hg
view tests/test-acl @ 10397:8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.
This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:
* Resolve conflicts found when qpushing to a new location by merging
instead of simply showing rejects.
* Display better diffs of versioned MQ patches because we can tell how the
patched files have changed in the meantime.
Here are the new rules this patch introduces. They are checked in this order:
* If a patch currently has old, plain-style patch headers ("From:" and
"Date:") do not change the style or add any new headers.
* If the 'mq.plain' configuration setting is true, only plain-style
headers will be used for all MQ patches.
* qnew will initialize new patches with HG-style headers and fill in the
"# Parent" header with the appropriate parent node.
* qrefresh will refresh the "# Parent" header with the current parent of
the current patch.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 07 Feb 2010 10:47:54 -0500 |
parents | bb5ea66789e3 |
children | 08681cb66231 |
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 # On AIX /etc/profile sets LOGNAME read-only. So # LOGNAME=$user hg --cws a --debug push ../b # fails with "This variable is read only." # Use env to work around this. env 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 '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