record: allow splitting of hunks by manually editing patches
It is possible that unrelated changes in a file are on sequential lines. The
current record extension does not allow these to be committed independently.
An example use case for this is in software development for deeply embedded
real-time systems. In these environments, it is not always possible to use a
debugger (due to time-constraints) and hence inline UART-based printing is
often used. When fixing a bug in a module, it is often convenient to add a
large number of 'printf's (linked to the UART via a custom fputc) to the module
in order to work out what is going wrong. printf is a very slow function (and
also variadic so somewhat frowned upon by the MISRA standard) and hence it is
highly undesirable to commit these lines to the repository. If only a partial
fix is implemented, however, it is desirable to commit the fix without deleting
all of the printf lines. This is also simplifies removal of the printf lines
as once the final fix is committed, 'hg revert' does the rest. It is likely
that the printf lines will be very near the actual fix, so being able to split
the hunk is very useful in this case.
There were two alternatives I considered for the user interface. One was to
manually edit the patch, the other to allow a hunk to be split into individual
lines for consideration. The latter option would require a significant
refactor of the record module and is less flexible. While the former is
potentially more complicated to use, this is a feature that is likely to only
be used in certain exceptional cases (such as the use case proposed above) and
hence I felt that the complexity would not be a considerable issue.
I've also written a follow-up patch that refactors the 'prompt' code to base
everything on the choices variable. This tidies up and clarifies the code a
bit (removes constructs like 'if ret == 7' and removes the 'e' option from the
file scope options as it's not relevant there. It's not really a necessity, so
I've excluded it from this submission for now, but I can send it separately if
there's a desire and it's on bitbucket (see below) in the meantime.
Possible future improvements include:
* Tidying up the 'prompt' code to base everything on the choices variable.
This would allow entries to be removed from the prompt as currently 'e' is
offered even for entire file patches, which is currently unsupported.
* Allowing the entire file (or even multi-file) patch to be edited manually:
this would require quite a large refactor without much benefit, so I decided
to exclude it from the initial submission.
* Allow the option to retry if a patch fails to apply (this is what Git does).
This would require quite a bit of refactoring given the current 'hg record'
implementation, so it's debatable whether it's worth it.
Output is similar to existing record user interface except that an additional
option ('e') exists to allow manual editing of the patch. This opens the
user's configured editor with the patch. A comment is added to the bottom of
the patch explaining what to do (based on Git's one).
A large proportion of the changeset is test-case changes to update the options
reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in
record.py and there are some new test cases in test-record.t.
> do_push()
> {
> user=$1
> shift
> echo "Pushing as user $user"
> echo 'hgrc = """'
> sed -e 1,2d b/.hg/hgrc | grep -v fakegroups.py
> 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
> }
> init_config()
> {
> cat > fakegroups.py <<EOF
> from hgext import acl
> def fakegetusers(ui, group):
> try:
> return acl._getusersorig(ui, group)
> except:
> return ["fred", "betty"]
> acl._getusersorig = acl._getusers
> acl._getusers = fakegetusers
> EOF
> rm -f acl.config
> cat > $config <<EOF
> [hooks]
> pretxnchangegroup.acl = python:hgext.acl.hook
> [acl]
> sources = push
> [extensions]
> f=`pwd`/fakegroups.py
> EOF
> }
$ 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
3:911600dab2ae
$ cd ..
$ hg clone -r 0 a b
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '[extensions]' >> $HGRCPATH
$ echo 'acl =' >> $HGRCPATH
$ config=b/.hg/hgrc
Extension disabled for lack of a hook
$ do_push fred
Pushing as user fred
hgrc = """
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
$ echo '[hooks]' >> $config
$ echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config
Extension disabled for lack of acl.sources
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: changes have source "push" - skipping
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
No [acl.allow]/[acl.deny]
$ echo '[acl]' >> $config
$ echo 'sources = push' >> $config
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
Empty [acl.allow]
$ echo '[acl.allow]' >> $config
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user fred
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available
0:6675d58eff77
fred is allowed inside foo/
$ echo 'foo/** = fred' >> $config
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
transaction abort!
rollback completed
abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available
0:6675d58eff77
Empty [acl.deny]
$ echo '[acl.deny]' >> $config
$ do_push barney
Pushing as user barney
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user barney
acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available
0:6675d58eff77
fred is allowed inside foo/, but not foo/bar/ (case matters)
$ echo 'foo/bar/** = fred' >> $config
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny enabled, 1 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
transaction abort!
rollback completed
abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available
0:6675d58eff77
fred is allowed inside foo/, but not foo/Bar/
$ echo 'foo/Bar/** = fred' >> $config
$ do_push fred
Pushing as user fred
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny enabled, 2 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
transaction abort!
rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available
0:6675d58eff77
$ echo 'barney is not mentioned => not allowed anywhere'
barney is not mentioned => not allowed anywhere
$ do_push barney
Pushing as user barney
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user barney
acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available
0:6675d58eff77
barney is allowed everywhere
$ echo '[acl.allow]' >> $config
$ echo '** = barney' >> $config
$ do_push barney
Pushing as user barney
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
[acl.allow]
** = barney
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user barney
acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
wilma can change files with a .txt extension
$ echo '**/*.txt = wilma' >> $config
$ do_push wilma
Pushing as user wilma
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
[acl.allow]
** = barney
**/*.txt = wilma
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "wilma"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user wilma
acl: acl.deny enabled, 0 entries for user wilma
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
transaction abort!
rollback completed
abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available
0:6675d58eff77
file specified by acl.config does not exist
$ echo '[acl]' >> $config
$ echo 'config = ../acl.config' >> $config
$ do_push barney
Pushing as user barney
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
[acl.allow]
** = barney
**/*.txt = wilma
[acl]
config = ../acl.config
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
error: pretxnchangegroup.acl hook raised an exception: [Errno 2] *: '../acl.config' (glob)
transaction abort!
rollback completed
abort: *: ../acl.config (glob)
no rollback information available
0:6675d58eff77
betty is allowed inside foo/ by a acl.config file
$ echo '[acl.allow]' >> acl.config
$ echo 'foo/** = betty' >> acl.config
$ do_push betty
Pushing as user betty
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
[acl.allow]
** = barney
**/*.txt = wilma
[acl]
config = ../acl.config
"""
acl.config = """
[acl.allow]
foo/** = betty
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "betty"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user betty
acl: acl.deny enabled, 0 entries for user betty
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae")
transaction abort!
rollback completed
abort: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available
0:6675d58eff77
acl.config can set only [acl.allow]/[acl.deny]
$ echo '[hooks]' >> acl.config
$ echo 'changegroup.acl = false' >> acl.config
$ do_push barney
Pushing as user barney
hgrc = """
[hooks]
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
sources = push
[acl.allow]
foo/** = fred
[acl.deny]
foo/bar/** = fred
foo/Bar/** = fred
[acl.allow]
** = barney
**/*.txt = wilma
[acl]
config = ../acl.config
"""
acl.config = """
[acl.allow]
foo/** = betty
[hooks]
changegroup.acl = false
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user barney
acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
asterisk
$ init_config
asterisk test
$ echo '[acl.allow]' >> $config
$ echo "** = fred" >> $config
fred is always allowed
$ do_push fred
Pushing as user fred
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow]
** = fred
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
$ echo '[acl.deny]' >> $config
$ echo "foo/Bar/** = *" >> $config
no one is allowed inside foo/Bar/
$ do_push fred
Pushing as user fred
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow]
** = fred
[acl.deny]
foo/Bar/** = *
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny enabled, 1 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
transaction abort!
rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available
0:6675d58eff77
Groups
$ init_config
OS-level groups
$ echo '[acl.allow]' >> $config
$ echo "** = @group1" >> $config
@group1 is always allowed
$ do_push fred
Pushing as user fred
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow]
** = @group1
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: "group1" not defined in [acl.groups]
acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 0 (undo push)
0:6675d58eff77
$ echo '[acl.deny]' >> $config
$ echo "foo/Bar/** = @group1" >> $config
@group is allowed inside anything but foo/Bar/
$ do_push fred
Pushing as user fred
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow]
** = @group1
[acl.deny]
foo/Bar/** = @group1
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
3 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
adding changesets
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: foo/Bar/file.txt 1/3 files (33.33%)
bundling: foo/file.txt 2/3 files (66.67%)
bundling: quux/file.py 3/3 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
adding manifests
manifests: 1/3 chunks (33.33%)
manifests: 2/3 chunks (66.67%)
manifests: 3/3 chunks (100.00%)
adding file changes
adding foo/Bar/file.txt revisions
files: 1/3 chunks (33.33%)
adding foo/file.txt revisions
files: 2/3 chunks (66.67%)
adding quux/file.py revisions
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "fred"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: "group1" not defined in [acl.groups]
acl: acl.allow enabled, 1 entries for user fred
acl: "group1" not defined in [acl.groups]
acl: acl.deny enabled, 1 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
transaction abort!
rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available
0:6675d58eff77
Invalid group
Disable the fakegroups trick to get real failures
$ grep -v fakegroups $config > config.tmp
$ mv config.tmp $config
$ echo '[acl.allow]' >> $config
$ echo "** = @unlikelytoexist" >> $config
$ do_push fred 2>&1 | grep unlikelytoexist
** = @unlikelytoexist
acl: "unlikelytoexist" not defined in [acl.groups]
error: pretxnchangegroup.acl hook failed: group 'unlikelytoexist' is undefined
abort: group 'unlikelytoexist' is undefined
Branch acl tests setup
$ init_config
$ cd b
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch foobar
marked working directory as branch foobar
(branches are permanent and global, did you want a bookmark?)
$ hg commit -m 'create foobar'
$ echo 'foo contents' > abc.txt
$ hg add abc.txt
$ hg commit -m 'foobar contents'
$ cd ..
$ hg --cwd a pull ../b
pulling from ../b
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads)
Create additional changeset on foobar branch
$ cd a
$ hg up -C foobar
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'foo contents2' > abc.txt
$ hg commit -m 'foobar contents2'
$ cd ..
No branch acls specified
$ do_push astro
Pushing as user astro
hgrc = """
[acl]
sources = push
[extensions]
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 2 (undo push)
2:fb35475503ef
Branch acl deny test
$ echo "[acl.deny.branches]" >> $config
$ echo "foobar = *" >> $config
$ do_push astro
Pushing as user astro
hgrc = """
[acl]
sources = push
[extensions]
[acl.deny.branches]
foobar = *
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user astro
acl: acl.allow not enabled
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82")
transaction abort!
rollback completed
abort: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82")
no rollback information available
2:fb35475503ef
Branch acl empty allow test
$ init_config
$ echo "[acl.allow.branches]" >> $config
$ do_push astro
Pushing as user astro
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow.branches]
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
no rollback information available
2:fb35475503ef
Branch acl allow other
$ init_config
$ echo "[acl.allow.branches]" >> $config
$ echo "* = george" >> $config
$ do_push astro
Pushing as user astro
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow.branches]
* = george
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "astro"
acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
no rollback information available
2:fb35475503ef
$ do_push george
Pushing as user george
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow.branches]
* = george
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
acl: acl.allow.branches enabled, 1 entries for user george
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 2 (undo push)
2:fb35475503ef
Branch acl conflicting allow
asterisk ends up applying to all branches and allowing george to
push foobar into the remote
$ init_config
$ echo "[acl.allow.branches]" >> $config
$ echo "foobar = astro" >> $config
$ echo "* = george" >> $config
$ do_push george
Pushing as user george
hgrc = """
[acl]
sources = push
[extensions]
[acl.allow.branches]
foobar = astro
* = george
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
acl: acl.allow.branches enabled, 1 entries for user george
acl: acl.deny.branches not enabled
acl: acl.allow not enabled
acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82"
updating the branch cache
checking for updated bookmarks
repository tip rolled back to revision 2 (undo push)
2:fb35475503ef
Branch acl conflicting deny
$ init_config
$ echo "[acl.deny.branches]" >> $config
$ echo "foobar = astro" >> $config
$ echo "default = astro" >> $config
$ echo "* = george" >> $config
$ do_push george
Pushing as user george
hgrc = """
[acl]
sources = push
[extensions]
[acl.deny.branches]
foobar = astro
default = astro
* = george
"""
pushing to ../b
query 1; heads
searching for changes
all remote heads known locally
invalidating branch cache (tip differs)
4 changesets found
list of changesets:
ef1ea85a6374b77d6da9dcda9541f498f2d17df7
f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
911600dab2ae7a9baff75958b84fe606851ce955
e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
adding changesets
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
bundling: 2/4 manifests (50.00%)
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: abc.txt 1/4 files (25.00%)
bundling: foo/Bar/file.txt 2/4 files (50.00%)
bundling: foo/file.txt 3/4 files (75.00%)
bundling: quux/file.py 4/4 files (100.00%)
changesets: 1 chunks
add changeset ef1ea85a6374
changesets: 2 chunks
add changeset f9cafe1212c8
changesets: 3 chunks
add changeset 911600dab2ae
changesets: 4 chunks
add changeset e8fc755d4d82
adding manifests
manifests: 1/4 chunks (25.00%)
manifests: 2/4 chunks (50.00%)
manifests: 3/4 chunks (75.00%)
manifests: 4/4 chunks (100.00%)
adding file changes
adding abc.txt revisions
files: 1/4 chunks (25.00%)
adding foo/Bar/file.txt revisions
files: 2/4 chunks (50.00%)
adding foo/file.txt revisions
files: 3/4 chunks (75.00%)
adding quux/file.py revisions
files: 4/4 chunks (100.00%)
added 4 changesets with 4 changes to 4 files (+1 heads)
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "george"
acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user george
acl: acl.allow not enabled
acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
transaction abort!
rollback completed
abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
no rollback information available
2:fb35475503ef