Mercurial > hg

changeset 9606:69f8ac71ded1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove parents from default help in favor of summary
author Matt Mackall <mpm@selenic.com>
date Mon, 19 Oct 2009 00:36:52 -0500
parents 3194227a4158
children fafd653134d0
files mercurial/commands.py tests/test-debugcomplete.out tests/test-help.out tests/test-qrecord.out tests/test-strict.out
diffstat 5 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 19 00:22:49 2009 -0500
+++ b/mercurial/commands.py	Mon Oct 19 00:36:52 2009 -0500
@@ -3491,7 +3491,7 @@
           ('n', 'newest-first', None, _('show newest record first')),
          ] + logopts + remoteopts,
          _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
-    "^parents":
+    "parents":
         (parents,
          [('r', 'rev', '', _('show parents from the specified revision')),
          ] + templateopts,
--- a/tests/test-debugcomplete.out	Mon Oct 19 00:22:49 2009 -0500
+++ b/tests/test-debugcomplete.out	Mon Oct 19 00:36:52 2009 -0500
@@ -173,7 +173,6 @@
 init: ssh, remotecmd
 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude
 merge: force, rev, preview
-parents: rev, style, template
 pull: update, force, rev, ssh, remotecmd
 push: force, rev, ssh, remotecmd
 remove: after, force, include, exclude
@@ -215,6 +214,7 @@
 locate: rev, print0, fullpath, include, exclude
 manifest: rev
 outgoing: force, rev, newest-first, patch, git, limit, no-merges, style, template, ssh, remotecmd
+parents: rev, style, template
 paths: 
 recover: 
 rename: after, force, include, exclude, dry-run
--- a/tests/test-help.out	Mon Oct 19 00:22:49 2009 -0500
+++ b/tests/test-help.out	Mon Oct 19 00:36:52 2009 -0500
@@ -12,7 +12,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
@@ -32,7 +31,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
@@ -317,7 +315,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
@@ -342,7 +339,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
--- a/tests/test-qrecord.out	Mon Oct 19 00:22:49 2009 -0500
+++ b/tests/test-qrecord.out	Mon Oct 19 00:36:52 2009 -0500
@@ -14,7 +14,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
--- a/tests/test-strict.out	Mon Oct 19 00:22:49 2009 -0500
+++ b/tests/test-strict.out	Mon Oct 19 00:36:52 2009 -0500
@@ -15,7 +15,6 @@
  init       create a new repository in the given directory
  log        show revision history of entire repository or files
  merge      merge working directory with another revision
- parents    show the parents of the working directory or revision
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit