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 <pierre-yves.david@octobus.net>' } ] }, { 'node':'1e1f651704d4', 'markers':[ { 'date':(1504175088.811924, -7200 ), 'verb':'rewritten', 'succnodes':[ 'd439a6087434' ], 'effect':[ 'parent' ], 'user':'Pierre-Yves David <pierre-yves.david@octobus.net>' } ] }, { 'node':'eb6495cf6cb1', 'markers':[ { 'date':(1504015275.001643, -19800 ), 'verb':'rewritten', 'succnodes':[ '1e1f651704d4' ], 'effect':[ 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'761e446e0112', 'markers':[ { 'date':(1504015201.780276, -19800 ), 'verb':'rewritten', 'succnodes':[ 'eb6495cf6cb1' ], 'effect':[ 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'531a626950bd', 'markers':[ { 'date':(1504015017.897054, -19800 ), 'verb':'rewritten', 'succnodes':[ '761e446e0112' ], 'effect':[ 'meta', 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'c2f9ba7329ea', 'markers':[ { 'date':(1504014136.876537, -19800 ), 'verb':'rewritten', 'succnodes':[ '531a626950bd' ], 'effect':[ 'meta' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, ] ``` 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 ```

     1

====================================

     2

Testing head checking code: Case B-6

     3

====================================

     4

     5

Mercurial checks for the introduction of new heads on push. Evolution comes

     6

into play to detect if existing branches on the server are being replaced by

     7

some of the new one we push.

     8

     9

This case is part of a series of tests checking this behavior.

    10

    11

Category B: simple case involving pruned changesets

    12

TestCase 6: single changesets, pruned then superseeded (on a new changeset)

    13

    14

.. old-state:

    15

..

    16

.. * 1 changeset branch

    17

..

    18

.. new-state:

    19

..

    20

.. * old branch is rewritten onto another one,

    21

.. * the new version is then pruned.

    22

..

    23

.. expected-result:

    24

..

    25

.. * push allowed

    26

..

    27

.. graph-summary:

    28

..

    29

..   A ø⇠⊗ A'

    30

..     | |

    31

..     | ◔ B

    32

..     |/

    33

..     ●

    34

    35

  $ . $TESTDIR/testlib/push-checkheads-util.sh

    36

    37

Test setup

    38

----------

    39

    40

  $ mkdir B6

    41

  $ cd B6

    42

  $ setuprepos

    43

  creating basic server and client repo

    44

  updating to branch default

    45

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

    46

  $ cd client

    47

  $ hg up 0

    48

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

    49

  $ mkcommit B0

    50

  created new head

    51

  $ mkcommit A1

    52

  $ hg up 'desc(B0)'

    53

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

    54

  $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`

    55

  obsoleted 1 changesets

    56

  $ hg debugobsolete --record-parents `getid "desc(A1)"`

    57

  obsoleted 1 changesets

    58

  $ hg log -G --hidden

    59

  x  ba93660aff8d (draft): A1

    60

  |

    61

  @  74ff5441d343 (draft): B0

    62

  |

    63

  | x  8aaa48160adc (draft): A0

    64

  |/

    65

  o  1e4be0697311 (public): root

    66

    67

    68

Actual testing

    69

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

    70

    71

  $ hg push

    72

  pushing to $TESTTMP/B6/server (glob)

    73

  searching for changes

    74

  adding changesets

    75

  adding manifests

    76

  adding file changes

    77

  added 1 changesets with 1 changes to 1 files (+1 heads)

    78

  2 new obsolescence markers

    79

  obsoleted 1 changesets

    80

    81

  $ cd ../..