log: add obsfate by default in changeset printer Having an obsfate by default in log will be useful for users to understand why they have obsolete and unstable changesets. Obsfate will only be shown for obsolete changesets, which only happens if people opt-in to experimental feature. But when obsolete changeset are visible, it is very useful to understand where they are. Having it in log could be sufficient for most people, so they don't have to learn a new command (like obslog which is itself useful in case of divergences). For example, when pulling and working directory parent become obsolete: $ hg pull ... working directory parent is obsolete! (f936c1697205) This message comes from the Evolve extension. Obsfate would comes handy: $ hg log -G o changeset: 2:6f91013c5136 | tag: tip | parent: 0:4ef7b558f3ec | user: Boris Feld <boris.feld@octobus.net> | date: Mon Oct 09 16:00:27 2017 +0200 | summary: A | | @ changeset: 1:f936c1697205 |/ user: Boris Feld <boris.feld@octobus.net> | date: Mon Oct 09 16:00:27 2017 +0200 | obsfate: rewritten using amend as 2:6f91013c5136 | summary: -A | o changeset: 0:feb4dd822b8c user: Boris Feld <boris.feld@octobus.net> date: Tue Oct 09 16:00:00 2017 +0200 summary: ROOT And once we update, we don't have an obsolete changeset in the log anymore so we don't show obsfate anymore, most users won't see obsfate often if they don't have obsolete changeset often: @ changeset: 2:6f91013c5136 | tag: tip | parent: 0:4ef7b558f3ec | user: Boris Feld <boris.feld@octobus.net> | date: Mon Oct 09 16:00:27 2017 +0200 | summary: A | o changeset: 0:feb4dd822b8c user: Boris Feld <boris.feld@octobus.net> date: Tue Oct 09 16:00:00 2017 +0200 summary: ROOT

     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 ../..