From: Phil Hord <phil.hord@gmail.com>
To: Phil Hord <hordp@cisco.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
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>,
Nguyen Huynh Khoi Nguyen
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Subject: Re: [PATCHv2] git-status: show short sequencer state
Date: Mon, 29 Oct 2012 14:05:14 -0400 [thread overview]
Message-ID: <CABURp0o7b5aZV6jNM=DSweh-8zVgGppxVsXisAcoNk7TxHrdgQ@mail.gmail.com> (raw)
In-Reply-To: <5089633C.8030307@cisco.com>
On Thu, Oct 25, 2012 at 12:05 PM, Phil Hord <hordp@cisco.com> wrote:
>
> Jeff King wrote:
>> On Tue, Oct 23, 2012 at 04:02:54PM -0400, Phil Hord wrote:
>>
>>> Teach git-status to report the sequencer state in short form
>>> using a new --sequencer (-S) switch. Output zero or more
>>> simple state token strings indicating the deduced state of the
>>> git sequencer.
>>>
>>> Introduce a common function to determine the current sequencer
>>> state so the regular status function and this short version can
>>> share common code.
>>>
>>> Add a substate to wt_status_state to track more detailed
>>> information about a state, such as "conflicted" or "resolved".
>>> Move the am_empty_patch flage out of wt_status_state and into
>> This patch ended up quite long. It might be a little easier to review
>> if it were broken into refactoring steps (I have not looked at it too
>> closely yet, but it seems like the three paragraphs above could each be
>> their own commit).
I'm currently splitting this out into a series and reconsidering some
of it along the way. I need some guidance.
I want to support these two modes:
A. 'git status --short' with sequence tokens added:
## conflicted
## merge
?? untracked-workdir-file
etc.
B. Same as (A) but without workdir status:
## conflicted
## merge
The user who wants 'A' would initiate it like this:
git status --sequencer
or
git status -S
How do I spell the options for 'B'? I have come up with these three
possibilities:
git --sequencer-only # Another switch
git --sequencer=only # An OPTARG parser
git -S -S # like git-diff -C -C, an OPT_COUNTUP
The first one is easy but weird, imho.
The second seems silly for just one type of option.
The last one is cheap to implement, but harder to explain in Documentation/
Any opinions?
Phil
next prev parent reply other threads:[~2012-10-29 18:05 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 [this message]
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
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='CABURp0o7b5aZV6jNM=DSweh-8zVgGppxVsXisAcoNk7TxHrdgQ@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@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=hordp@cisco.com \
--cc=konglu@minatec.inpg.fr \
--cc=peff@peff.net \
/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).