git-add--interactive.perl: Add progress counter in the prompt #349

kunaltyagi · 2019-09-21T00:21:35Z

Hi git contributors!

I'm Kunal Tyagi. While I was choosing the relevant patches for a commit using the git add -p command, I found that there was no feedback regarding how many hunks from the current file had been processed and how many were left. So I decided to add a small change to the prompt which basically just displays (${current-hunk-id} + 1/${total-hunks}) before displaying the prompt during user interaction. This patch doesn't account for all total hunks, only per file.

I don't know perl so even this one liner might have mistakes. I did test this locally and hope this works for others. Personally, this change feels helpful to me when I have to separate a long list of changes after an erroneous commit.

On the #git-devel freenode channel, I was informed that @dscho is rewriting git-add in C. If so, perhaps a similar change could be added in the rewrite. I haven't seen his patches in detail so I can't comment if it'll be as trivial as in perl.

Regards
Kunal Tyagi

gitgitgadget · 2019-09-21T00:22:25Z

Welcome to GitGitGadget

Hi @kunaltyagi, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that this Pull Request has a good description, as it will be used as cover letter.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

the lines should not exceed 76 columns,
the first line should be like a header and typically start with a prefix like "tests:" or "commit:", and
the commit messages' body should be describing the "why?" of the change.
Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a PR comment of the form /allow <username>.

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions.

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox ("raw") file corresponding to the mail you want to reply to from the Git mailing list. If you use GMail, you can upload that raw mbox file via:

curl -g --user "<EMailAddress>:<Password>" --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

dscho · 2019-09-22T07:50:17Z

/allow

gitgitgadget · 2019-09-22T07:51:26Z

User kunaltyagi is now allowed to use GitGitGadget.

kunaltyagi · 2019-09-23T07:25:52Z

/submit

gitgitgadget · 2019-09-23T07:27:13Z

Submitted as [email protected]

gitgitgadget · 2019-09-25T15:40:13Z

On the Git mailing list, Johannes Schindelin wrote (reply to this):

Hi,

On Mon, 23 Sep 2019, Kunal Tyagi via GitGitGadget wrote:

> Hi git contributors!
>
> I'm Kunal Tyagi. While I was choosing the relevant patches for a commit
> using the git add -p command, I found that there was no feedback regardi=
ng
> how many hunks from the current file had been processed and how many wer=
e
> left. So I decided to add a small change to the prompt which basically j=
ust
> displays (${current-hunk-id} + 1/${total-hunks}) before displaying the
> prompt during user interaction. This patch doesn't account for all total
> hunks, only per file.

I like this idea!

> I don't know perl so even this one liner might have mistakes. I did test
> this locally and hope this works for others. Personally, this change fee=
ls
> helpful to me when I have to separate a long list of changes after an
> erroneous commit.
>
> On the #git-devel freenode channel, I was informed that @dscho is rewrit=
ing
> git-add in C. If so, perhaps a similar change could be added in the rewr=
ite.
> I haven't seen his patches in detail so I can't comment if it'll be as
> trivial as in perl.

I bet it will be trivial to implement it in C. Don't let this stop you,
your change should go in before built-in add -i.

Thanks,
Johannes

>
> Regards Kunal Tyagi
>
> Kunal Tyagi (1):
>   git-add--interactive.perl: Add progress counter in the prompt
>
>  git-add--interactive.perl  | 2 +-
>  t/t3701-add-interactive.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
>
> base-commit: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-349%2F=
kunaltyagi%2Fmaster-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-349/kunal=
tyagi/master-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/349
> --
> gitgitgadget
>

git-add--interactive.perl

kunaltyagi · 2019-09-29T01:29:19Z

/submit

gitgitgadget · 2019-09-29T01:30:32Z

Submitted as [email protected]

git-add--interactive.perl

Report the current hunk count and total number of hunks for the current file in the prompt Adjust the expected output in some tests to account for new data on the prompt Signed-off-by: Kunal Tyagi <[email protected]>

kunaltyagi · 2019-09-30T05:21:33Z

Hi

Thanks for your comments. I've modified the patch and I hope it is more suitable now.

I just used a repl to get the output and sent that as a patch. I don't really know perl (though printf syntax is almost universal).

Cheers
Kunal Tyagi

kunaltyagi · 2019-09-30T05:22:09Z

/submit

gitgitgadget · 2019-09-30T05:23:13Z

Submitted as [email protected]

gitgitgadget · 2019-10-04T03:43:51Z

This branch is now known as kt/add-i-progress.

gitgitgadget · 2019-10-04T03:43:52Z

This patch series was integrated into pu via git@60d083e.

gitgitgadget · 2019-10-04T05:54:39Z

git-add--interactive.perl

@@ -1541,7 +1541,7 @@ sub patch_update_file {
 		for (@{$hunk[$ix]{DISPLAY}}) {


On the Git mailing list, Junio C Hamano wrote (reply to this):

"Kunal Tyagi via GitGitGadget" <[email protected]> writes: > From: Kunal Tyagi <[email protected]> > > Report the current hunk count and total number of hunks for the current > file in the prompt > Adjust the expected output in some tests to account for new data on the prompt > > Signed-off-by: Kunal Tyagi <[email protected]> > --- > git-add--interactive.perl | 2 +- > t/t3701-add-interactive.sh | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Thanks; queued.

gitgitgadget · 2019-10-04T07:39:02Z

This patch series was integrated into pu via git@3912675.

gitgitgadget · 2019-10-06T03:56:24Z

This patch series was integrated into pu via git@e9c7cd0.

gitgitgadget · 2019-10-07T03:48:01Z

This patch series was integrated into pu via git@a273a14.

gitgitgadget · 2019-10-07T03:48:02Z

This patch series was integrated into next via git@00cf8fe.

gitgitgadget · 2019-10-08T05:09:04Z

This patch series was integrated into pu via git@5e871a3.

gitgitgadget · 2019-10-09T03:35:17Z

This patch series was integrated into pu via git@eb33b78.

gitgitgadget · 2019-10-09T07:52:45Z

This patch series was integrated into pu via git@fc1af0b.

gitgitgadget · 2019-10-11T07:45:13Z

This patch series was integrated into pu via git@f0d407e.

gitgitgadget · 2019-10-11T07:45:14Z

This patch series was integrated into next via git@f0d407e.

gitgitgadget · 2019-10-11T07:45:15Z

This patch series was integrated into master via git@f0d407e.

gitgitgadget · 2019-10-11T07:45:18Z

Closed via f0d407e.

dscho · 2019-10-11T14:13:26Z

🎉

kunaltyagi · 2019-10-11T16:06:31Z

I was actually wondering if it would be an improvement to add information regarding total files or hunks being considered instead of per file (possibly in the C version not the perl one)

Progress: 4/9 hunks this file; 30 hunks in 2 files
Add this hunk? (y/n....):

dscho · 2019-10-11T22:18:50Z

It would be an improvement, but the current code is really focused on individual files... Therefore it would take quite a bit more surgery to get that information.

kunaltyagi · 2019-10-12T02:09:45Z

quite a bit more surgery

Which branch is the C development going on?

dscho · 2019-10-12T15:26:28Z

Which branch is the C development going on?

It's developed (slowly) in #170, #171, #172, #173, #174, and #175.

weekly-digest bot mentioned this pull request Sep 22, 2019

Weekly Digest (15 September, 2019 - 22 September, 2019) #350

Closed

gitgitgadget bot reviewed Sep 25, 2019

View reviewed changes

git-add--interactive.perl Show resolved Hide resolved

gitgitgadget bot reviewed Sep 30, 2019

View reviewed changes

git-add--interactive.perl Show resolved Hide resolved

add -i: Show progress counter in the prompt

b351c74

Report the current hunk count and total number of hunks for the current file in the prompt Adjust the expected output in some tests to account for new data on the prompt Signed-off-by: Kunal Tyagi <[email protected]>

gitgitgadget bot added the pu label Oct 4, 2019

gitgitgadget bot reviewed Oct 4, 2019

View reviewed changes

gitgitgadget bot added the next label Oct 7, 2019

gitgitgadget bot added the master label Oct 11, 2019

gitgitgadget bot closed this Oct 11, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git-add--interactive.perl: Add progress counter in the prompt #349

git-add--interactive.perl: Add progress counter in the prompt #349

kunaltyagi commented Sep 21, 2019 •

edited

Loading

gitgitgadget bot commented Sep 21, 2019

dscho commented Sep 22, 2019

gitgitgadget bot commented Sep 22, 2019

kunaltyagi commented Sep 23, 2019

gitgitgadget bot commented Sep 23, 2019

gitgitgadget bot commented Sep 25, 2019

kunaltyagi commented Sep 29, 2019

gitgitgadget bot commented Sep 29, 2019

kunaltyagi commented Sep 30, 2019 •

edited

Loading

kunaltyagi commented Sep 30, 2019

gitgitgadget bot commented Sep 30, 2019

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot Oct 4, 2019

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot commented Oct 6, 2019

gitgitgadget bot commented Oct 7, 2019

gitgitgadget bot commented Oct 7, 2019

gitgitgadget bot commented Oct 8, 2019

gitgitgadget bot commented Oct 9, 2019

gitgitgadget bot commented Oct 9, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

dscho commented Oct 11, 2019

kunaltyagi commented Oct 11, 2019

dscho commented Oct 11, 2019

kunaltyagi commented Oct 12, 2019

dscho commented Oct 12, 2019

		@@ -1541,7 +1541,7 @@ sub patch_update_file {
		for (@{$hunk[$ix]{DISPLAY}}) {

git-add--interactive.perl: Add progress counter in the prompt #349

git-add--interactive.perl: Add progress counter in the prompt #349

Conversation

kunaltyagi commented Sep 21, 2019 • edited Loading

gitgitgadget bot commented Sep 21, 2019

Welcome to GitGitGadget

Contributing the patches

dscho commented Sep 22, 2019

gitgitgadget bot commented Sep 22, 2019

kunaltyagi commented Sep 23, 2019

gitgitgadget bot commented Sep 23, 2019

gitgitgadget bot commented Sep 25, 2019

kunaltyagi commented Sep 29, 2019

gitgitgadget bot commented Sep 29, 2019

kunaltyagi commented Sep 30, 2019 • edited Loading

kunaltyagi commented Sep 30, 2019

gitgitgadget bot commented Sep 30, 2019

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot Oct 4, 2019

Choose a reason for hiding this comment

gitgitgadget bot commented Oct 4, 2019

gitgitgadget bot commented Oct 6, 2019

gitgitgadget bot commented Oct 7, 2019

gitgitgadget bot commented Oct 7, 2019

gitgitgadget bot commented Oct 8, 2019

gitgitgadget bot commented Oct 9, 2019

gitgitgadget bot commented Oct 9, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

gitgitgadget bot commented Oct 11, 2019

dscho commented Oct 11, 2019

kunaltyagi commented Oct 11, 2019

dscho commented Oct 11, 2019

kunaltyagi commented Oct 12, 2019

dscho commented Oct 12, 2019

kunaltyagi commented Sep 21, 2019 •

edited

Loading

kunaltyagi commented Sep 30, 2019 •

edited

Loading