git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* Low prio: feature requests for git-gui
@ 2019-12-20  9:42 H.Merijn Brand
  2019-12-22 17:47 ` Pratyush Yadav
  0 siblings, 1 reply; 3+ messages in thread
From: H.Merijn Brand @ 2019-12-20  9:42 UTC (permalink / raw)
  To: git

[-- Attachment #1: Type: text/plain, Size: 952 bytes --]

• Right click context menu on file-entry in Unstaged Changes list

  - Reset changes → git checkout this file
    I see the current changes need to be reversed, are bogus or
    invalid
  - Restore this file → git checkout this file
    it was accidentally removed. Like the first option
  - Remove this file from disk
    Somehow an invalid restore, a misplaced output or other reason
    (core dump, debug output from other tools) made this file appear
    and I don't want to add it to .gitignore
  - Add to .gitignore
    Like above, but this file will re-appear more often

Does this sound reasonable enough to make it a ticket/issue?

-- 
H.Merijn Brand  http://tux.nl   Perl Monger  http://amsterdam.pm.org/
using perl5.00307 .. 5.31      porting perl5 on HP-UX, AIX, and Linux
https://useplaintext.email  https://tux.nl  http://www.test-smoke.org
http://qa.perl.org   http://www.goldmark.org/jeff/stupid-disclaimers/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Low prio: feature requests for git-gui
  2019-12-20  9:42 Low prio: feature requests for git-gui H.Merijn Brand
@ 2019-12-22 17:47 ` Pratyush Yadav
  2019-12-23 12:18   ` H.Merijn Brand
  0 siblings, 1 reply; 3+ messages in thread
From: Pratyush Yadav @ 2019-12-22 17:47 UTC (permalink / raw)
  To: H.Merijn Brand; +Cc: git

Hi Merijn,

On 20/12/19 10:42AM, H.Merijn Brand wrote:
> • Right click context menu on file-entry in Unstaged Changes list

It is something on my TODO list.

>   - Reset changes → git checkout this file
>     I see the current changes need to be reversed, are bogus or
>     invalid

I'm not sure what this means. When you hit Ctrl-J or choose it from the 
menu bar, current changes can be reverted by checking the file out from 
the index.

>   - Restore this file → git checkout this file
>     it was accidentally removed. Like the first option

What constitutes as "accidentally removed", and where do we restore the 
file from? If it needs to be restored from the index, then Ctrl-J should 
do the trick. If it needs to be restored from an older revision, well as 
of now git-gui doesn't have many features that deal with things like 
this. But maybe something like this can be added.

>   - Remove this file from disk
>     Somehow an invalid restore, a misplaced output or other reason
>     (core dump, debug output from other tools) made this file appear
>     and I don't want to add it to .gitignore

This feature was recently added in fa38ab6 (git-gui: revert untracked 
files by deleting them, 2019-12-01). You can hit Ctrl-J on the untracked 
file to delete it.

>   - Add to .gitignore
>     Like above, but this file will re-appear more often

A naive implementation of this shouldn't be too difficult. I'll see if I 
can find some time to do it.
 
> Does this sound reasonable enough to make it a ticket/issue?

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Low prio: feature requests for git-gui
  2019-12-22 17:47 ` Pratyush Yadav
@ 2019-12-23 12:18   ` H.Merijn Brand
  0 siblings, 0 replies; 3+ messages in thread
From: H.Merijn Brand @ 2019-12-23 12:18 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: git

[-- Attachment #1: Type: text/plain, Size: 2548 bytes --]

On Sun, 22 Dec 2019 23:17:18 +0530, Pratyush Yadav
<me@yadavpratyush.com> wrote:

> Hi Merijn,
> 
> On 20/12/19 10:42AM, H.Merijn Brand wrote:
> > • Right click context menu on file-entry in Unstaged Changes list  
> 
> It is something on my TODO list.

\o/

> >   - Reset changes → git checkout this file
> >     I see the current changes need to be reversed, are bogus or
> >     invalid  
> 
> I'm not sure what this means. When you hit Ctrl-J or choose it from
> the menu bar, current changes can be reverted by checking the file
> out from the index.

I always interpreted Ctrl-J as to mean revert *all* changes. Now I know
better. Thanks.

If you add it to a context menu, I'd like to have an option in setting
not to get a dialog, as choosing it for a single file is (at least to
me) obvious enough not to need a dialog to confirm my choice.

> >   - Restore this file → git checkout this file
> >     it was accidentally removed. Like the first option  
> 
> What constitutes as "accidentally removed", and where do we restore
> the file from? If it needs to be restored from the index, then Ctrl-J
> should do the trick. If it needs to be restored from an older
> revision, well as of now git-gui doesn't have many features that deal
> with things like this. But maybe something like this can be added.

In my mind there is a difference between a changed file and a deleted
file. Ctrl-J restores the previous state, which in effect is the same
for both options.

> >   - Remove this file from disk
> >     Somehow an invalid restore, a misplaced output or other reason
> >     (core dump, debug output from other tools) made this file appear
> >     and I don't want to add it to .gitignore  
> 
> This feature was recently added in fa38ab6 (git-gui: revert untracked 
> files by deleting them, 2019-12-01). You can hit Ctrl-J on the
> untracked file to delete it.

Yeah!

> >   - Add to .gitignore
> >     Like above, but this file will re-appear more often  
> 
> A naive implementation of this shouldn't be too difficult. I'll see
> if I can find some time to do it.

Yeah! (again :)

> > Does this sound reasonable enough to make it a ticket/issue?  

Thanks for the feedback

-- 
H.Merijn Brand  http://tux.nl   Perl Monger  http://amsterdam.pm.org/
using perl5.00307 .. 5.31      porting perl5 on HP-UX, AIX, and Linux
https://useplaintext.email  https://tux.nl  http://www.test-smoke.org
http://qa.perl.org   http://www.goldmark.org/jeff/stupid-disclaimers/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-12-23 12:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-20  9:42 Low prio: feature requests for git-gui H.Merijn Brand
2019-12-22 17:47 ` Pratyush Yadav
2019-12-23 12:18   ` H.Merijn Brand

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).