Patchwork [2,of,2,V2] status: add relative directory help text (issue3835)

login
register
mail settings
Submitter Sean Farley
Date March 26, 2015, 6:14 p.m.
Message ID <9f32b7fd438a6ed71442.1427393699@laptop.staff.sf.atlassian.com>
Download mbox | patch
Permalink /patch/8302/
State Accepted
Commit a05c6b4006164270e8fd592d1634293bf7cdf638
Headers show

Comments

Sean Farley - March 26, 2015, 6:14 p.m.
# HG changeset patch
# User Yung-Jin (Joey) Hu <yungjinhu@gmail.com>
# Date 1426736402 25200
#      Wed Mar 18 20:40:02 2015 -0700
# Node ID 9f32b7fd438a6ed71442e1f2dcbb93d2f3a0b063
# Parent  3769372acb363c945b444a89dbb510b1c49fa7af
status: add relative directory help text (issue3835)

Previously, it was difficult to find out how to display the status of files
relative to your current working directory. This patch adds that knowledge to
the help text.
Matt Mackall - March 26, 2015, 8:16 p.m.
On Thu, 2015-03-26 at 11:14 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Yung-Jin (Joey) Hu <yungjinhu@gmail.com>
> # Date 1426736402 25200
> #      Wed Mar 18 20:40:02 2015 -0700
> # Node ID 9f32b7fd438a6ed71442e1f2dcbb93d2f3a0b063
> # Parent  3769372acb363c945b444a89dbb510b1c49fa7af
> status: add relative directory help text (issue3835)

Queued for default, but tweaked to refer to the patterns help instead.
Jordi Gutiérrez Hermoso - March 26, 2015, 9:01 p.m.
On Thu, 2015-03-26 at 11:14 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Yung-Jin (Joey) Hu <yungjinhu@gmail.com>
> # Date 1426736402 25200
> #      Wed Mar 18 20:40:02 2015 -0700
> # Node ID 9f32b7fd438a6ed71442e1f2dcbb93d2f3a0b063
> # Parent  3769372acb363c945b444a89dbb510b1c49fa7af
> status: add relative directory help text (issue3835)
[snip]
> +      - show changes in the working directory relative to the
> +        current directory (see filesets for more information)::

This should probably be "see `:hg: help filesets`"... except that I
find no explanation of this sorcery there. Instead, the explanation
seems to be in `hg help patterns`. Well, at least a mention that re:
activates regexp syntax, but I still consider it sorcery that this
activate paths relative to the cwd.
Sean Farley - March 26, 2015, 9:08 p.m.
Jordi Gutiérrez Hermoso <jordigh@octave.org> writes:

> On Thu, 2015-03-26 at 11:14 -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Yung-Jin (Joey) Hu <yungjinhu@gmail.com>
>> # Date 1426736402 25200
>> #      Wed Mar 18 20:40:02 2015 -0700
>> # Node ID 9f32b7fd438a6ed71442e1f2dcbb93d2f3a0b063
>> # Parent  3769372acb363c945b444a89dbb510b1c49fa7af
>> status: add relative directory help text (issue3835)
> [snip]
>> +      - show changes in the working directory relative to the
>> +        current directory (see filesets for more information)::
>
> This should probably be "see `:hg: help filesets`"... except that I
> find no explanation of this sorcery there. Instead, the explanation
> seems to be in `hg help patterns`. Well, at least a mention that re:
> activates regexp syntax, but I still consider it sorcery that this
> activate paths relative to the cwd.

I believe mpm changed that in-flight based on his previous message to
this patch.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5734,10 +5734,15 @@  def status(ui, repo, *pats, **opts):
       - show changes in the working directory relative to a
         changeset::
 
           hg status --rev 9353
 
+      - show changes in the working directory relative to the
+        current directory (see filesets for more information)::
+
+          hg status re:
+
       - show all changes including copies in an existing changeset::
 
           hg status --copies --change 9353
 
       - get a NUL separated list of added files, suitable for xargs::