view tests/test-histedit-templates.t @ 39110:f0c2653ca706

merge: add tests for commit with no content change

It isn't easy to say when to reuse the p1 manifest. Basically, that's only
when wctx.files() is empty, but we need to know that wctx.files() is not
the same as repo['.'].files() after the commit.

This patch adds several examples of commits with empty ctx/wctx.files().
I don't think this is exhaustive, but it contains at least one failure
mode in which a converted repo result in a different hash.

I also note that the manifest revlog does NOT follow the DAG shape of the
changelog since p1 manifest is reused if wctx.files() is empty even at merge.
I don't know whether it is intentional or not, but it's the behavior since
2011, 301725c3df9a "localrepo: reuse parent manifest in commitctx if no files
have changed."

Testing templating for histedit command

Setup

  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > histedit=
  > [experimental]
  > evolution=createmarkers
  > EOF

  $ hg init repo
  $ cd repo
  $ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done

  $ hg log -G -T "{rev}:{node|short} {desc}"
  @  3:62615734edd5 Added d
  |
  o  2:28ad74487de9 Added c
  |
  o  1:29becc82797a Added b
  |
  o  0:18d04c59bb5d Added a
  
Getting the JSON output for nodechanges

  $ hg histedit -Tjson --commands - 2>&1 <<EOF
  > pick 28ad74487de9 Added c
  > pick 62615734edd5 Added d
  > pick 18d04c59bb5d Added a
  > pick 29becc82797a Added b
  > EOF
  [
   {
    "nodechanges": {"18d04c59bb5d2d4090ad9a5b59bd6274adb63add": ["109f8ec895447f81b380ba8d4d8b66539ccdcb94"], "28ad74487de9599d00d81085be739c61fc340652": ["bff9e07c1807942b161dab768aa793b48e9a7f9d"], "29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["f5dcf3b4db23f31f1aacf46c33d1393de303d26f"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["201423b441c84d9e6858daed653e0d22485c1cfa"]}
   }
  ]

  $ hg log -G -T "{rev}:{node|short} {desc}"
  @  7:f5dcf3b4db23 Added b
  |
  o  6:109f8ec89544 Added a
  |
  o  5:201423b441c8 Added d
  |
  o  4:bff9e07c1807 Added c
  
  $ hg histedit -T "{nodechanges|json}" --commands - 2>&1 <<EOF
  > pick bff9e07c1807 Added c
  > pick 201423b441c8 Added d
  > pick 109f8ec89544 Added a
  > roll f5dcf3b4db23 Added b
  > EOF
  {"109f8ec895447f81b380ba8d4d8b66539ccdcb94": ["8d01470bfeab64d3de13c49adb79d88790d38396"], "f3ec56a374bdbdf1953cacca505161442c6f3a3e": [], "f5dcf3b4db23f31f1aacf46c33d1393de303d26f": ["8d01470bfeab64d3de13c49adb79d88790d38396"]} (no-eol)