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

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     2

warning: conflicts during merge.

     3

merging a

     4

merging a failed!

     5

0 files updated, 0 files merged, 0 files removed, 1 files unresolved

     6

There are unresolved merges, you can redo the full merge using:

     7

  hg update -C 2

     8

  hg merge 1

     9

e7fe8eb3e180+0d24b7662d3e+ tip

    10

<<<<<<< my

    11

something else

    12

=======

    13

something

    14

>>>>>>> other

    15

M a