# HG changeset patch # User mpm@selenic.com # Date 1124249266 28800 # Node ID 6f2c3bcbfaaf7751f25cd74d25e1300ae765cb03 # Parent 5a830d7bea5239d8475807abbb2bd7a0791d1780 hg incoming/outgoing: fix tests and update man page diff --git a/doc/hg.1.txt b/doc/hg.1.txt --- a/doc/hg.1.txt +++ b/doc/hg.1.txt @@ -196,6 +196,13 @@ import [-p -b -q] :: aliases: patch +incoming [source]:: + Show new changesets found in the specified repo or the default + pull repo. These are the changesets that would be pulled if a pull + was requested. + + Currently only local repositories are supported. + init [dest]:: Initialize a new repository in the given directory. If the given directory does not exist, it is created. @@ -250,6 +257,11 @@ manifest [revision]:: The manifest is the list of files being version controlled. If no revision is given then the tip is used. +outgoing [dest]:: + Show changesets not found in the specified destination repo or the + default push repo. These are the changesets that would be pushed + if a push was requested. + parents:: Print the working directory's parent revisions. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -783,7 +783,7 @@ def import_(ui, repo, patch1, *patches, repo.commit(files, message, user) def incoming(ui, repo, source="default"): - """show changesets not found in source""" + """show new changesets found in source""" source = ui.expandpath(source) other = hg.repository(ui, source) if not other.local(): diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -50,6 +50,7 @@ list of commands (use "hg help -v" to sh help show help for a given command or all commands identify print information about the working copy import import an ordered set of patches + incoming show changesets not found in source init create a new repository in the given directory locate locate files matching specific patterns log show the revision history of the repository or a single file @@ -87,6 +88,7 @@ list of commands (use "hg help -v" to sh help show help for a given command or all commands identify print information about the working copy import import an ordered set of patches + incoming show changesets not found in source init create a new repository in the given directory locate locate files matching specific patterns log show the revision history of the repository or a single file