view tests/test-touch.t @ 2957:586c9ace20b3

obslog: simplify formatter keys

The formatter field keys are all prefixed with
`debugobshistory.'. This is annoyingly useless as they are already in
the `debughistory` topic.

This patch simplify these keys. For examle, on this repository `hg obslog -Tdebug -r 31cbace4c0f1` :

```
debugobshistory = [
   {
      'node':'31cbace4c0f1',
      'shortdescription':'topics: make sure we have some restrictions on topic names',
      'rev':2904,
      'markers':[

      ]
   },
   {
      'node':'d439a6087434',
      'markers':[
         {
            'date':(1504176329.83902,
            -7200            ),
            'verb':'rewritten',
            'succnodes':[
               '31cbace4c0f1'
            ],
            'effect':[
               'parent'
            ],
            'user':'Pierre-Yves David <[e-mail]>'
         }
      ]
   },
   {
      'node':'1e1f651704d4',
      'markers':[
         {
            'date':(1504175088.811924,
            -7200            ),
            'verb':'rewritten',
            'succnodes':[
               'd439a6087434'
            ],
            'effect':[
               'parent'
            ],
            'user':'Pierre-Yves David <[e-mail]>'
         }
      ]
   },
   {
      'node':'eb6495cf6cb1',
      'markers':[
         {
            'date':(1504015275.001643,
            -19800            ),
            'verb':'rewritten',
            'succnodes':[
               '1e1f651704d4'
            ],
            'effect':[
               'parent',
               'content'
            ],
            'user':'Pulkit Goyal <[e-mail]>'
         }
      ]
   },
   {
      'node':'761e446e0112',
      'markers':[
         {
            'date':(1504015201.780276,
            -19800            ),
            'verb':'rewritten',
            'succnodes':[
               'eb6495cf6cb1'
            ],
            'effect':[
               'content'
            ],
            'user':'Pulkit Goyal <[e-mail]>'
         }
      ]
   },
   {
      'node':'531a626950bd',
      'markers':[
         {
            'date':(1504015017.897054,
            -19800            ),
            'verb':'rewritten',
            'succnodes':[
               '761e446e0112'
            ],
            'effect':[
               'meta',
               'parent',
               'content'
            ],
            'user':'Pulkit Goyal <[e-mail]>'
         }
      ]
   },
   {
      'node':'c2f9ba7329ea',
      'markers':[
         {
            'date':(1504014136.876537,
            -19800            ),
            'verb':'rewritten',
            'succnodes':[
               '531a626950bd'
            ],
            'effect':[
               'meta'
            ],
            'user':'Pulkit Goyal <[e-mail]>'
         }
      ]
   },

]
```


We now able to ask `hg obslog -r 78debdfb3e4d -T '{label("log.summary", shortdescription)}\n{if(markers, markers % "  {date|age} {user|person}\n")}'`

```
doc: simplify the reference to in-core features

  9 days ago Pierre-Yves David

  9 days ago Pierre-Yves David

  9 days ago Pierre-Yves David

  9 days ago Pierre-Yves David
  9 days ago Philippe Pepiot

  9 days ago Philippe Pepiot
```

  $ cat >> $HGRCPATH <<EOF
  > [ui]
  > logtemplate={rev}:{node|short} {desc}\n
  > [defaults]
  > amend=-d "0 0"
  > [extensions]
  > hgext.rebase=
  > EOF
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

  $ hg init repo
  $ cd repo
  $ echo A > a
  $ hg add a
  $ hg commit -m a

Basic usage

  $ hg log -G
  @  0:[0-9a-f]{12} a (re)
  
  $ hg touch .
  $ hg log -G
  @  1:[0-9a-f]{12} a (re)
  


Revive usage

  $ echo A > b
  $ hg add b
  $ hg commit -m ab --amend
  $ hg up --hidden 1
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (*) (glob)
  (use 'hg evolve' to update to its successor: *) (glob)
  $ hg log -G
  o  2:[0-9a-f]{12} ab (re)
  
  @  1:[0-9a-f]{12} a (re)
  
  $ hg touch .
  [1] a
  reviving this changeset will create divergence unless you make a duplicate.
  (a)llow divergence or (d)uplicate the changeset?  a
  2 new content-divergent changesets
  $ hg log -G
  @  3:[0-9a-f]{12} a (re)
  
  o  2:[0-9a-f]{12} ab (re)
  
  $ hg prune 3
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory now at 000000000000
  1 changesets pruned

Duplicate

  $ hg touch --duplicate .
  $ hg log -G
  @  4:[0-9a-f]{12} (re)
  
  o  2:[0-9a-f]{12} ab (re)
  

Multiple touch

  $ echo C > c
  $ hg add c
  $ hg commit -m c
  $ echo D > d
  $ hg add d
  $ hg commit -m d
  $ hg log -G
  @  6:[0-9a-f]{12} d (re)
  |
  o  5:[0-9a-f]{12} c (re)
  |
  o  4:[0-9a-f]{12} (re)
  
  o  2:[0-9a-f]{12} ab (re)
  
  $ hg touch .^:.
  $ hg log -G
  @  8:[0-9a-f]{12} d (re)
  |
  o  7:[0-9a-f]{12} c (re)
  |
  o  4:[0-9a-f]{12} (re)
  
  o  2:[0-9a-f]{12} ab (re)
  

check move data kept after rebase on touch:

  $ touch gna1
  $ hg commit -Am gna1
  adding gna1
  $ hg mv gna1 gna2
  $ hg commit -m move
  $ hg st -C --change=tip
  A gna2
    gna1
  R gna1
  $ hg up .^
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg touch
  1 new orphan changesets

  $ hg log -G --hidden
  @  11:[0-9a-f]{12} gna1 (re)
  |
  | o  10:[0-9a-f]{12} move (re)
  | |
  | x  9:[0-9a-f]{12} gna1 (re)
  |/
  o  8:[0-9a-f]{12} d (re)
  |
  o  7:[0-9a-f]{12} c (re)
  |
  | x  6:[0-9a-f]{12} d (re)
  | |
  | x  5:[0-9a-f]{12} c (re)
  |/
  o  4:[0-9a-f]{12} (re)
  
  x  3:[0-9a-f]{12} a (re)
  
  o  2:[0-9a-f]{12} ab (re)
  
  x  1:[0-9a-f]{12} a (re)
  
  x  0:[0-9a-f]{12} a (re)
  

  $ hg rebase -s 10 -d 11
  rebasing 10:[0-9a-f]{12} "move" (re)
  $ hg st -C --change=tip
  A gna2
    gna1
  R gna1

check that the --duplicate option does not create divergence

  $ hg touch --duplicate 10 --hidden
  1 new orphan changesets

check that reviving a changeset with no successor does not show the prompt

  $ hg prune 13
  1 changesets pruned
  $ hg touch 13 --hidden
  1 new orphan changesets