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

adding a

     2

marked working directory as branch b

     3

adding b

     4

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

     5

fast-forward

     6

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

     7

(branch merge, don't forget to commit)

     8

bogus fast-forward should fail

     9

abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'

    10

done