tests: fix for D6717635

This commit is contained in:
Phil Cohen 2018-01-12 16:58:28 -08:00
parent 6095f32f96
commit ed708bc77f
8 changed files with 41 additions and 1 deletions

View File

@ -475,6 +475,7 @@ invalid global arguments for normal commands, aliases, and shell aliases
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
@ -501,6 +502,7 @@ invalid global arguments for normal commands, aliases, and shell aliases
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
@ -527,6 +529,7 @@ invalid global arguments for normal commands, aliases, and shell aliases
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory

View File

@ -69,6 +69,7 @@ typical client does not want echo-back messages, so test without it:
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory

View File

@ -19,6 +19,7 @@ Show all commands except debug commands
export
files
forget
githelp
graft
grep
heads
@ -227,6 +228,7 @@ Show all commands + options
diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
export: output, switch-parent, rev, text, git, binary, nodates
forget: include, exclude
githelp:
init: ssh, remotecmd, insecure
log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
merge: force, rev, preview, tool

View File

@ -345,6 +345,10 @@ Testing -h/--help:
verify verify the integrity of the repository
version output version and copyright information
enabled extensions:
githelp try mapping git commands to Mercurial commands
additional help topics:
bundlespec Bundle File Formats
@ -430,6 +434,10 @@ Testing -h/--help:
verify verify the integrity of the repository
version output version and copyright information
enabled extensions:
githelp try mapping git commands to Mercurial commands
additional help topics:
bundlespec Bundle File Formats

View File

@ -12,6 +12,7 @@ Short help:
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
@ -33,6 +34,7 @@ Short help:
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
@ -100,6 +102,10 @@ Short help:
verify verify the integrity of the repository
version output version and copyright information
enabled extensions:
githelp try mapping git commands to Mercurial commands
additional help topics:
bundlespec Bundle File Formats
@ -179,6 +185,10 @@ Short help:
verify verify the integrity of the repository
version output version and copyright information
enabled extensions:
githelp try mapping git commands to Mercurial commands
additional help topics:
bundlespec Bundle File Formats
@ -246,6 +256,7 @@ Test extension help:
enabled extensions:
children command to display child changesets (DEPRECATED)
githelp try mapping git commands to Mercurial commands
rebase command to move sets of revisions to a different ancestor
disabled extensions:
@ -303,7 +314,6 @@ Test extension help:
fixcorrupt (no help text available)
generic_bisect
(no help text available)
githelp try mapping git commands to Mercurial commands
gitlookup extension that will look up hashes from an hg-git map file
over the wire.
gitrevset map a git hash to a Mercurial hash:
@ -405,6 +415,7 @@ Test short command list with verbose option
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp, git suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log, history show revision history of entire repository or files
merge merge another revision into working directory
@ -754,6 +765,7 @@ Test command without options
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory
@ -960,6 +972,7 @@ Test that default list of commands omits extension commands
enabled extensions:
githelp try mapping git commands to Mercurial commands
helpext (no help text available)
additional help topics:
@ -2286,6 +2299,13 @@ Dish up an empty repo; serve it cold.
forget the specified files on the next commit
</td></tr>
<tr><td>
<a href="/help/githelp">
githelp
</a>
</td><td>
suggests the Mercurial equivalent of the given git command
</td></tr>
<tr><td>
<a href="/help/init">
init
</a>

View File

@ -4,6 +4,7 @@ Load commonly used test logic
$ . "$TESTDIR/hggit/testutil"
$ hg help | grep 'git'
githelp try mapping git commands to Mercurial commands
hggit push and pull from a Git server
git Working with Git Repositories

View File

@ -1721,6 +1721,10 @@ help/ shows help topics
"summary": "forget the specified files on the next commit",
"topic": "forget"
},
{
"summary": "suggests the Mercurial equivalent of the given git command",
"topic": "githelp"
},
{
"summary": "create a new repository in the given directory",
"topic": "init"

View File

@ -26,6 +26,7 @@
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
githelp suggests the Mercurial equivalent of the given git command
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge another revision into working directory