From: Pratyush Yadav <me@yadavpratyush.com>
To: Birger Skogeng Pedersen <birger.sp@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] git-gui: select staged on ui_comm focus
Date: Thu, 17 Oct 2019 00:55:46 +0530 [thread overview]
Message-ID: <20191016192546.znhulmgxqqsjxy2u@yadavpratyush.com> (raw)
In-Reply-To: <20191007171145.1259-2-birger.sp@gmail.com>
On 07/10/19 07:11PM, Birger Skogeng Pedersen wrote:
> When the user focuses the Commit Message widget (to write a message), the
> diff view may be blank.
>
> With this patch a staged file is automatically selected when the Commit
> Message widget is focused, if no other file is selected (i.e. diff view
> is blank).
>
> Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
> ---
> git-gui.sh | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index b7f4d1e..70b846a 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -2700,6 +2700,15 @@ proc toggle_commit_type {} {
> do_select_commit_type
> }
>
> +proc check_diff_selected {} {
> + global current_diff_path file_lists
> + # If no diff path selected, select a staged file
> + if {$current_diff_path eq {}
> + && [llength $file_lists($::ui_index)] > 0} {
Nitpick: Please declare ui_index to be global. That way we can just use
$ui_index instead of the more tedious $::ui_index.
> + select_path_in_widget $::ui_index
> + }
> +}
> +
> ######################################################################
> ##
> ## ui construction
> @@ -3437,6 +3446,8 @@ pack .vpane.lower.commarea.buffer.header -side top -fill x
> pack .vpane.lower.commarea.buffer.frame -side left -fill y
> pack .vpane.lower.commarea.buffer -side left -fill y
>
> +bind $ui_comm <FocusIn> {check_diff_selected}
> +
This would mean the diff shows _only_ when you switch focus to the
commit message buffer. If the buffer is already in focus, and you stage
all files via Ctrl-I, the staged diff would not show.
IIRC you were having some trouble with this. A quick suggestion without
looking too much into the problem is to try putting the logic inside
`do_add_all` instead of inside the bind event handler.
> # -- Commit Message Buffer Context Menu
> #
> set ctxm .vpane.lower.commarea.buffer.ctxm
> --
> 2.23.0.windows.1
>
--
Regards,
Pratyush Yadav
next prev parent reply other threads:[~2019-10-16 19:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-14 12:24 git-gui: automatically move focus to staged file before typing commit message? Birger Skogeng Pedersen
2019-09-14 21:15 ` Pratyush Yadav
2019-09-14 21:26 ` Johannes Sixt
2019-09-14 21:27 ` Pratyush Yadav
2019-09-15 7:55 ` Birger Skogeng Pedersen
2019-09-16 18:01 ` Pratyush Yadav
2019-09-26 18:33 ` Birger Skogeng Pedersen
2019-09-26 19:30 ` Pratyush Yadav
2019-09-26 21:17 ` Birger Skogeng Pedersen
2019-10-07 16:52 ` Birger Skogeng Pedersen
2019-10-07 17:11 ` [PATCH 1/2] git-gui: implement proc select_path_in_widget Birger Skogeng Pedersen
2019-10-07 17:11 ` [PATCH 2/2] git-gui: select staged on ui_comm focus Birger Skogeng Pedersen
2019-10-16 19:25 ` Pratyush Yadav [this message]
2019-10-13 20:21 ` [PATCH 1/2] git-gui: implement proc select_path_in_widget Pratyush Yadav
2019-10-15 10:51 ` Birger Skogeng Pedersen
2019-10-16 19:28 ` Pratyush Yadav
2019-10-17 5:08 ` Birger Skogeng Pedersen
2019-10-17 5:33 ` Johannes Sixt
2019-10-17 6:54 ` Birger Skogeng Pedersen
2019-10-17 18:28 ` Pratyush Yadav
2019-10-08 17:59 ` git-gui: automatically move focus to staged file before typing commit message? Pratyush Yadav
2019-10-08 19:46 ` Birger Skogeng Pedersen
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=20191016192546.znhulmgxqqsjxy2u@yadavpratyush.com \
--to=me@yadavpratyush.com \
--cc=birger.sp@gmail.com \
--cc=git@vger.kernel.org \
/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).