This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6850

bundle2: fix an off-by-one in debug message of number of parts
ClosedPublic

Authored by martinvonz on Sep 14 2019, 12:37 PM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHG181ee2118a96: bundle2: fix an off-by-one in debug message of number of parts

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Sep 14 2019, 12:37 PM
marmoute added a subscriber: marmoute.Sep 14 2019, 12:51 PM
marmoute added inline comments.
mercurial/bundle2.py
371

Should this simply be enumarate(self.unbundler.iterparts(), 1) ?

martinvonz added inline comments.Sep 14 2019, 12:54 PM
mercurial/bundle2.py
371

Yeah, probably. I considered that but didn't do it, but I don't know why :) I'll just do that now.

marmoute accepted this revision.Sep 15 2019, 8:28 AM

Looks good to me

martinvonz added a commit: rHG181ee2118a96: bundle2: fix an off-by-one in debug message of number of parts.Sep 15 2019, 1:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG181ee2118a96: bundle2: fix an off-by-one in debug message of number of parts (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16542

mercurial/bundle2.py

self.op = op self.op = op
self.unbundler = unbundler self.unbundler = unbundler
self.iterator = None self.iterator = None
self.count = 0 self.count = 0
self.current = None self.current = None
def __enter__(self): def __enter__(self):
def func(): def func():
itr = enumerate(self.unbundler.iterparts()) itr = enumerate(self.unbundler.iterparts(), 1)
marmouteUnsubmitted
Not Done

Should this simply be enumarate(self.unbundler.iterparts(), 1) ?

marmoute: Should this simply be `enumarate(self.unbundler.iterparts(), 1)` ?
martinvonzAuthorUnsubmitted
Done

Yeah, probably. I considered that but didn't do it, but I don't know why :) I'll just do that now.

martinvonz: Yeah, probably. I considered that but didn't do it, but I don't know why :) I'll just do that…
for count, p in itr: for count, p in itr:
self.count = count self.count = count
self.current = p self.current = p
yield p yield p
p.consume() p.consume()
self.current = None self.current = None
self.iterator = func() self.iterator = func()
return self.iterator return self.iterator

tests/test-acl.t

adding manifests adding manifests
adding file changes adding file changes
adding foo/Bar/file.txt revisions adding foo/Bar/file.txt revisions
adding foo/file.txt revisions adding foo/file.txt revisions
adding quux/file.py revisions adding quux/file.py revisions
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
$ echo '[hooks]' >> $config $ echo '[hooks]' >> $config
$ echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config $ echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config
$ echo 'prepushkey.acl = python:hgext.acl.hook' >> $config $ echo 'prepushkey.acl = python:hgext.acl.hook' >> $config
adding foo/Bar/file.txt revisions adding foo/Bar/file.txt revisions
adding foo/file.txt revisions adding foo/file.txt revisions
adding quux/file.py revisions adding quux/file.py revisions
calling hook pretxnchangegroup.acl: hgext.acl.hook calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: changes have source "push" - skipping acl: changes have source "push" - skipping
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
No [acl.allow]/[acl.deny] No [acl.allow]/[acl.deny]
$ echo '[acl]' >> $config $ echo '[acl]' >> $config
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
Empty [acl.allow] Empty [acl.allow]
$ echo '[acl.allow]' >> $config $ echo '[acl.allow]' >> $config
acl: acl.allow.branches not enabled acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user fred acl: acl.allow enabled, 0 entries for user fred
acl: acl.deny not enabled acl: acl.deny not enabled
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
fred is allowed inside foo/ fred is allowed inside foo/
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
Empty [acl.deny] Empty [acl.deny]
acl: acl.allow.branches not enabled acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user barney acl: acl.allow enabled, 0 entries for user barney
acl: acl.deny enabled, 0 entries for user barney acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
fred is allowed inside foo/, but not foo/bar/ (case matters) fred is allowed inside foo/, but not foo/bar/ (case matters)
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") abort: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
fred is allowed inside foo/, but not foo/Bar/ fred is allowed inside foo/, but not foo/Bar/
acl: acl.allow enabled, 1 entries for user fred acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny enabled, 2 entries for user fred acl: acl.deny enabled, 2 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
$ echo 'barney is not mentioned => not allowed anywhere' $ echo 'barney is not mentioned => not allowed anywhere'
acl: acl.allow.branches not enabled acl: acl.allow.branches not enabled
acl: acl.deny.branches not enabled acl: acl.deny.branches not enabled
acl: acl.allow enabled, 0 entries for user barney acl: acl.allow enabled, 0 entries for user barney
acl: acl.deny enabled, 0 entries for user barney acl: acl.deny enabled, 0 entries for user barney
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") abort: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
fred is not blocked from moving bookmarks fred is not blocked from moving bookmarks
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "bookmarks" supported bundle2-input-part: "bookmarks" supported
bundle2-input-part: total payload size 37 bundle2-input-part: total payload size 37
calling hook prepushkey.acl: hgext.acl.hook calling hook prepushkey.acl: hgext.acl.hook
acl: checking access for user "fred" acl: checking access for user "fred"
acl: acl.allow.bookmarks not enabled acl: acl.allow.bookmarks not enabled
acl: acl.deny.bookmarks not enabled acl: acl.deny.bookmarks not enabled
acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark"
bundle2-input-bundle: 6 parts total bundle2-input-bundle: 7 parts total
updating the branch cache updating the branch cache
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
updating bookmark moving-bookmark updating bookmark moving-bookmark
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
fred is not allowed to move bookmarks fred is not allowed to move bookmarks
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "bookmarks" supported bundle2-input-part: "bookmarks" supported
bundle2-input-part: total payload size 37 bundle2-input-part: total payload size 37
calling hook prepushkey.acl: hgext.acl.hook calling hook prepushkey.acl: hgext.acl.hook
acl: checking access for user "fred" acl: checking access for user "fred"
acl: acl.allow.bookmarks not enabled acl: acl.allow.bookmarks not enabled
acl: acl.deny.bookmarks enabled, 1 entries for user fred acl: acl.deny.bookmarks enabled, 1 entries for user fred
error: prepushkey.acl hook failed: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7") error: prepushkey.acl hook failed: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")
bundle2-input-bundle: 6 parts total bundle2-input-bundle: 7 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7") abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
cleanup bookmark stuff cleanup bookmark stuff
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
wilma can change files with a .txt extension wilma can change files with a .txt extension
$ echo '**/*.txt = wilma' >> $config $ echo '**/*.txt = wilma' >> $config
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
file specified by acl.config does not exist file specified by acl.config does not exist
adding foo/Bar/file.txt revisions adding foo/Bar/file.txt revisions
adding foo/file.txt revisions adding foo/file.txt revisions
adding quux/file.py revisions adding quux/file.py revisions
calling hook pretxnchangegroup.acl: hgext.acl.hook calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney" acl: checking access for user "barney"
error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob) error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob)
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: $ENOENT$: '../acl.config' abort: $ENOENT$: '../acl.config'
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
betty is allowed inside foo/ by a acl.config file betty is allowed inside foo/ by a acl.config file
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") abort: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
acl.config can set only [acl.allow]/[acl.deny] acl.config can set only [acl.allow]/[acl.deny]
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
asterisk asterisk
$ init_config $ init_config
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
$ echo '[acl.deny]' >> $config $ echo '[acl.deny]' >> $config
$ echo "foo/Bar/** = *" >> $config $ echo "foo/Bar/** = *" >> $config
acl: acl.allow enabled, 1 entries for user fred acl: acl.allow enabled, 1 entries for user fred
acl: acl.deny enabled, 1 entries for user fred acl: acl.deny enabled, 1 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
Groups Groups
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 0 (undo push) repository tip rolled back to revision 0 (undo push)
0:6675d58eff77 0:6675d58eff77
$ echo '[acl.deny]' >> $config $ echo '[acl.deny]' >> $config
$ echo "foo/Bar/** = @group1" >> $config $ echo "foo/Bar/** = @group1" >> $config
acl: "group1" not defined in [acl.groups] acl: "group1" not defined in [acl.groups]
acl: acl.deny enabled, 1 entries for user fred acl: acl.deny enabled, 1 entries for user fred
acl: branch access granted: "ef1ea85a6374" on branch "default" acl: branch access granted: "ef1ea85a6374" on branch "default"
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
no rollback information available no rollback information available
0:6675d58eff77 0:6675d58eff77
Invalid group Invalid group
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 2 (undo push) repository tip rolled back to revision 2 (undo push)
2:fb35475503ef 2:fb35475503ef
Branch acl deny test Branch acl deny test
$ echo "[acl.deny.branches]" >> $config $ echo "[acl.deny.branches]" >> $config
acl: path access granted: "ef1ea85a6374" acl: path access granted: "ef1ea85a6374"
acl: branch access granted: "f9cafe1212c8" on branch "default" acl: branch access granted: "f9cafe1212c8" on branch "default"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82")
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") abort: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82")
no rollback information available no rollback information available
2:fb35475503ef 2:fb35475503ef
Branch acl empty allow test Branch acl empty allow test
acl: checking access for user "astro" acl: checking access for user "astro"
acl: acl.allow.branches enabled, 0 entries for user astro acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled acl: acl.deny.branches not enabled
acl: acl.allow not enabled acl: acl.allow not enabled
acl: acl.deny not enabled acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
2:fb35475503ef 2:fb35475503ef
Branch acl allow other Branch acl allow other
acl: checking access for user "astro" acl: checking access for user "astro"
acl: acl.allow.branches enabled, 0 entries for user astro acl: acl.allow.branches enabled, 0 entries for user astro
acl: acl.deny.branches not enabled acl: acl.deny.branches not enabled
acl: acl.allow not enabled acl: acl.allow not enabled
acl: acl.deny not enabled acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") abort: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
2:fb35475503ef 2:fb35475503ef
$ do_push george $ do_push george
Pushing as user george Pushing as user george
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 2 (undo push) repository tip rolled back to revision 2 (undo push)
2:fb35475503ef 2:fb35475503ef
Branch acl conflicting allow Branch acl conflicting allow
asterisk ends up applying to all branches and allowing george to asterisk ends up applying to all branches and allowing george to
push foobar into the remote push foobar into the remote
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 2 (undo push) repository tip rolled back to revision 2 (undo push)
2:fb35475503ef 2:fb35475503ef
Branch acl conflicting deny Branch acl conflicting deny
$ init_config $ init_config
$ echo "[acl.deny.branches]" >> $config $ echo "[acl.deny.branches]" >> $config
acl: checking access for user "george" acl: checking access for user "george"
acl: acl.allow.branches not enabled acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user george acl: acl.deny.branches enabled, 1 entries for user george
acl: acl.allow not enabled acl: acl.allow not enabled
acl: acl.deny not enabled acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
2:fb35475503ef 2:fb35475503ef
User 'astro' must not be denied User 'astro' must not be denied
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
repository tip rolled back to revision 2 (undo push) repository tip rolled back to revision 2 (undo push)
2:fb35475503ef 2:fb35475503ef
Non-astro users must be denied Non-astro users must be denied
$ do_push george $ do_push george
acl: checking access for user "george" acl: checking access for user "george"
acl: acl.allow.branches not enabled acl: acl.allow.branches not enabled
acl: acl.deny.branches enabled, 1 entries for user george acl: acl.deny.branches enabled, 1 entries for user george
acl: acl.allow not enabled acl: acl.allow not enabled
acl: acl.deny not enabled acl: acl.deny not enabled
error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
transaction abort! transaction abort!
rollback completed rollback completed
abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") abort: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374")
no rollback information available no rollback information available
2:fb35475503ef 2:fb35475503ef

tests/test-bookmarks-pushpull.t

bundle2-input: part id: "3" bundle2-input: part id: "3"
bundle2-input: part parameters: 4 bundle2-input: part parameters: 4
bundle2-input: found a handler for part pushkey bundle2-input: found a handler for part pushkey
bundle2-input-part: "pushkey" (params: 4 mandatory) supported bundle2-input-part: "pushkey" (params: 4 mandatory) supported
pushing key for "bookmarks:W" pushing key for "bookmarks:W"
bundle2-input: payload chunk size: 0 bundle2-input: payload chunk size: 0
bundle2-input: part header size: 0 bundle2-input: part header size: 0
bundle2-input: end of bundle2 stream bundle2-input: end of bundle2 stream
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 4 parts total
running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh
test-hook-bookmark: W: 0000000000000000000000000000000000000000 -> test-hook-bookmark: W: 0000000000000000000000000000000000000000 ->
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output: start emission of HG20 stream bundle2-output: start emission of HG20 stream
bundle2-output: bundle parameter: bundle2-output: bundle parameter:
bundle2-output: start of parts bundle2-output: start of parts
bundle2-output: bundle part: "reply:pushkey" bundle2-output: bundle part: "reply:pushkey"
bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload
bundle2-input: part type: "REPLY:PUSHKEY" bundle2-input: part type: "REPLY:PUSHKEY"
bundle2-input: part id: "0" bundle2-input: part id: "0"
bundle2-input: part parameters: 2 bundle2-input: part parameters: 2
bundle2-input: found a handler for part reply:pushkey bundle2-input: found a handler for part reply:pushkey
bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
bundle2-input: payload chunk size: 0 bundle2-input: payload chunk size: 0
bundle2-input: part header size: 0 bundle2-input: part header size: 0
bundle2-input: end of bundle2 stream bundle2-input: end of bundle2 stream
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
deleting remote bookmark W deleting remote bookmark W
listing keys for "phases" listing keys for "phases"
[1] [1]
#endif #endif
#if b2-binary #if b2-binary
$ hg push -B W ../a --config "$TESTHOOK" --debug --config devel.bundle2.debug=yes $ hg push -B W ../a --config "$TESTHOOK" --debug --config devel.bundle2.debug=yes
bundle2-input: part parameters: 0 bundle2-input: part parameters: 0
bundle2-input: found a handler for part bookmarks bundle2-input: found a handler for part bookmarks
bundle2-input-part: "bookmarks" supported bundle2-input-part: "bookmarks" supported
bundle2-input: payload chunk size: 23 bundle2-input: payload chunk size: 23
bundle2-input: payload chunk size: 0 bundle2-input: payload chunk size: 0
bundle2-input-part: total payload size 23 bundle2-input-part: total payload size 23
bundle2-input: part header size: 0 bundle2-input: part header size: 0
bundle2-input: end of bundle2 stream bundle2-input: end of bundle2 stream
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 4 parts total
running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh
test-hook-bookmark: W: 0000000000000000000000000000000000000000 -> test-hook-bookmark: W: 0000000000000000000000000000000000000000 ->
bundle2-output-bundle: "HG20", 0 parts total bundle2-output-bundle: "HG20", 0 parts total
bundle2-output: start emission of HG20 stream bundle2-output: start emission of HG20 stream
bundle2-output: bundle parameter: bundle2-output: bundle parameter:
bundle2-output: start of parts bundle2-output: start of parts
bundle2-output: end of bundle bundle2-output: end of bundle
bundle2-input: start processing of HG20 stream bundle2-input: start processing of HG20 stream

tests/test-bundle2-format.t

bundle2-input: part id: "6" bundle2-input: part id: "6"
bundle2-input: part parameters: 0 bundle2-input: part parameters: 0
bundle2-input: found a handler for part test:ping bundle2-input: found a handler for part test:ping
bundle2-input-part: "test:ping" (advisory) supported bundle2-input-part: "test:ping" (advisory) supported
received ping request (id 6) received ping request (id 6)
bundle2-input: payload chunk size: 0 bundle2-input: payload chunk size: 0
bundle2-input: part header size: 0 bundle2-input: part header size: 0
bundle2-input: end of bundle2 stream bundle2-input: end of bundle2 stream
bundle2-input-bundle: 6 parts total bundle2-input-bundle: 7 parts total
0 unread bytes 0 unread bytes
3 total verses sung 3 total verses sung
Unbundle with an unknown mandatory part Unbundle with an unknown mandatory part
(should abort) (should abort)
$ hg bundle2 --parts --unknown ../unknown.hg2 $ hg bundle2 --parts --unknown ../unknown.hg2

tests/test-clone-uncompressed.t

searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 2 parts total
checking for updated bookmarks checking for updated bookmarks
(sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob)
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
query 1; heads query 1; heads
sending batch command sending batch command
streaming all changes streaming all changes
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
1030 files to transfer, 96.5 KB of data 1030 files to transfer, 96.5 KB of data
starting 4 threads for background file closing starting 4 threads for background file closing
starting 4 threads for background file closing starting 4 threads for background file closing
updating the branch cache updating the branch cache
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.5 KB in * seconds (* */sec) (glob)
bundle2-input-part: total payload size 112094 bundle2-input-part: total payload size 112094
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 2 parts total
checking for updated bookmarks checking for updated bookmarks
(sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
#endif #endif
Cannot stream clone when there are secret changesets Cannot stream clone when there are secret changesets
$ hg -R server phase --force --secret -r tip $ hg -R server phase --force --secret -r tip
$ hg clone --stream -U http://localhost:$HGPORT secret-denied $ hg clone --stream -U http://localhost:$HGPORT secret-denied

tests/test-http.t

bundle2-input-part: "output" (advisory) (params: 0 advisory) supported bundle2-input-part: "output" (advisory) (params: 0 advisory) supported
bundle2-input-part: total payload size 55 bundle2-input-part: total payload size 55
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
bundle2-input-part: "output" (advisory) supported bundle2-input-part: "output" (advisory) supported
bundle2-input-part: total payload size 45 bundle2-input-part: total payload size 45
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 3 parts total
preparing listkeys for "phases" preparing listkeys for "phases"
sending listkeys command sending listkeys command
devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
devel-peer-request: Vary X-HgArg-1,X-HgProto-1 devel-peer-request: Vary X-HgArg-1,X-HgProto-1
devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
devel-peer-request: 16 bytes of commands arguments in headers devel-peer-request: 16 bytes of commands arguments in headers
devel-peer-request: finished in *.???? seconds (200) (glob) devel-peer-request: finished in *.???? seconds (200) (glob)
received listkey for "phases": 15 bytes received listkey for "phases": 15 bytes

tests/test-lfs-serve-access.t

adding file changes adding file changes
adding lfs.bin revisions adding lfs.bin revisions
bundle2-input-part: total payload size 648 bundle2-input-part: total payload size 648
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 39 bundle2-input-part: total payload size 39
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 4 parts total
checking for updated bookmarks checking for updated bookmarks
updating the branch cache updating the branch cache
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 525251863cad new changesets 525251863cad
updating to branch default updating to branch default
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: 525251863cad ancestor: 000000000000, local: 000000000000+, remote: 525251863cad

tests/test-lfs-test-server.t

add changeset 99a7098854a3 add changeset 99a7098854a3
adding manifests adding manifests
adding file changes adding file changes
adding a revisions adding a revisions
calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs
bundle2-input-part: total payload size 617 bundle2-input-part: total payload size 617
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 4 parts total
updating the branch cache updating the branch cache
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
$ mv .hg/store/lfs_ .hg/store/lfs $ mv .hg/store/lfs_ .hg/store/lfs
Clear the cache to force a download Clear the cache to force a download
$ rm -rf `hg config lfs.usercache` $ rm -rf `hg config lfs.usercache`
$ cd ../repo2 $ cd ../repo2
$ hg update tip --debug $ hg update tip --debug
http auth: user foo, password *** http auth: user foo, password ***
adding manifests adding manifests
adding file changes adding file changes
adding b revisions adding b revisions
adding c revisions adding c revisions
adding d revisions adding d revisions
bundle2-input-part: total payload size 1315 bundle2-input-part: total payload size 1315
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 4 parts total bundle2-input-bundle: 5 parts total
updating the branch cache updating the branch cache
added 1 changesets with 3 changes to 3 files added 1 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
Clear the cache to force a download Clear the cache to force a download
$ rm -rf `hg config lfs.usercache` $ rm -rf `hg config lfs.usercache`
$ hg --repo ../repo1 update tip --debug $ hg --repo ../repo1 update tip --debug
http auth: user foo, password *** http auth: user foo, password ***
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False

tests/test-narrow-widen-no-ellipsis.t

bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "changegroup" (params: * mandatory) supported (glob) bundle2-input-part: "changegroup" (params: * mandatory) supported (glob)
adding changesets adding changesets
adding manifests adding manifests
adding widest/ revisions (tree !) adding widest/ revisions (tree !)
adding file changes adding file changes
adding widest/f revisions adding widest/f revisions
bundle2-input-part: total payload size * (glob) bundle2-input-part: total payload size * (glob)
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
added 0 changesets with 1 changes to 1 files added 0 changesets with 1 changes to 1 files
widest/f: narrowspec updated -> g widest/f: narrowspec updated -> g
getting widest/f getting widest/f
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:widest/f I path:widest/f
$ cat widest/f $ cat widest/f

tests/test-obsolete-changeset-exchange.t

adding file changes adding file changes
adding foo revisions adding foo revisions
bundle2-input-part: total payload size 476 bundle2-input-part: total payload size 476
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 39 bundle2-input-part: total payload size 39
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 4 parts total
checking for updated bookmarks checking for updated bookmarks
updating the branch cache updating the branch cache
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets bec0734cd68e new changesets bec0734cd68e
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-rebase-conflicts.t

adding file changes adding file changes
adding f1.txt revisions adding f1.txt revisions
bundle2-input-part: total payload size 1686 bundle2-input-part: total payload size 1686
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 74 bundle2-input-part: total payload size 74
truncating cache/rbc-revs-v1 to 56 truncating cache/rbc-revs-v1 to 56
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 3 parts total
added 2 changesets with 2 changes to 1 files added 2 changesets with 2 changes to 1 files
updating the branch cache updating the branch cache
invalid branch cache (served): tip differs invalid branch cache (served): tip differs
invalid branch cache (served.hidden): tip differs invalid branch cache (served.hidden): tip differs
rebase completed rebase completed
Test minimization of merge conflicts Test minimization of merge conflicts
$ hg up -q null $ hg up -q null

tests/test-ssh.t

sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "bookmarks" supported bundle2-input-part: "bookmarks" supported
bundle2-input-part: total payload size 26 bundle2-input-part: total payload size 26
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: total payload size 45 bundle2-input-part: total payload size 45
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 72 bundle2-input-part: total payload size 72
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 3 parts total
checking for updated bookmarks checking for updated bookmarks
$ cd $TESTTMP $ cd $TESTTMP
$ cat dummylog $ cat dummylog
Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio Got arguments 1:user@dummy 2:hg -R remote serve --stdio

tests/test-stream-bundle-v2.t

adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (584 bytes)
adding [s] 00changelog.i (595 bytes) adding [s] 00changelog.i (595 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes) adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes) adding [c] rbc-revs-v1 (40 bytes)
transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re) transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re)
bundle2-input-part: total payload size 1840 bundle2-input-part: total payload size 1840
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 2 parts total
checking for updated bookmarks checking for updated bookmarks
updating to branch default updating to branch default
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041
A: remote created -> g A: remote created -> g
getting A getting A
B: remote created -> g B: remote created -> g
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (584 bytes)
adding [s] 00changelog.i (595 bytes) adding [s] 00changelog.i (595 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes) adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes) adding [c] rbc-revs-v1 (40 bytes)
transferred 1.65 KB in *.* seconds (*/sec) (glob) transferred 1.65 KB in *.* seconds (*/sec) (glob)
bundle2-input-part: total payload size 1840 bundle2-input-part: total payload size 1840
bundle2-input-bundle: 0 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 2 parts total
checking for updated bookmarks checking for updated bookmarks
updating to branch default updating to branch default
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041
A: remote created -> g A: remote created -> g
getting A getting A
B: remote created -> g B: remote created -> g