merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

     1

  $ "$TESTDIR/hghave" execbit || exit 80

     2

     3

  $ hg init repo

     4

  $ cd repo

     5

  $ echo foo > foo

     6

  $ chmod 644 foo

     7

  $ hg ci -qAm '644'

     8

     9

  $ chmod 755 foo

    10

  $ hg ci -qAm '755'

    11

    12

reverting to rev 0

    13

    14

  $ hg revert -a -r 0

    15

  reverting foo

    16

  $ hg st

    17

  M foo

    18

  $ hg diff --git

    19

  diff --git a/foo b/foo

    20

  old mode 100755

    21

  new mode 100644

    22

    23

  $ cd ..