changeset 928:6f2c3bcbfaaf

hg incoming/outgoing: fix tests and update man page
author mpm@selenic.com
date Tue, 16 Aug 2005 19:27:46 -0800
parents 5a830d7bea52
children 26bb67b7ec14
files doc/hg.1.txt mercurial/commands.py tests/test-help.out
diffstat 3 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/hg.1.txt	Tue Aug 16 19:17:16 2005 -0800
+++ b/doc/hg.1.txt	Tue Aug 16 19:27:46 2005 -0800
@@ -196,6 +196,13 @@
 
     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 @@
     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.
 
--- a/mercurial/commands.py	Tue Aug 16 19:17:16 2005 -0800
+++ b/mercurial/commands.py	Tue Aug 16 19:27:46 2005 -0800
@@ -783,7 +783,7 @@
         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():
--- a/tests/test-help.out	Tue Aug 16 19:17:16 2005 -0800
+++ b/tests/test-help.out	Tue Aug 16 19:27:46 2005 -0800
@@ -50,6 +50,7 @@
  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 @@
  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