Skip to content
Snippets Groups Projects
Commit d24573181003 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

repoview: show `extrafilter` misbehave when other filtering is in play

See new changeset for fix and details.
parent 19108906abaf
No related branches found
No related tags found
2 merge requests!647branching: merge stable into default,!636repoview: fix the filter created by `extrafilter`
......@@ -8,5 +8,5 @@
$ cd ..
$ hg init test2
$ cd test2
$ hg incoming http://foo:xyzzy@localhost:$HGPORT/
$ hg incoming http://foo:xyzzy@localhost:$HGPORT/ -T '{desc}\n'
comparing with http://foo:***@localhost:$HGPORT/
......@@ -12,17 +12,8 @@
comparing with http://foo:***@localhost:$HGPORT/
changeset: 0:1ea73414a91b
user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000
summary: r0
changeset: 1:66f7d451a68b
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
r0
r1
$ killdaemons.py
$ cd ..
$ hg -R test --config server.view=immutable serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
......@@ -24,7 +15,7 @@
$ killdaemons.py
$ cd ..
$ hg -R test --config server.view=immutable serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ hg -R test2 incoming http://foo:xyzzy@localhost:$HGPORT/
$ hg -R test2 incoming http://foo:xyzzy@localhost:$HGPORT/ -T '{desc}\n'
comparing with http://foo:***@localhost:$HGPORT/
......@@ -30,10 +21,5 @@
comparing with http://foo:***@localhost:$HGPORT/
changeset: 0:1ea73414a91b
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000
summary: r0
r0
Check same result using `experimental.extra-filter-revs`
......@@ -66,3 +52,69 @@
$ cat errors.log
$ killdaemons.py
Check the behavior is other filtered revision exists
----------------------------------------------------
add more content and complexity to the repository too
$ hg -R test debugbuilddag '+6:branchpoint.:left+4*branchpoint.:right+5' --from-existing
$ hg -R test phase --public 'desc("re:^r11$")'
$ hg -R test phase --secret --force 'desc("re:^r9$")'
$ hg -R test log -G -T '{desc} {phase}\n'
o r17 draft
|
o r16 draft
|
o r15 draft
|
o r14 draft
|
o r13 draft
|
o r12 draft
|
o r11 public
|
| o r10 secret
| |
| o r9 secret
| |
| o r8 draft
| |
| o r7 draft
| |
| o r6 draft
|/
o r5 public
|
o r4 public
|
o r3 public
|
o r2 public
|
o r1 public
|
o r0 public
$ hg -R test --config experimental.extra-filter-revs='(desc("re:^r13$") + desc("re:^r10$"))::' serve -p $HGPORT1 -d --pid-file=hg2.pid -E errors.log
$ cat hg2.pid >> $DAEMON_PIDS
$ hg -R test2 incoming http://foo:xyzzy@localhost:$HGPORT1/ -T '{desc}\n'
comparing with http://foo:***@localhost:$HGPORT1/
r0
r1
r2
r3
r4
r5
r6 (missing-correct-output !)
r7 (missing-correct-output !)
r8 (missing-correct-output !)
r11 (missing-correct-output !)
r12 (missing-correct-output !)
cleanups
$ cat errors.log
$ killdaemons.py
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment