# HG changeset patch # User Matt Mackall # Date 1255930612 18000 # Node ID 69f8ac71ded1c1ac2e9d385dc8f1c42efe57815d # Parent 3194227a4158bc5c428ad52f6581ede3c80f3886 Remove parents from default help in favor of summary diff -r 3194227a4158 -r 69f8ac71ded1 mercurial/commands.py --- 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, diff -r 3194227a4158 -r 69f8ac71ded1 tests/test-debugcomplete.out --- 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 diff -r 3194227a4158 -r 69f8ac71ded1 tests/test-help.out --- 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 diff -r 3194227a4158 -r 69f8ac71ded1 tests/test-qrecord.out --- 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 diff -r 3194227a4158 -r 69f8ac71ded1 tests/test-strict.out --- 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