changeset 1187:120aa5fc7ced

From [e-mail] Thu Sep  1 07:01:32 2005
Return-Path: <[e-mail]>
X-Original-To: [e-mail]
Delivered-To: [e-mail]
Received: from waste.org (waste.org [216.27.176.166]) by
	demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for
	<[e-mail]>; Thu,  1 Sep 2005 07:01:32 -0700 (PDT)
Received: from waste.org (localhost [127.0.0.1]) by waste.org
	(8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005
	08:59:51 -0500
Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com
	[68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id
	j81DxnNA028824 for <[e-mail]>; Thu, 1 Sep 2005 08:59:49 -0500
Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com;
	h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
	b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE=
	;
Message-ID: <[e-mail]>
Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu,
	01 Sep 2005 06:59:17 PDT
Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT)
From: TK Soh <[e-mail]>
To: [e-mail]
In-Reply-To: <[e-mail]>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
X-Virus-Scanned: by amavisd-new
Subject: Re: add -p to hg tip
X-BeenThere: [e-mail]
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: mercurial.selenic.com
List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>,
	<mailto:[e-mail]?subject=unsubscribe>
List-Archive: <http://www.selenic.com/pipermail/mercurial>
List-Post: <mailto:[e-mail]>
List-Help: <mailto:[e-mail]?subject=help>
List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>,
	<mailto:[e-mail]?subject=subscribe>
Sender: [e-mail]
Errors-To: [e-mail]
X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on
	demesne.serpentine.com
X-Spam-Level:
X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	 version=3.0.4
X-Evolution-Source: imap://[e-mail]/
Content-Transfer-Encoding: 8bit

--- a/doc/hg.1.txt	Thu Sep 01 07:43:53 2005 -0700
+++ b/doc/hg.1.txt	Thu Sep 01 07:47:26 2005 -0700
@@ -259,13 +259,16 @@
 
     aliases: patch
 
-incoming [source]::
+incoming [-p] [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.
 
+    options:
+    -p, --patch           show patch
+
     aliases: in
 
 init [dest]::
@@ -320,11 +323,14 @@
     The manifest is the list of files being version controlled. If no revision
     is given then the tip is used.
 
-outgoing [dest]:: 
+outgoing [-p] [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.
 
+    options:
+    -p, --patch           show patch
+
     aliases: out
 
 parents::

--- a/mercurial/commands.py	Thu Sep 01 07:43:53 2005 -0700
+++ b/mercurial/commands.py	Thu Sep 01 07:47:26 2005 -0700
@@ -1058,7 +1058,7 @@
             addremove(ui, repo, *files)
         repo.commit(files, message, user)
 
-def incoming(ui, repo, source="default"):
+def incoming(ui, repo, source="default", **opts):
     """show new changesets found in source"""
     source = ui.expandpath(source)
     other = hg.repository(ui, source)
@@ -1073,6 +1073,10 @@
     o.reverse()
     for n in o:
         show_changeset(ui, other, changenode=n)
+        if opts['patch']:
+            prev = other.changelog.parents(n)[0]
+            dodiff(ui, ui, other, prev, n)
+            ui.write("\n")
 
 def init(ui, dest="."):
     """create a new repository in the given directory"""
@@ -1154,7 +1158,7 @@
     for f in files:
         ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
 
-def outgoing(ui, repo, dest="default-push"):
+def outgoing(ui, repo, dest="default-push", **opts):
     """show changesets not found in destination"""
     dest = ui.expandpath(dest)
     other = hg.repository(ui, dest)
@@ -1163,6 +1167,10 @@
     o.reverse()
     for n in o:
         show_changeset(ui, repo, changenode=n)
+        if opts['patch']:
+            prev = repo.changelog.parents(n)[0]
+            dodiff(ui, ui, repo, prev, n)
+            ui.write("\n")
 
 def parents(ui, repo, rev=None):
     """show the parents of the working dir or revision"""
@@ -1641,7 +1649,9 @@
           ('f', 'force', None, 'skip check for outstanding changes'),
           ('b', 'base', "", 'base path')],
          "hg import [-f] [-p NUM] [-b BASE] PATCH..."),
-    "incoming|in": (incoming, [], 'hg incoming [SOURCE]'),
+    "incoming|in": (incoming, 
+         [('p', 'patch', None, 'show patch')],
+         'hg incoming [-p] [SOURCE]'),
     "^init": (init, [], 'hg init [DEST]'),
     "locate":
         (locate,
@@ -1659,7 +1669,9 @@
           ('p', 'patch', None, 'show patch')],
          'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
     "manifest": (manifest, [], 'hg manifest [REV]'),
-    "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'),
+    "outgoing|out": (outgoing, 
+         [('p', 'patch', None, 'show patch')],
+         'hg outgoing [-p] [DEST]'),
     "parents": (parents, [], 'hg parents [REV]'),
     "paths": (paths, [], 'hg paths [NAME]'),
     "^pull":