Commit 24bed7b8 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: drop 3.7 compatibility for log -G missing parent edge

parent 20998c86dde5
Pipeline #23358 passed with stage
in 6 minutes and 27 seconds
......@@ -4,8 +4,6 @@ Tests for changing and clearing topics
$ . "$TESTDIR/testlib/topic_setup.sh"
$ cat <<EOF >> $HGRCPATH
> [experimental]
> # disable the new graph style until we drop 3.7 support
> graphstyle.missing = |
> evolution=createmarkers, allowunstable
> [phases]
> publish=false
......@@ -143,7 +141,7 @@ Changing topic using --current flag
$ hg glog -r .
@ 20:c2d6b7df5dcf {foobar}
| Added h ()
|
~
Changing topic in between the stack
......@@ -228,7 +226,7 @@ When the changeset has a topic and we have different active topic
$ hg glog -r .
@ 28:61470c956807 {wat}
| Added h ()
|
~
Clear the current topic and amending
......@@ -237,7 +235,7 @@ Clear the current topic and amending
$ hg glog -r .
@ 29:b584fa49f42e {}
| Added h ()
|
~
When the changeset does not has a topic but we have an active topic
......@@ -249,7 +247,7 @@ When the changeset does not has a topic but we have an active topic
$ hg glog -r .
@ 30:a24c31c35013 {watwat}
| Added h ()
|
~
Testing changing topics on public changeset
-------------------------------------------
......
......@@ -11,13 +11,10 @@ Setup
> EOF
$ cat <<EOF >> $HGRCPATH
> [experimental]
> # disable the new graph style until we drop 3.7 support
> graphstyle.missing = |
> # turn evolution on
> evolution=all
> EOF
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
......
......@@ -6,11 +6,6 @@
> [phases]
> publish=false
> EOF
$ cat <<EOF >> $HGRCPATH
> [experimental]
> # disable the new graph style until we drop 3.7 support
> graphstyle.missing = |
> EOF
$ hg help -e topic
topic extension - support for topic branches
......@@ -522,9 +517,9 @@ Because the change is public, we won't inherit the topic from narf.
|
o changeset: 4:fb147b0b417c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on narf
|
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: start on narf
$ hg push -f ../pinky -r query
pushing to ../pinky
......@@ -552,16 +547,16 @@ Because the change is public, we won't inherit the topic from narf.
|
| o changeset: 5:0469d521db49
| | topic: fran
| | parent: 3:a53952faf762
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: start on fran
| |
o | changeset: 4:fb147b0b417c
|/ user: test
| ~ parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on narf
| summary: start on fran
|
o changeset: 4:fb147b0b417c
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: start on narf
$ hg topics
* query (1 changesets)
......@@ -633,16 +628,16 @@ narf commits public:
|
| o changeset: 5:0469d521db49
| | topic: fran
| | parent: 3:a53952faf762
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: start on fran
| |
o | changeset: 4:fb147b0b417c
|/ user: test
| ~ parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on narf
| summary: start on fran
|
o changeset: 4:fb147b0b417c
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: start on narf
$ cd ../brain
$ hg topics
......@@ -682,12 +677,12 @@ We can pull in the draft-phase change and we get the new topic
$ hg log -Gr 'draft()'
o changeset: 9:0469d521db49
| tag: tip
| topic: fran
| parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on fran
|
~ topic: fran
parent: 3:a53952faf762
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: start on fran
query is not an open topic, so when we clear the current topic it'll
fade out:
......@@ -701,12 +696,12 @@ Topic revset
$ hg log -r 'topic()' -G
o changeset: 9:0469d521db49
| tag: tip
| topic: fran
| parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on fran
|
~ topic: fran
parent: 3:a53952faf762
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: start on fran
$ hg log -r 'not topic()' -G
o changeset: 8:ae074045b7a7
|\ parent: 7:54c943c1c167
......@@ -763,22 +758,22 @@ This regexp should match the topic `fran`:
$ hg log -r 'topic("re:.ra.")' -G
o changeset: 9:0469d521db49
| tag: tip
| topic: fran
| parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on fran
|
~ topic: fran
parent: 3:a53952faf762
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: start on fran
Exact match on fran:
$ hg log -r 'topic(fran)' -G
o changeset: 9:0469d521db49
| tag: tip
| topic: fran
| parent: 3:a53952faf762
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: start on fran
|
~ topic: fran
parent: 3:a53952faf762
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: start on fran
Match current topic:
$ hg topic
......@@ -851,17 +846,17 @@ Deactivate the topic.
|
| o changeset: 10:de75ec1bdbe8
| | parent: 8:ae074045b7a7
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: non-topic
| |
o | changeset: 9:0469d521db49
| | topic: fran
| | parent: 3:a53952faf762
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: start on fran
| |
| ~ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: non-topic
|
o changeset: 9:0469d521db49
| topic: fran
~ parent: 3:a53952faf762
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: start on fran
$ hg topics
fran (1 changesets)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment