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

# a test for issue586

     3

     4

hg init a

     5

cd a

     6

echo a > a

     7

hg ci -Ama

     8

     9

hg init ../b

    10

cd ../b

    11

echo b > b

    12

hg ci -Amb

    13

    14

hg pull -f ../a

    15

hg merge

    16

hg rm -f a

    17

hg ci -Amc

    18

    19

hg st -A