commands: drop old bw-compat (should have been gone in 1.0)
M hgext3rd/confman/commands.py +3 -3
@@ 17,7 17,7 @@ from mercurial import registrar
 command = registrar.command(cmdtable)
 
 
-@command('cfensureconf|ensureconf',
+@command('cfensureconf',
          DEFAULTOPTS + REMOTEOPTS + [
              ('s', 'share-path', '', 'specify share path'),
              ('', 'keep-descendant', False,

          
@@ 71,7 71,7 @@ def ensureconf(ui, repo, *args, **opts):
 
 # baseline
 
-@command('cfbaseline|baseline',
+@command('cfbaseline',
          DEFAULTOPTS + [
              ('', 'force-hgconf', False, 'force the generation of an .hgconf file'),
              ('', 'propagate', False, 'edit inner configuration also')])

          
@@ 357,7 357,7 @@ def newarchive(ui, repo, dest, *args, **
 
 # broadcast
 
-@command('cfbroadcast|broadcast', DEFAULTOPTS + [
+@command('cfbroadcast', DEFAULTOPTS + [
     ('e', 'execute', [], 'execute command')])
 def broadcast(ui, repo, *args, **opts):
     """execute a shell command in the context of managed repositories

          
M hgext3rd/confman/configuration.py +1 -1
@@ 302,7 302,7 @@ class configurationmanager(object):
     def snapshot(self):
         "DEPRECATED. Do not use."
         ui = self.ui
-        ui.write('`hg snapshot` is deprecated, see `hg baseline`\n')
+        ui.write('`hg snapshot` is deprecated, see `hg cfbaseline`\n')
 
         if not os.path.exists(os.path.join(self.rootpath, '.hgsnap')):
             ui.status('populating .hgsnap for the first time\n')

          
M tests/test-archive.t +2 -2
@@ 58,7 58,7 @@ Prepare configuration repos (also at 0.1
   > track = 0
   > EOF
   $ hg add .hgconf
-  $ hg ensure
+  $ hg cfensure
   cloning lib1 from $TESTTMP/lib1 to $TESTTMP/libs/lib1
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 73,7 73,7 @@ Prepare configuration repos (also at 0.1
   updating to 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to 0.1.0/default from 68f1e6a871f275e4ba08b2bce7db0a0edc33084e/default
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   lib1 : 0.1.0
   lib2 : 0.1.0

          
M tests/test-baseline.t +11 -11
@@ 53,7 53,7 @@ Prepare configurations
   $ hg ci -m 'track init'
   $ hg tag init
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfsummary
   app
   |- main (default public) init  ok

          
@@ 89,7 89,7 @@ Update every managed repository (non-con
 
 Now we update the configurations
 
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   main : zero
 

          
@@ 101,7 101,7 @@ Now we update the configurations
   $ hg -R grsubsubs -q phase -p .
 
   $ hg -R subsubs -q up -r 'desc("Added tag init")'
-  $ hg -R subsubs baseline
+  $ hg -R subsubs cfbaseline
   The following entries have been updated:
   subsub1 : zero
   subsub2 : zero

          
@@ 112,7 112,7 @@ Now we update the configurations
   $ hg -R subsubs -q phase -p .
 
   $ hg -R subs -q up -r 'desc("Added tag init")'
-  $ hg -R subs baseline
+  $ hg -R subs cfbaseline
   The following entries have been updated:
   sub1 : zero
   sub2 : zero

          
@@ 123,7 123,7 @@ Now we update the configurations
   $ hg -R subs -q phase -p .
 
 
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   subs : zero
   $ hg cfsumm

          
@@ 147,7 147,7 @@ Test --propagate
 
 Update `main`, `subsub1, `subsub3` and `sub1` repositories up to tag "one"
 
-  $ hg broadcast -I main -I subsub1 -I subsub3 -I sub1 -e 'hg up one' >/dev/null
+  $ hg cfbroadcast -I main -I subsub1 -I subsub3 -I sub1 -e 'hg up one' >/dev/null
   $ hg cfsummary
   app
   |- main (default public) one  [at descendant of 'zero']

          
@@ 166,7 166,7 @@ updated.
 
 ###############################################################################
 
-  $ hg baseline --propagate >/dev/null
+  $ hg cfbaseline --propagate >/dev/null
 
   $ hg cfsummary
   app

          
@@ 192,23 192,23 @@ Now we update the sub-configurations by 
   $ hg -R $TESTTMP/app/grsubsubs ci -m one >/dev/null
   $ hg -R $TESTTMP/app/grsubsubs tag one >/dev/null
   $ hg -R $TESTTMP/app/grsubsubs up one >/dev/null # should be at the right cset to use baseline propagate
-  $ hg baseline --propagate  >/dev/null
+  $ hg cfbaseline --propagate  >/dev/null
 
   $ hg -R $TESTTMP/app/subsubs up tip >/dev/null # tip is cset that added tag zero
   $ hg -R $TESTTMP/app/subsubs ci -m one >/dev/null
   $ hg -R $TESTTMP/app/subsubs tag one >/dev/null
   $ hg -R $TESTTMP/app/subsubs up one >/dev/null # should be at the right cset to use baseline propagate
-  $ hg baseline --propagate  >/dev/null
+  $ hg cfbaseline --propagate  >/dev/null
 
   $ hg -R $TESTTMP/app/subs up tip >/dev/null
   $ hg -R $TESTTMP/app/subs ci -m one >/dev/null
   $ hg -R $TESTTMP/app/subs tag one >/dev/null
   $ hg -R $TESTTMP/app/subs up one  >/dev/null # should be at the right cset to use baseline propagate
-  $ hg baseline --propagate  >/dev/null
+  $ hg cfbaseline --propagate  >/dev/null
 
   $ hg ci -m one;
   $ hg tag one
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfsummary
   app
   |- main (default public) one  ok

          
M tests/test-broadcast.t +7 -7
@@ 39,7 39,7 @@ Prepare configuration repo
   > my.perso = true
   > hgrc.paths.default-push = /dev/null
   > EOF
-  $ hg ensure
+  $ hg cfensure
   cloning managed1 from ../foo to $TESTTMP/conf/managed/managed1
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 52,13 52,13 @@ Prepare configuration repo
 
 Broadcast empty command
   $ cd $TESTTMP/conf
-  $ hg broadcast
+  $ hg cfbroadcast
   nothing to execute
 
 
 Simple broadcast that checks the paths
   $ cd $TESTTMP/conf
-  $ hg broadcast -e "hg paths"
+  $ hg cfbroadcast -e "hg paths"
   managed1
   default = $TESTTMP/foo
   managed2

          
@@ 67,7 67,7 @@ Simple broadcast that checks the paths
 
 Test placeholders: display data
   $ cd $TESTTMP/conf
-  $ hg broadcast -e 'echo %(section)s %(layout)s %(pulluri)s %(my.perso)s'
+  $ hg cfbroadcast -e 'echo %(section)s %(layout)s %(pulluri)s %(my.perso)s'
   managed1
   managed1 managed/managed1 ../foo false
   managed2

          
@@ 78,7 78,7 @@ Test placeholders: extract all archives
   $ cd $TESTTMP
   $ mkdir pub
   $ cd $TESTTMP/conf
-  $ hg broadcast -e "hg archive --prefix=%(layout)s $TESTTMP/pub/%(section)s.zip"
+  $ hg cfbroadcast -e "hg archive --prefix=%(layout)s $TESTTMP/pub/%(section)s.zip"
   managed1
   managed2
   $ cd $TESTTMP/pub

          
@@ 98,7 98,7 @@ Test placeholders: extract all archives
 
 Test placeholders: parameter not available in every section
   $ cd $TESTTMP/conf
-  $ hg broadcast -e 'echo %(hgrc.paths.default-push)s'
+  $ hg cfbroadcast -e 'echo %(hgrc.paths.default-push)s'
   managed1
   skip managed1: unknown parameter 'hgrc.paths.default-push'
   managed2

          
@@ 107,7 107,7 @@ Test placeholders: parameter not availab
 
 Test placeholders: unknown parameter
   $ cd $TESTTMP/conf
-  $ hg broadcast -e 'echo %(unknownparameter)s'
+  $ hg cfbroadcast -e 'echo %(unknownparameter)s'
   managed1
   skip managed1: unknown parameter 'unknownparameter'
   managed2

          
M tests/test-cffiles.t +1 -1
@@ 53,7 53,7 @@ Prepare configurations
   $ hg ci -m 'track one'
   $ hg tag one
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfsummary
   app
   |- main (default public) one  ok

          
M tests/test-confman.t +31 -31
@@ 68,8 68,8 @@ Create working conf
   > track = quux-version-1.0
   > EOF
 
-First ensureconf
-  $ hg ensureconf
+First cfensureconf
+  $ hg cfensureconf
   cloning foo from $TESTTMP/foo to $TESTTMP/conf/foo
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 117,7 117,7 @@ First ensureconf
 
 First snapshot
   $ hg debugsnapshot
-  `hg snapshot` is deprecated, see `hg baseline`
+  `hg snapshot` is deprecated, see `hg cfbaseline`
   populating .hgsnap for the first time
   new snapshot in .hgsnap
   $ cat .hgsnap

          
@@ 167,13 167,13 @@ Grow a bit foo and quux
   $ hg parent
   00210b48a6d3 (draft): Added tag quux-version-2.0 for changeset 039d61f282bb
 
-Check ensureconf (should remain still)
+Check cfensureconf (should remain still)
   $ cd $TESTTMP/conf
   $ hg -R bar/quux path
   default = $TESTTMP/quux
-  $ hg ensureconf -I foo
+  $ hg cfensureconf -I foo
   foo
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   bar.quux
 

          
@@ 200,10 200,10 @@ Update, snapshot and rewind
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd bar
   $ hg debugsnapshot -I something
-  `hg snapshot` is deprecated, see `hg baseline`
+  `hg snapshot` is deprecated, see `hg cfbaseline`
   nothing changed
   $ hg debugsnapshot -I quux
-  `hg snapshot` is deprecated, see `hg baseline`
+  `hg snapshot` is deprecated, see `hg cfbaseline`
   new snapshot in .hgsnap
   $ hg diff
   diff --git a/.hgsnap b/.hgsnap

          
@@ 214,7 214,7 @@ Update, snapshot and rewind
   +039d61f282bba2568097f09aa7707de56ce27b8e bar/quux
    11aceb0f834624f90c1cac5cecc9b09fd28df45f foo
   $ hg debugsnap -I foo
-  `hg snapshot` is deprecated, see `hg baseline`
+  `hg snapshot` is deprecated, see `hg cfbaseline`
   nothing changed
   $ hg diff
   diff --git a/.hgsnap b/.hgsnap

          
@@ 227,21 227,21 @@ Update, snapshot and rewind
   $ hg ci -m 'new state captured'
   $ hg up tip~1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   bar.quux
   updating to 260f39052d20688740dcfd60587722e36bacdb54
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   updated to quux-version-1.0/default from quux-version-2.0/default
   $ hg debugsnapshot
-  `hg snapshot` is deprecated, see `hg baseline`
+  `hg snapshot` is deprecated, see `hg cfbaseline`
   nothing changed
 
-More ensure
+More cfensure
   $ cd $TESTTMP/conf
   $ hg up 1 -R bar/quux
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg ensure
+  $ hg cfensure
   foo
   bar.quux
   updating to 260f39052d20688740dcfd60587722e36bacdb54

          
@@ 249,9 249,9 @@ More ensure
   updated to quux-version-1.0/default from 54db6de36b302553d66907acda9fcdf745150485/default
   $ hg up 1 -R bar/quux
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg ensure -I foo
+  $ hg cfensure -I foo
   foo
-  $ hg ensure -I bar
+  $ hg cfensure -I bar
   bar.quux
   updating to 260f39052d20688740dcfd60587722e36bacdb54
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

          
@@ 260,7 260,7 @@ More ensure
 Ensure it works from any dir (that is not a managed repo)
   $ mkdir bogusdir
   $ cd bogusdir
-  $ hg ensure
+  $ hg cfensure
   foo
   bar.quux
   $ cd ..

          
@@ 279,7 279,7 @@ Clone missing
   > pulluri = $TESTTMP/newcomer
   > layout = newcomer
   > EOF
-  $ hg ensure -I newcomer
+  $ hg cfensure -I newcomer
   cloning newcomer from $TESTTMP/newcomer to $TESTTMP/conf/newcomer
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 332,7 332,7 @@ Guard against missing hgrc.path.default 
   > review = http://hg.logilab.org/review/newcomer
   > EOF
   $ cd $TESTTMP/conf
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   bar.quux
   updating to 039d61f282bba2568097f09aa7707de56ce27b8e

          
@@ 347,7 347,7 @@ More configuration check: hard errors
   > #pulluri = $TESTTMP/newcomer
   > #layout = newcomer
   > EOF
-  $ hg ensureconf
+  $ hg cfensureconf
   You must complete the configuration before using it. See:
   error: newcomer.pulluri is missing
   error: newcomer.layout is missing

          
@@ 363,7 363,7 @@ More configuration check: hard errors
 Bad uris all over the place
   $ hg revert .
   reverting .hgconf
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   bar.quux
   newcomer

          
@@ 376,13 376,13 @@ Bad uris all over the place
   > [paths]
   > review = http://nonsense.pulluri
   > EOF
-  $ hg ensureconf
+  $ hg cfensureconf
   newcomer
 
 Unrelated repository uri
   $ hg revert .
   reverting .hgconf
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   bar.quux
   newcomer

          
@@ 393,7 393,7 @@ Unrelated repository uri
   > EOF
   $ cat > newcomer/.hg/hgrc << EOF
   > EOF
-  $ hg ensureconf
+  $ hg cfensureconf
   newcomer
   $ hg cfpull
   newcomer

          
@@ 415,23 415,23 @@ Don't choke on unreachable repo
   conf
   |- newcomer (default public) tip [no snapshot] [no baseline]
   bogosection repository at "$TESTTMP/conf/bogo" not found
-  $ hg ensure
+  $ hg cfensure
   cloning bogosection from /an/unlikely/path to $TESTTMP/conf/bogo
   repository /an/unlikely/path not found
   newcomer
-  $ hg ensure
+  $ hg cfensure
   cloning bogosection from /an/unlikely/path to $TESTTMP/conf/bogo
   repository /an/unlikely/path not found
   newcomer
 
 Check baseline command
   $ cd $TESTTMP/conf
-  $ hg baseline
+  $ hg cfbaseline
   bogosection repository at "$TESTTMP/conf/bogo" not found
   Nothing to do.
   $ hg rev .
   reverting .hgconf
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   foo
   The following entries have been updated:

          
@@ 442,7 442,7 @@ Check baseline command
   $ hg tag a-new-tag-for-foo
   $ hg up a-new-tag-for-foo
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg baseline
+  $ hg cfbaseline
   found configuration repo at $TESTTMP/conf
   The following entries have been updated:
   foo : a-new-tag-for-foo

          
@@ 475,7 475,7 @@ Kill ".hgsnap" and use only the baseline
   $ cat >> .hgconf << EOF
   > track = 0
   > EOF
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   newcomer
   The following entries have been updated:

          
@@ 503,7 503,7 @@ Check "baseline" won't track uncommitted
   abort: outstanding uncommitted merge
   [255]
   $ cd $TESTTMP/conf
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   newcomer
   Nothing to do.

          
@@ 521,7 521,7 @@ Let's try cfpush
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd clone
-  $ hg ensure
+  $ hg cfensure
   cloning foo from $TESTTMP/foo to $TESTTMP/clone/foo
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
M tests/test-ensureconf.t +29 -29
@@ 62,7 62,7 @@ Try with wrong configuration
 For now there is no .hgconf file.
 
   $ cd $TESTTMP/app
-  $ hg ensureconf
+  $ hg cfensureconf
   abort: cannot find an .hgconf file in the path and parents up to the root
   (see hg help confman)
   [255]

          
@@ 72,14 72,14 @@ Add an emtpy configuration
   $ touch .hgconf
   $ hg add .hgconf
   $ hg ci -m 'emtpy hgconf'
-  $ hg ensure conf
+  $ hg cfensure conf
 
 
 Add an bad configuration
 
   $ echo "something wrong" > .hgconf
   $ hg ci -m 'wrong hgconf'
-  $ hg ensure conf
+  $ hg cfensure conf
   hg: parse error at $TESTTMP/app/.hgconf:1: something wrong
   [255]
 

          
@@ 93,7 93,7 @@ revision is updated because track is a r
 
   $ mkhgconfsection main $TESTTMP/main main 'desc(zero)' > .hgconf
   $ hg ci -m 'add main'
-  $ hg ensureconf
+  $ hg cfensureconf
   cloning main from $TESTTMP/main to $TESTTMP/app/main
   updating to branch default
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 112,7 112,7 @@ set main at tag one.
   $ mkhgconfsectionwithexpand confs.exts $TESTTMP/exts confs/exts zero >> .hgconf
   $ mkhgconfsection main $TESTTMP/main main one >> .hgconf
   $ hg ci -m 'confs at zero, main at one'
-  $ hg ensureconf > /dev/null
+  $ hg cfensureconf > /dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public) zero  ok

          
@@ 135,7 135,7 @@ Update confs and main to tag two
 
 Ensureconf for main only
 
-  $ hg ensureconf main
+  $ hg cfensureconf main
   main
   updating to two
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 144,7 144,7 @@ Ensureconf for main only
 Esureconf for confs only.
 We can see that repositories managed by libs and exts are not updated.
 
-  $ hg ensureconf --include-conf 'confs.'
+  $ hg cfensureconf --include-conf 'confs.'
   confs.libs
   updating to two
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 157,7 157,7 @@ We can see that repositories managed by 
 Ensureconf except confs
 We can see that main does not need to be updated
 
-  $ hg ensureconf --exclude-conf 'confs.'
+  $ hg cfensureconf --exclude-conf 'confs.'
   lib1
   updating to two
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 195,7 195,7 @@ We override lib1 to track tag three
 
   $ mkhgconfsection lib1 $TESTTMP/lib1 lib1 three >> .hgconf
   $ hg ci -m 'overrides lib1 to three'
-  $ hg ensureconf > /dev/null
+  $ hg cfensureconf > /dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public) two  ok

          
@@ 226,7 226,7 @@ We update app 3 commits early.
   |
   o  0 (draft): emtpy hgconf
   
-  $ hg ensureconf > /dev/null
+  $ hg cfensureconf > /dev/null
   $ hg cfsummary
   app
   `- main (default public)  [baseline aligned with revset 'desc(zero)']

          
@@ 258,7 258,7 @@ We can see that null cset is ok.
   $ mkhgconfsection main $TESTTMP/main main 'public()' >> .hgconf
   $ hg ci -m 'main tracks "public()", libs tracks "desc(three)" and exts tracks "null"'
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public) tip  [baseline aligned with revset 'desc(three)']

          
@@ 287,7 287,7 @@ We track this tag within app
   $ hg ci -m 'overrides lib1 which tracks "desc(four)"'
 
 Ensuring will correctly pull the lib1 repo and update it
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public)  [baseline aligned with revset 'desc(two)']

          
@@ 312,7 312,7 @@ We do a conf clone & ensure
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd app1
-  $ hg ensure --share-path=$TESTTMP/src >/dev/null
+  $ hg cfensure --share-path=$TESTTMP/src >/dev/null
   $ hg cfsummary
   app1
   |- confs.libs [shared] (default public)  [baseline aligned with revset 'desc(two)']

          
@@ 330,7 330,7 @@ Another one
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd app2
-  $ hg ensure --share-path=$TESTTMP/src >/dev/null
+  $ hg cfensure --share-path=$TESTTMP/src >/dev/null
   $ cd main
   $ hg log -l 2
   9 (public): Added tag three for changeset 0f58231c0c83

          
@@ 362,7 362,7 @@ Just the dirty case for now
   $ hg st
   A babar.txt
   $ cd $TESTTMP/app2
-  $ hg ensure
+  $ hg cfensure
   confs.libs
   lib1
   lib2

          
@@ 385,14 385,14 @@ Use the uri-map-file parameter
 Non existant uri map file
   $ cd $TESTTMP/app2/main
   $ hg strip -r . > /dev/null
-  $ hg ensure --uri-map-file urimap.ini -I main
+  $ hg cfensure --uri-map-file urimap.ini -I main
   found configuration repo at $TESTTMP/app2
   main
 
 Non existant uri map file
   $ cd $TESTTMP/app2
   $ rm -rf main
-  $ hg ensure --uri-map-file urimap.ini -I main
+  $ hg cfensure --uri-map-file urimap.ini -I main
   cloning main from $TESTTMP/main to $TESTTMP/app2/main
   the 'urimap.ini' uri map file cannot be found
   updating to branch default

          
@@ 402,7 402,7 @@ Non existant uri map file
 Malformed uri map file
   $ rm -rf main
   $ echo "babar" > urimap.ini
-  $ hg ensure --uri-map-file urimap.ini -I main
+  $ hg cfensure --uri-map-file urimap.ini -I main
   cloning main from $TESTTMP/main to $TESTTMP/app2/main
   the 'urimap.ini' uri map file looks malformed
   updating to branch default

          
@@ 415,7 415,7 @@ Good uri map file with wrong target
   > ssh://hg@hg.perdu.com = ssh://hg@hg.pythonista.com
   > EOF
   $ rm -rf main
-  $ hg ensure --uri-map-file urimap.ini -I main
+  $ hg cfensure --uri-map-file urimap.ini -I main
   cloning main from $TESTTMP/main to $TESTTMP/app2/main
   clone: using 'http://perdu/main' instead of '$TESTTMP/main'
   <urlopen error \[Errno -\d\] .* (re)

          
@@ 428,7 428,7 @@ Good uri map file with good target
   > $TESTTMP/main = $TESTTMP/main2
   > EOF
   $ rm -rf main
-  $ hg ensure --uri-map-file urimap.ini -I main
+  $ hg cfensure --uri-map-file urimap.ini -I main
   cloning main from $TESTTMP/main to $TESTTMP/app2/main
   clone: using '$TESTTMP/main2' instead of '$TESTTMP/main'
   updating to branch default

          
@@ 442,13 442,13 @@ We go on the last version of the configu
 
   $ cd $TESTTMP/app
   $ hg up tip > /dev/null
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
 
 We go on an early version of the configuration and check that, without
 --keep-descendant, ensureconf backward history
 
   $ hg up 3 > /dev/null
-  $ hg ensureconf > /dev/null
+  $ hg cfensureconf > /dev/null
   $ hg cfsum
   app
   |- confs.libs (default public) zero  ok

          
@@ 466,9 466,9 @@ Now we force that:
 
 and we check that --keep-descendant preserve the state of `ext2` only
 
-  $ hg broadcast -I main -e 'hg up zero' >/dev/null
-  $ hg broadcast -I ext2 -e 'hg up two' >/dev/null
-  $ hg --traceback ensureconf --keep-descendant >/dev/null
+  $ hg cfbroadcast -I main -e 'hg up zero' >/dev/null
+  $ hg cfbroadcast -I ext2 -e 'hg up two' >/dev/null
+  $ hg --traceback cfensureconf --keep-descendant >/dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public) zero  ok

          
@@ 482,10 482,10 @@ and we check that --keep-descendant pres
 Now we check that we back to the track when we are not on a
 descendant.
 
-  $ hg broadcast -I ext2 -e 'hg up 0' > /dev/null
-  $ hg broadcast -I ext2 -e 'hg revert --all -r tip' >/dev/null
-  $ hg broadcast -I ext2 -e 'hg ci -m "non descendant"' >/dev/null
-  $ hg --traceback ensureconf --keep-descendant >/dev/null
+  $ hg cfbroadcast -I ext2 -e 'hg up 0' > /dev/null
+  $ hg cfbroadcast -I ext2 -e 'hg revert --all -r tip' >/dev/null
+  $ hg cfbroadcast -I ext2 -e 'hg ci -m "non descendant"' >/dev/null
+  $ hg --traceback cfensureconf --keep-descendant >/dev/null
   $ hg cfsummary
   app
   |- confs.libs (default public) zero  ok

          
M tests/test-expand.t +21 -21
@@ 82,7 82,7 @@ Prepare configuration repos (also at 0.1
   > track = 0
   > EOF
   $ hg add .hgconf
-  $ hg ensure
+  $ hg cfensure
   cloning lib1 from $TESTTMP/lib1 to $TESTTMP/libs/lib1
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 97,7 97,7 @@ Prepare configuration repos (also at 0.1
   updating to 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to 0.1.0/default from 68f1e6a871f275e4ba08b2bce7db0a0edc33084e/default
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   lib1 : 0.1.0
   lib2 : 0.1.0

          
@@ 122,7 122,7 @@ Then, "framework"
   > track = 0
   > EOF
   $ hg add .hgconf
-  $ hg ensure
+  $ hg cfensure
   cloning libs from $TESTTMP/libs to $TESTTMP/framework/dependencies/libs
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 158,7 158,7 @@ Then, "framework"
   updating to 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to 0.1.0/default from 68f1e6a871f275e4ba08b2bce7db0a0edc33084e/default
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   libs : 0.1.0
   core : 0.1.0

          
@@ 185,7 185,7 @@ Finally, "app"
   > EOF
   $ hg add .hgconf
 
-  $ hg ensure
+  $ hg cfensure
   cloning framework from $TESTTMP/framework to $TESTTMP/app/dependencies/framework
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

          
@@ 243,7 243,7 @@ Finally, "app"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to 0.1.0/default from 68f1e6a871f275e4ba08b2bce7db0a0edc33084e/default
 
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   framework : 0.1.0
   main : 0.1.0

          
@@ 264,7 264,7 @@ Finally, "app"
 
 Bump a dependency: lib1
   $ cd $TESTTMP/libs
-  $ hg ensure
+  $ hg cfensure
   lib1
   lib2
   $ cd lib1

          
@@ 294,7 294,7 @@ Record the new lib1 in libs
   libs
   |- lib1 (default public) 0.2.0  [at descendant of '0.1.0']
   `- lib2 (default public) 0.1.0  ok
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   lib1 : 0.2.0
   $ cat .hgconf

          
@@ 338,9 338,9 @@ Back to the app, try to wreck things a b
 
 This is a bit weird and deserves more thinking ...
 Obiously "framework" commands what's happening, and it may not be a bad thing
-  $ hg baseline
+  $ hg cfbaseline
 
-  $ hg ensure
+  $ hg cfensure
   framework
   libs
   updating to 0.1.0

          
@@ 368,7 368,7 @@ Obiously "framework" commands what's hap
   layout = tier2
   track = 0.1.0
 
-  $ hg baseline
+  $ hg cfbaseline
   Nothing to do.
 
 Now, bump the framework, following libs

          
@@ 386,7 386,7 @@ Now, bump the framework, following libs
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd $TESTTMP/framework
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   libs : 0.2.0
   $ hg cfs

          
@@ 415,11 415,11 @@ Back to the app, we'll use framework 0.2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd $TESTTMP/app
-  $ hg baseline
+  $ hg cfbaseline
   The following entries have been updated:
   framework : 0.2.0
 
-  $ hg ensure
+  $ hg cfensure
   framework
   libs
   updating to 0.2.0

          
@@ 490,7 490,7 @@ Test includes filter on "appincludes"
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   appincludes
   |- framework (default public) 0.1.0  [baseline aligned with cset 0]

          
@@ 521,7 521,7 @@ Test excludes filter on "appexcludes"
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   appexcludes
   |- framework (default public) 0.1.0  [baseline aligned with cset 0]

          
@@ 554,7 554,7 @@ Test regular expressions for filters on 
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   appregexp
   |- framework (default public) 0.1.0  [baseline aligned with cset 0]

          
@@ 589,7 589,7 @@ Test overwrite on "appoverwrite"
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   appoverwrite
   |- framework (default public) 0.1.0  [baseline aligned with cset 0]

          
@@ 614,7 614,7 @@ Test overwrite on "appemptycolumn"
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   appemptycolumn
   `- framework (default public) 0.1.0  [baseline aligned with cset 0]

          
@@ 646,7 646,7 @@ Slightly pathological case
   > EOF
   $ hg add .hgconf
 
-  $ hg ensureconf >/dev/null
+  $ hg cfensureconf >/dev/null
   $ hg cfs
   slightlypathological
   |- framework (default public) tip  [baseline aligned with branch]

          
@@ 683,7 683,7 @@ section but only few parameters
   framework repository at "$TESTTMP/partial_override/dependencies/framework" not found
   libs repository at "$TESTTMP/partial_override/dependencies/libs" not found
   lib1 is a partial override without its master entry
-  $ hg ensureconf > /dev/null
+  $ hg cfensureconf > /dev/null
   $ hg cfs
   partial_override
   |- framework (default public) tip  [baseline aligned with branch]

          
M tests/test-git.t +3 -3
@@ 67,7 67,7 @@ Create working conf
 
 
 Ensureconf
-  $ hg ensureconf
+  $ hg cfensureconf
   Cloning into '$TESTTMP/conf/foo'...
   done.
   cloning foo from $TESTTMP/foo to $TESTTMP/conf/foo

          
@@ 140,7 140,7 @@ Add a git tag
   conf
   |- foo (HEAD) first-commit  ok
   `- bar.quux (default public) quux-version-1.0  ok
-  $ hg ensure
+  $ hg cfensure
   From $TESTTMP/foo
      ???????..???????  master     -> origin/master (glob)
    * [new tag]         foo-0.1    -> foo-0.1

          
@@ 164,7 164,7 @@ Add a git tag
   |- foo (HEAD) first-commit  [baseline 'foo-0.2' in a parallel branch]
   `- bar.quux (default public) quux-version-1.0  ok
 
-  $ hg ensure
+  $ hg cfensure
   foo
   bar.quux
 

          
M tests/test-gr.t +8 -8
@@ 52,13 52,13 @@ Exert some commands
   shell
   |- foo-repo (default draft) tip [snapshot aligned] [baseline aligned with cset 797f8866b5b9]
   `- bar-repo (default draft) tip [snapshot aligned] [baseline aligned with cset 0a96af643fde]
-  $ hg ensure
+  $ hg cfensure
   foo-repo
   bar-repo
-  $ hg ensure
+  $ hg cfensure
   foo-repo
   bar-repo
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   foo-repo
   bar-repo

          
@@ 69,7 69,7 @@ Exert some commands
   $ hg up tip~1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cd $TESTTMP/shell
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   bar-repo
   The following entries have been updated:

          
@@ 87,7 87,7 @@ Exert some commands
   $ mkcommit add-to-foo
   created new head
   $ cd $TESTTMP/shell
-  $ hg baseline
+  $ hg cfbaseline
   The following repositories are not tag/branch aligned:
   foo-repo
   bar-repo

          
@@ 98,7 98,7 @@ Exert some commands
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cd $TESTTMP/shell
-  $ hg baseline
+  $ hg cfbaseline
   has two parents (uncommitted merge)
   abort: bailing out
   [255]

          
@@ 111,7 111,7 @@ Exert some commands
 
 
 Let's play with the shiny new "--force-hgconf" option
-  $ hg baseline --force-hgconf
+  $ hg cfbaseline --force-hgconf
   has two parents (uncommitted merge)
   abort: bailing out
   [255]

          
@@ 121,7 121,7 @@ Let's play with the shiny new "--force-h
   $ hg up "release time"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd $TESTTMP/shell
-  $ hg baseline --force-hgconf
+  $ hg cfbaseline --force-hgconf
   The following repositories are not tag/branch aligned:
   bar-repo
   

          
M tests/test-rewritehgrc.t +1 -1
@@ 23,7 23,7 @@ Prepare initial repositories
   > track = first
   > EOF
 
-  $ hg ensure > /dev/null
+  $ hg cfensure > /dev/null
   $ cat one/.hg/hgrc
   [paths]
   default = $TESTTMP/one

          
M tests/test-tarball.t +3 -3
@@ 60,7 60,7 @@ contains the version number.
 
 # Ensureconf shall download and deflate the archives
 
-  $ hg --traceback ensureconf
+  $ hg --traceback cfensureconf
   cloning foo from file://../foo-1.0.0.tar.gz to $TESTTMP/conf/foo-1.0.0
   cloning quux from file://../quux.tar.gz to $TESTTMP/conf/quux-data
   cloning toto from file://../toto.zip to $TESTTMP/conf/toto-data

          
@@ 96,7 96,7 @@ We can see that
 
 # Call ensureconf again do nothing
 
-  $ hg ensureconf
+  $ hg cfensureconf
   foo
   quux
   toto

          
@@ 126,7 126,7 @@ We can see that
 
 So, ensureconf download the new tarball and uncompress it
 
-  $ hg ensureconf
+  $ hg cfensureconf
   cloning foo from file://../foo-2.0.0.tar.gz to $TESTTMP/conf/foo-2.0.0
   foo
   quux