From: Phil Hord <hordp@cisco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, phil.hord@gmail.com,
Jeff King <peff@peff.net>,
konglu@minatec.inpg.fr,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Kong Lucien <Lucien.Kong@ensimag.imag.fr>,
Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>,
Jonas Franck <Franck.Jonas@ensimag.imag.fr>,
Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>
Subject: Re: [PATCHv3 3/4] git-status: show short sequencer state
Date: Tue, 13 Nov 2012 18:50:47 -0500 [thread overview]
Message-ID: <50A2DCD7.4050909@cisco.com> (raw)
In-Reply-To: <50A13C9A.8070108@cisco.com>
Phil Hord wrote:
> Junio C Hamano wrote:
>> Phil Hord <hordp@cisco.com> writes:
>>
>>> State token strings which may be emitted and their meanings:
>>> merge a merge is in progress
>>> am an am is in progress
>>> am-is-empty the am patch is empty
>>> rebase a rebase is in progress
>>> rebase-interactive an interactive rebase is in progress
>>> cherry-pick a cherry-pick is in progress
>>> bisect a bisect is in progress
>>> conflicted there are unresolved conflicts
>>> commit-pending a commit operation is waiting to be completed
>>> splitting interactive rebase, commit is being split
>>>
>>> I also considered adding these tokens, but I decided it was not
>>> appropriate since these changes are not sequencer-related. But
>>> it is possible I am being too short-sighted or have chosen the
>>> switch name poorly.
>>> changed-index Changes exist in the index
>>> changed-files Changes exist in the working directory
>>> untracked New files exist in the working directory
>> I tend to agree; unlike all the normal output from "status -s" that
>> are per-file, the above are the overall states of the working tree.
>>
>> It is just that most of the "overall states" look as if they are
>> dominated by "sequencer states", but that is only because you chose
>> to call states related to things like "am" and "bisect" that are not
>> sequencer states as such.
>>
>> It probably should be called the tree state, working tree state, or
>> somesuch.
> I think you are agreeing that I chose the switch name poorly, right?
>
> Do you think '--tree-state' is an acceptable switch or do you have other
> suggestions?
>
I've been calling these 'tokens' myself. A token is a word-or-phrase I
can parse easily with the default $IFS, for simpler script handling.
I'm happy to make that official and use --tokens and -T, but I suspect a
more appropriate name is available.
Phil
next prev parent reply other threads:[~2012-11-13 23:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 20:02 [PATCHv2] git-status: show short sequencer state Phil Hord
2012-10-23 20:02 ` Phil Hord
2012-10-25 9:29 ` Jeff King
2012-10-25 16:05 ` Phil Hord
2012-10-29 18:05 ` Phil Hord
2012-10-29 21:41 ` Jeff King
2012-10-29 22:26 ` Phil Hord
2012-10-29 23:31 ` [PATCHv2 0/3] git-status short sequencer state info Phil Hord
2012-10-29 23:31 ` [PATCHv2 1/3] Refactor print_state into get_state Phil Hord
2012-10-29 23:31 ` [PATCHv2 2/3] wt-status: More state retrieval abstraction Phil Hord
2012-10-29 23:31 ` [PATCHv2 3/3] git-status: show short sequencer state Phil Hord
2012-11-09 18:56 ` [PATCHv3 0/4] git-status short sequencer state info Phil Hord
2012-11-09 18:56 ` [PATCHv3 1/4] Refactor print_state into get_state Phil Hord
2012-11-12 18:29 ` Ramkumar Ramachandra
2012-11-09 18:56 ` [PATCHv3 2/4] wt-status: Teach sequencer advice to use get_state Phil Hord
2012-11-09 18:56 ` [PATCHv3 3/4] git-status: show short sequencer state Phil Hord
2012-11-12 17:45 ` Junio C Hamano
2012-11-12 18:14 ` Phil Hord
2012-11-13 23:50 ` Phil Hord [this message]
2012-11-14 13:29 ` Junio C Hamano
2012-11-14 13:44 ` Phil Hord
2012-11-14 17:44 ` Junio C Hamano
2012-11-14 19:14 ` Phil Hord
2012-11-14 19:35 ` Junio C Hamano
2012-11-14 19:57 ` Junio C Hamano
2012-11-09 18:56 ` [PATCHv3 4/4] Add tests for git-status --sequencer Phil Hord
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50A2DCD7.4050909@cisco.com \
--to=hordp@cisco.com \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=konglu@minatec.inpg.fr \
--cc=peff@peff.net \
--cc=phil.hord@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).