$ . "$TESTDIR/testlib/topic_setup.sh"

Initial setup

  $ cat << EOF >> $HGRCPATH

  > [ui]

  > logtemplate = {rev} {branch} \{{get(namespaces, "topics")}} {phase} {desc|firstline}\n

  > [experimental]

  > evolution=all

  > EOF

  $ hg init main

  $ cd main

  $ hg topic other

  marked working directory as topic: other

  $ echo aaa > aaa

  $ hg add aaa

  $ hg commit -m c_a

  active topic 'other' grew its first changeset

  (see 'hg help topics' for more information)

  $ echo aaa > bbb

  $ hg add bbb

  $ hg commit -m c_b

  $ hg topic foo

  $ echo aaa > ccc

  $ hg add ccc

  $ hg commit -m c_c

  active topic 'foo' grew its first changeset

  (see 'hg help topics' for more information)

  $ echo aaa > ddd

  $ hg add ddd

  $ hg commit -m c_d

  $ echo aaa > eee

  $ hg add eee

  $ hg commit -m c_e

  $ echo aaa > fff

  $ hg add fff

  $ hg commit -m c_f

  $ hg log -G

  @  5 default {foo} draft c_f

  |

  o  4 default {foo} draft c_e

  |

  o  3 default {foo} draft c_d

  |

  o  2 default {foo} draft c_c

  |

  o  1 default {other} draft c_b

  |

  o  0 default {other} draft c_a

Check that topic without any parent does not crash --list

---------------------------------------------------------

  $ hg up other

  switching to topic other

  0 files updated, 0 files merged, 4 files removed, 0 files unresolved

  $ hg topic --list

  ### topic: other

  ### target: default (branch)

  s2@ c_b (current)

  s1: c_a

  $ hg phase --public 'topic("other")'

  active topic 'other' is now empty

  (use 'hg topic --clear' to clear it if needed)

After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case.

  $ hg topic

     foo   (4 changesets)

   * other (0 changesets)

  $ hg stack

  ### topic: other

  ### target: default (branch)

  (stack is empty)

  s0^ c_b (base current)

  $ hg up foo

  switching to topic foo

  4 files updated, 0 files merged, 0 files removed, 0 files unresolved

Simple test

-----------

'hg stack' list all changeset in the topic

  $ hg topic

   * foo (4 changesets)

  $ hg stack

  ### topic: foo

  ### target: default (branch)

  s4@ c_f (current)

  s3: c_e

  s2: c_d

  s1: c_c

  s0^ c_b (base)

  $ hg stack -v

  ### topic: foo

  ### target: default (branch)

  s4(6559e6d93aea)@ c_f (current)

  s3(0f9ac936c87d): c_e

  s2(e629654d7050): c_d

  s1(8522f9e3fee9): c_c

  s0(ea705abc4f51)^ c_b (base)

  $ hg stack -Tjson | python -m json.tool

  [

      {

          "isentry": true,

          "topic.stack.desc": "c_f",

          "topic.stack.index": 4,

          "topic.stack.state": [

              "current"

          ],

          "topic.stack.state.symbol": "@"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_e",

          "topic.stack.index": 3,

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_d",

          "topic.stack.index": 2,

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_c",

          "topic.stack.index": 1,

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": false,

          "topic.stack.desc": "c_b",

          "topic.stack.index": 0,

          "topic.stack.state": [

              "base"

          ],

          "topic.stack.state.symbol": "^"

      }

  ]

  $ hg stack -v -Tjson | python -m json.tool

  [

      {

          "isentry": true,

          "topic.stack.desc": "c_f",

          "topic.stack.index": 4,

          "topic.stack.shortnode": "6559e6d93aea",

          "topic.stack.state": [

              "current"

          ],

          "topic.stack.state.symbol": "@"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_e",

          "topic.stack.index": 3,

          "topic.stack.shortnode": "0f9ac936c87d",

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_d",

          "topic.stack.index": 2,

          "topic.stack.shortnode": "e629654d7050",

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": true,

          "topic.stack.desc": "c_c",

          "topic.stack.index": 1,

          "topic.stack.shortnode": "8522f9e3fee9",

          "topic.stack.state": [

              "clean"

          ],

          "topic.stack.state.symbol": ":"

      },

      {

          "isentry": false,

          "topic.stack.desc": "c_b",

          "topic.stack.index": 0,

          "topic.stack.shortnode": "ea705abc4f51",

          "topic.stack.state": [

              "base"

          ],

          "topic.stack.state.symbol": "^"

      }

  ]

check that topics and stack are available even if ui.strict=true

  $ hg topics

   * foo (4 changesets)

  $ hg stack

  ### topic: foo

  ### target: default (branch)

  s4@ c_f (current)

  s3: c_e

  s2: c_d

  s1: c_c

  s0^ c_b (base)

  $ hg topics --config ui.strict=true

   * foo (4 changesets)

  $ hg stack --config ui.strict=true

  ### topic: foo

  ### target: default (branch)

  s4@ c_f (current)

  s3: c_e

  s2: c_d

  s1: c_c

  s0^ c_b (base)

merge case (displaying info about external)

-------------------------------------------

  $ hg up default

  0 files updated, 0 files merged, 4 files removed, 0 files unresolved

  $ hg topics zzz

  marked working directory as topic: zzz

  $ echo zzz > zzz

  $ hg add zzz

  $ hg commit -m zzz_a

  active topic 'zzz' grew its first changeset

  (see 'hg help topics' for more information)

  $ hg merge foo

  4 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg commit -m "merged foo"

stack -m display data about child

  $ hg stack foo

  ### topic: foo

  ### target: default (branch)

  s4: c_f

  s3: c_e

  s2: c_d

  s1: c_c

  s0^ c_b (base)

  $ hg stack foo --children

  ### topic: foo

  ### target: default (branch)

  s4: c_f (external-children)

  s3: c_e

  s2: c_d

  s1: c_c

  s0^ c_b (base)

error case, nothing to list

  $ hg strip --config extensions.strip= t1 --no-backup

  0 files updated, 0 files merged, 5 files removed, 0 files unresolved

  $ hg up foo

  switching to topic foo

  4 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg topic --clear

  $ hg stack

  ### target: default (branch)

  (stack is empty)

  s0^ c_f (base current)

Test "t#" reference

-------------------

  $ hg up s2

  abort: cannot resolve "s2": branch "default" has only 0 non-public changesets

  [255]

  $ hg topic foo

  marked working directory as topic: foo

  $ hg up t42

  abort: cannot resolve "t42": topic "foo" has only 4 changesets

  [255]

  $ hg up s42

  abort: cannot resolve "s42": topic "foo" has only 4 changesets

  [255]

  $ hg up s2

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ hg summary

  parent: 3:e629654d7050 

   c_d

  branch: default

  commit: (clean)

  update: (current)

  phases: 4 draft

  topic:  foo

Case with some of the topic unstable

------------------------------------

  $ echo bbb > ddd

  $ hg commit --amend

  2 new orphan changesets

  $ hg log -G

  @  6 default {foo} draft c_d

  |

  | *  5 default {foo} draft c_f

  | |

  | *  4 default {foo} draft c_e

  | |

  | x  3 default {foo} draft c_d

  |/

  o  2 default {foo} draft c_c

  |

  o  1 default {} public c_b

  |

  o  0 default {} public c_a

  $ hg topic --list

  ### topic: foo

  ### target: default (branch)

  s4$ c_f (unstable)

  s3$ c_e (unstable)

  s2@ c_d (current)

  s1: c_c

  s0^ c_b (base)

  $ hg up s3

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg topic --list

  ### topic: foo

  ### target: default (branch)

  s4$ c_f (unstable)

  s3$ c_e (current unstable)

  s2: c_d

  s1: c_c

  s0^ c_b (base)

  $ hg topic --list --color=debug

  [topic.stack.summary.topic|### topic: [topic.active|foo]]

  [topic.stack.summary.branches|### target: default (branch)]

  [topic.stack.index topic.stack.index.unstable|s4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)]

  [topic.stack.index topic.stack.index.current topic.stack.index.unstable|s3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)]

  [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d]

  [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c]

  [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)]

  $ hg up s2

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

Also test the revset:

  $ hg log -r 'stack()'

  2 default {foo} draft c_c

  6 default {foo} draft c_d

  4 default {foo} draft c_e

  5 default {foo} draft c_f

  $ hg log -r 'stack(foo)'

  hg: parse error: stack() takes no argument, it works on current topic

  [255]

  $ hg log -r 'stack(foobar)'

  hg: parse error: stack() takes no argument, it works on current topic

  [255]

Case with multiple heads on the topic

-------------------------------------

Make things linear again

  $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'

  rebasing 4:0f9ac936c87d "c_e" (foo)

  rebasing 5:6559e6d93aea "c_f" (foo)

  $ hg log -G

  o  8 default {foo} draft c_f

  |

  o  7 default {foo} draft c_e

  |

  @  6 default {foo} draft c_d

  |

  o  2 default {foo} draft c_c

  |

  o  1 default {} public c_b

  |

  o  0 default {} public c_a

Create the second branch

  $ hg up 'desc(c_d)'

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo aaa > ggg

  $ hg add ggg

  $ hg commit -m c_g

  $ echo aaa > hhh

  $ hg add hhh

  $ hg commit -m c_h

  $ hg log -G

  @  10 default {foo} draft c_h

  |

  o  9 default {foo} draft c_g

  |

  | o  8 default {foo} draft c_f

  | |