Patchwork [1,of,5] show: tweak warning message

login
register
mail settings
Submitter Gregory Szorc
Date July 4, 2017, 4:32 a.m.
Message ID <0cacc533e884965d93b4.1499142757@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/21961/
State Accepted
Headers show

Comments

Gregory Szorc - July 4, 2017, 4:32 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1499141448 25200
#      Mon Jul 03 21:10:48 2017 -0700
# Node ID 0cacc533e884965d93b426c6805a55097010dcbe
# Parent  45d6e2767a931aefb8052d9aa9ba50343b46290e
show: tweak warning message

'.' is "working directory parent" not "working directory."
Yuya Nishihara - July 4, 2017, 1:29 p.m.
On Mon, 03 Jul 2017 21:32:37 -0700, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1499141448 25200
> #      Mon Jul 03 21:10:48 2017 -0700
> # Node ID 0cacc533e884965d93b426c6805a55097010dcbe
> # Parent  45d6e2767a931aefb8052d9aa9ba50343b46290e
> show: tweak warning message

Queued 1, 2, 4, and 5, thanks.

> diff --git a/hgext/show.py b/hgext/show.py
> --- a/hgext/show.py
> +++ b/hgext/show.py
> @@ -182,7 +182,7 @@ def showstack(ui, repo, displayer):
>                              'working directory'))

You have one more 'working directory' above.
Phillip Cohen - July 5, 2017, 5:43 a.m.
Is there any consensus on whether to use "working directory parent"
vs. "working copy parent"? I see both used in the codebase (though
more occurrences of "working directory parent").

On Tue, Jul 4, 2017 at 6:29 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> On Mon, 03 Jul 2017 21:32:37 -0700, Gregory Szorc wrote:
>> # HG changeset patch
>> # User Gregory Szorc <gregory.szorc@gmail.com>
>> # Date 1499141448 25200
>> #      Mon Jul 03 21:10:48 2017 -0700
>> # Node ID 0cacc533e884965d93b426c6805a55097010dcbe
>> # Parent  45d6e2767a931aefb8052d9aa9ba50343b46290e
>> show: tweak warning message
>
> Queued 1, 2, 4, and 5, thanks.
>
>> diff --git a/hgext/show.py b/hgext/show.py
>> --- a/hgext/show.py
>> +++ b/hgext/show.py
>> @@ -182,7 +182,7 @@ def showstack(ui, repo, displayer):
>>                              'working directory'))
>
> You have one more 'working directory' above.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Sean Farley - July 5, 2017, 5:46 a.m.
Phillip Cohen <phillip@phillip.io> writes:

> Is there any consensus on whether to use "working directory parent"
> vs. "working copy parent"? I see both used in the codebase (though
> more occurrences of "working directory parent").

If I'm not mistaken, I believe mpm agreed to 'working directory' which
aligns with the 'wdir()' revset.

Patch

diff --git a/hgext/show.py b/hgext/show.py
--- a/hgext/show.py
+++ b/hgext/show.py
@@ -182,7 +182,7 @@  def showstack(ui, repo, displayer):
                             'working directory'))
 
     if wdirctx.phase() == phases.public:
-        ui.write(_('(empty stack; working directory is a published '
+        ui.write(_('(empty stack; working directory parent is a published '
                    'changeset)\n'))
         return
 
diff --git a/tests/test-show-stack.t b/tests/test-show-stack.t
--- a/tests/test-show-stack.t
+++ b/tests/test-show-stack.t
@@ -77,7 +77,7 @@  working dir on public changeset should d
 
   $ hg -q up 1
   $ hg show stack
-  (empty stack; working directory is a published changeset)
+  (empty stack; working directory parent is a published changeset)
 
 Branch point in descendants displayed at top of graph