Move cmdtable and reposetup handling out of extensions.py A new function (extensions.extensions) allows the code that is interested in those attributes to handle them directly. This allows some cleanups of extensions.py. Notably, we can remove the extensions.commandtable hack. It also makes it easier to add standard extension attributes, like a "hgwebsetup" function or a "helptable" dict that augments the data in help.py, etc.

     1

#!/bin/sh

     2

     3

# 0-2-4

     4

#  \ \ \

     5

#   1-3-5

     6

#

     7

# rename in #1, content change in #4.

     8

     9

hg init t

    10

cd t

    11

    12

touch 1

    13

touch 2

    14

hg commit -Am init -d "0 0"  # 0

    15

    16

hg rename 1 1a

    17

hg commit -m rename -d "0 0" # 1

    18

    19

hg co -C 0

    20

echo unrelated >> 2

    21

hg ci -m unrelated1 -d "0 0"  # 2

    22

    23

hg merge --debug 1

    24

hg ci -m merge1 -d "0 0" # 3

    25

    26

hg co -C 2

    27

echo hello >> 1

    28

hg ci -m unrelated2 -d "0 0" # 4

    29

    30

hg co -C 3

    31

hg merge -y --debug 4

    32

    33

hg co -C 4

    34

hg merge -y --debug 3

    35