tests: update for commit --secret

tests/test-completion.t

@@ -1,338 +1,338 b''
 Show all commands except debug commands
   $ hg debugcomplete
   add
   addremove
   annotate
   archive
   backout
   bisect
   bookmarks
   branch
   branches
   bundle
   cat
   clone
   commit
   copy
   diff
   export
   forget
   graft
   grep
   heads
   help
   identify
   import
   incoming
   init
   locate
   log
   manifest
   merge
   outgoing
   parents
   paths
   phase
   pull
   push
   recover
   remove
   rename
   resolve
   revert
   rollback
   root
   serve
   showconfig
   status
   summary
   tag
   tags
   tip
   unbundle
   update
   verify
   version
 
 Show all commands that start with "a"
   $ hg debugcomplete a
   add
   addremove
   annotate
   archive
 
 Do not show debug commands if there are other candidates
   $ hg debugcomplete d
   diff
 
 Show debug commands if there are no other candidates
   $ hg debugcomplete debug
   debugancestor
   debugbuilddag
   debugbundle
   debugcheckstate
   debugcommands
   debugcomplete
   debugconfig
   debugdag
   debugdata
   debugdate
   debugdirstate
   debugdiscovery
   debugfileset
   debugfsinfo
   debuggetbundle
   debugignore
   debugindex
   debugindexdot
   debuginstall
   debugknown
   debuglabelcomplete
   debugobsolete
   debugpathcomplete
   debugpushkey
   debugpvec
   debugrebuilddirstate
   debugrename
   debugrevlog
   debugrevspec
   debugsetparents
   debugsub
   debugsuccessorssets
   debugwalk
   debugwireargs
 
 Do not show the alias of a debug command if there are other candidates
 (this should hide rawcommit)
   $ hg debugcomplete r
   recover
   remove
   rename
   resolve
   revert
   rollback
   root
 Show the alias of a debug command if there are no other candidates
   $ hg debugcomplete rawc
   
 
 Show the global options
   $ hg debugcomplete --options | sort
   --config
   --cwd
   --debug
   --debugger
   --encoding
   --encodingmode
   --help
   --hidden
   --noninteractive
   --profile
   --quiet
   --repository
   --time
   --traceback
   --verbose
   --version
   -R
   -h
   -q
   -v
   -y
 
 Show the options for the "serve" command
   $ hg debugcomplete --options serve | sort
   --accesslog
   --address
   --certificate
   --cmdserver
   --config
   --cwd
   --daemon
   --daemon-pipefds
   --debug
   --debugger
   --encoding
   --encodingmode
   --errorlog
   --help
   --hidden
   --ipv6
   --name
   --noninteractive
   --pid-file
   --port
   --prefix
   --profile
   --quiet
   --repository
   --stdio
   --style
   --templates
   --time
   --traceback
   --verbose
   --version
   --web-conf
   -6
   -A
   -E
   -R
   -a
   -d
   -h
   -n
   -p
   -q
   -t
   -v
   -y
 
 Show an error if we use --options with an ambiguous abbreviation
   $ hg debugcomplete --options s
   hg: command 's' is ambiguous:
       serve showconfig status summary
   [255]
 
 Show all commands + options
   $ hg debugcommands
   add: include, exclude, subrepos, dry-run
   annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude
   clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
-  commit: addremove, close-branch, amend, include, exclude, message, logfile, date, user, subrepos
+  commit: addremove, close-branch, amend, secret, include, exclude, message, logfile, date, user, subrepos
   diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude, subrepos
   export: output, switch-parent, rev, text, git, nodates
   forget: include, exclude
   init: ssh, remotecmd, insecure
   log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
   merge: force, rev, preview, tool
   pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
   push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
   remove: after, force, include, exclude
   serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
   status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
   summary: remote
   update: clean, check, date, rev
   addremove: similarity, include, exclude, dry-run
   archive: no-decode, prefix, rev, type, subrepos, include, exclude
   backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user
   bisect: reset, good, bad, skip, extend, command, noupdate
   bookmarks: force, rev, delete, rename, inactive
   branch: force, clean
   branches: active, closed
   bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
   cat: output, rev, decode, include, exclude
   copy: after, force, include, exclude, dry-run
   debugancestor: 
   debugbuilddag: mergeable-file, overwritten-file, new-file
   debugbundle: all
   debugcheckstate: 
   debugcommands: 
   debugcomplete: options
   debugdag: tags, branches, dots, spaces
   debugdata: changelog, manifest
   debugdate: extended
   debugdirstate: nodates, datesort
   debugdiscovery: old, nonheads, ssh, remotecmd, insecure
   debugfileset: rev
   debugfsinfo: 
   debuggetbundle: head, common, type
   debugignore: 
   debugindex: changelog, manifest, format
   debugindexdot: 
   debuginstall: 
   debugknown: 
   debuglabelcomplete: 
   debugobsolete: flags, date, user
   debugpathcomplete: full, normal, added, removed
   debugpushkey: 
   debugpvec: 
   debugrebuilddirstate: rev
   debugrename: rev
   debugrevlog: changelog, manifest, dump
   debugrevspec: 
   debugsetparents: 
   debugsub: rev
   debugsuccessorssets: 
   debugwalk: include, exclude
   debugwireargs: three, four, five, ssh, remotecmd, insecure
   graft: rev, continue, edit, log, currentdate, currentuser, date, user, tool, dry-run
   grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
   heads: rev, topo, active, closed, style, template
   help: extension, command, keyword
   identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
   import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
   incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
   locate: rev, print0, fullpath, include, exclude
   manifest: rev, all
   outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
   parents: rev, style, template
   paths: 
   phase: public, draft, secret, force, rev
   recover: 
   rename: after, force, include, exclude, dry-run
   resolve: all, list, mark, unmark, no-status, tool, include, exclude
   revert: all, date, rev, no-backup, include, exclude, dry-run
   rollback: dry-run, force
   root: 
   showconfig: untrusted
   tag: force, local, rev, remove, edit, message, date, user
   tags: 
   tip: patch, git, style, template
   unbundle: update
   verify: 
   version: 
 
   $ hg init a
   $ cd a
   $ echo fee > fee
   $ hg ci -q -Amfee
   $ hg tag fee
   $ mkdir fie
   $ echo dead > fie/dead
   $ echo live > fie/live
   $ hg bookmark fo
   $ hg branch -q fie
   $ hg ci -q -Amfie
   $ echo fo > fo
   $ hg branch -qf default
   $ hg ci -q -Amfo
   $ echo Fum > Fum
   $ hg ci -q -AmFum
   $ hg bookmark Fum
 
 Test debugpathcomplete
 
   $ hg debugpathcomplete f
   fee
   fie/
   fo
   $ hg debugpathcomplete -f f
   fee
   fie/dead
   fie/live
   fo
 
   $ hg rm Fum
   $ hg debugpathcomplete -r F
   Fum
 
 If one directory and no files match, give an ambiguous answer
 
   $ hg debugpathcomplete fi
   fie/
   fie/.
 
 Test debuglabelcomplete
 
   $ hg debuglabelcomplete
   Fum
   default
   fee
   fie
   fo
   tip
   $ hg debuglabelcomplete f
   fee
   fie
   fo

tests/test-qrecord.t

@@ -1,402 +1,403 b''
 Create configuration
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
 
 help record (no record)
 
   $ hg help record
   record extension - commands to interactively select changes for
   commit/qrefresh
   
   use "hg help extensions" for information on enabling extensions
 
 help qrecord (no record)
 
   $ hg help qrecord
   'qrecord' is provided by the following extension:
   
       record        commands to interactively select changes for commit/qrefresh
   
   use "hg help extensions" for information on enabling extensions
 
   $ echo "[extensions]"     >> $HGRCPATH
   $ echo "record="          >> $HGRCPATH
 
 help record (record)
 
   $ hg help record
   hg record [OPTION]... [FILE]...
   
   interactively select changes to commit
   
       If a list of files is omitted, all changes reported by "hg status" will be
       candidates for recording.
   
       See "hg help dates" for a list of formats valid for -d/--date.
   
       You will be prompted for whether to record changes to each modified file,
       and for files with multiple changes, for each change to use. For each
       query, the following responses are possible:
   
         y - record this change
         n - skip this change
         e - edit this change manually
   
         s - skip remaining changes to this file
         f - record remaining changes to this file
   
         d - done, skip remaining changes and files
         a - record all changes to all remaining files
         q - quit, recording no changes
   
         ? - display help
   
       This command is not available when committing a merge.
   
   options:
   
    -A --addremove           mark new/missing files as added/removed before
                             committing
       --close-branch        mark a branch as closed, hiding it from the branch
                             list
       --amend               amend the parent of the working dir
+   -s --secret              use the secret phase for committing
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
    -d --date DATE           record the specified date as commit date
    -u --user USER           record the specified user as committer
    -S --subrepos            recurse into subrepositories
    -w --ignore-all-space    ignore white space when comparing lines
    -b --ignore-space-change ignore changes in the amount of white space
    -B --ignore-blank-lines  ignore changes whose lines are all blank
   
   [+] marked option can be specified multiple times
   
   use "hg -v help record" to show the global options
 
 help (no mq, so no qrecord)
 
   $ hg help qrecord
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   use "hg -v help qrecord" to show the global options
 
   $ hg init a
 
 qrecord (mq not present)
 
   $ hg -R a qrecord
   hg qrecord: invalid arguments
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
   use "hg help qrecord" to show the full help text
   [255]
 
 qrecord patch (mq not present)
 
   $ hg -R a qrecord patch
   abort: 'mq' extension not loaded
   [255]
 
 help (bad mq)
 
   $ echo "mq=nonexistent" >> $HGRCPATH
   $ hg help qrecord
   *** failed to import extension mq from nonexistent: [Errno *] * (glob)
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   use "hg -v help qrecord" to show the global options
 
 help (mq present)
 
   $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp
   $ mv hgrc.tmp $HGRCPATH
 
   $ hg help qrecord
   hg qrecord [OPTION]... PATCH [FILE]...
   
   interactively record a new patch
   
       See "hg help qnew" & "hg help record" for more information and usage.
   
   options:
   
    -e --edit                edit commit message
    -g --git                 use git extended diff format
    -U --currentuser         add "From: <current user>" to patch
    -u --user USER           add "From: <USER>" to patch
    -D --currentdate         add "Date: <current date>" to patch
    -d --date DATE           add "Date: <DATE>" to patch
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
    -m --message TEXT        use text as commit message
    -l --logfile FILE        read commit message from file
    -w --ignore-all-space    ignore white space when comparing lines
    -b --ignore-space-change ignore changes in the amount of white space
    -B --ignore-blank-lines  ignore changes whose lines are all blank
       --mq                  operate on patch repository
   
   [+] marked option can be specified multiple times
   
   use "hg -v help qrecord" to show the global options
 
   $ cd a
 
 Base commit
 
   $ cat > 1.txt <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ cat > 2.txt <<EOF
   > a
   > b
   > c
   > d
   > e
   > f
   > EOF
 
   $ mkdir dir
   $ cat > dir/a.txt <<EOF
   > hello world
   > 
   > someone
   > up
   > there
   > loves
   > me
   > EOF
 
   $ hg add 1.txt 2.txt dir/a.txt
   $ hg commit -m 'initial checkin'
 
 Changing files
 
   $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
   $ sed -e 's/b/b b/' 2.txt > 2.txt.new
   $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
 
   $ mv -f 1.txt.new 1.txt
   $ mv -f 2.txt.new 2.txt
   $ mv -f dir/a.txt.new dir/a.txt
 
 Whole diff
 
   $ hg diff --nodates
   diff -r 1057167b20ef 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
   -4
   +4 4
    5
   diff -r 1057167b20ef 2.txt
   --- a/2.txt
   +++ b/2.txt
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   diff -r 1057167b20ef dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 qrecord with bad patch name, should abort before prompting
 
   $ hg qrecord .hg
   abort: patch name cannot begin with ".hg"
   [255]
 
 qrecord a.patch
 
   $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
   > y
   > y
   > n
   > y
   > y
   > n
   > EOF
   diff --git a/1.txt b/1.txt
   2 hunks, 2 lines changed
   examine changes to '1.txt'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
    1
   -2
   +2 2
    3
   record change 1/4 to '1.txt'? [Ynesfdaq?] 
   @@ -3,3 +3,3 @@
    3
   -4
   +4 4
    5
   record change 2/4 to '1.txt'? [Ynesfdaq?] 
   diff --git a/2.txt b/2.txt
   1 hunks, 1 lines changed
   examine changes to '2.txt'? [Ynesfdaq?] 
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   record change 3/4 to '2.txt'? [Ynesfdaq?] 
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynesfdaq?] 
 
 After qrecord a.patch 'tip'"
 
   $ hg tip -p
   changeset:   1:5d1ca63427ee
   tag:         a.patch
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     aaa
   
   diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
   -2
   +2 2
    3
    4
    5
   diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
   --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    a
   -b
   +b b
    c
    d
    e
   
 
 After qrecord a.patch 'diff'"
 
   $ hg diff --nodates
   diff -r 5d1ca63427ee 1.txt
   --- a/1.txt
   +++ b/1.txt
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   diff -r 5d1ca63427ee dir/a.txt
   --- a/dir/a.txt
   +++ b/dir/a.txt
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
 
 qrecord b.patch
 
   $ hg qrecord -d '0 0' -m bbb b.patch <<EOF
   > y
   > y
   > y
   > y
   > EOF
   diff --git a/1.txt b/1.txt
   1 hunks, 1 lines changed
   examine changes to '1.txt'? [Ynesfdaq?] 
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   record change 1/2 to '1.txt'? [Ynesfdaq?] 
   diff --git a/dir/a.txt b/dir/a.txt
   1 hunks, 1 lines changed
   examine changes to 'dir/a.txt'? [Ynesfdaq?] 
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] 
 
 After qrecord b.patch 'tip'
 
   $ hg tip -p
   changeset:   2:b056198bf878
   tag:         b.patch
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     bbb
   
   diff -r 5d1ca63427ee -r b056198bf878 1.txt
   --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,5 +1,5 @@
    1
    2 2
    3
   -4
   +4 4
    5
   diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
   --- a/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +1,4 @@
   -hello world
   +hello world!
    
    someone
    up
   
 
 After qrecord b.patch 'diff'
 
   $ hg diff --nodates
 
   $ cd ..