* [PATCH] completion: Add '--edit-todo' to rebase @ 2015-07-13 11:27 Thomas Braun 2015-07-13 13:11 ` John Keeping 0 siblings, 1 reply; 9+ messages in thread From: Thomas Braun @ 2015-07-13 11:27 UTC (permalink / raw) To: git; +Cc: Ramkumar Ramachandra, Junio C Hamano, John Keeping, SZEDER Gábor Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648..2567a61 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1668,7 +1668,7 @@ _git_rebase () { local dir="$(__gitdir)" if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then - __gitcomp "--continue --skip --abort" + __gitcomp "--continue --skip --abort --edit-todo" return fi __git_complete_strategy && return ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] completion: Add '--edit-todo' to rebase 2015-07-13 11:27 [PATCH] completion: Add '--edit-todo' to rebase Thomas Braun @ 2015-07-13 13:11 ` John Keeping 2015-07-27 17:54 ` [PATCH v2] " Thomas Braun 0 siblings, 1 reply; 9+ messages in thread From: John Keeping @ 2015-07-13 13:11 UTC (permalink / raw) To: Thomas Braun; +Cc: git, Ramkumar Ramachandra, Junio C Hamano, SZEDER Gábor On Mon, Jul 13, 2015 at 01:27:56PM +0200, Thomas Braun wrote: > Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> > --- > contrib/completion/git-completion.bash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index c97c648..2567a61 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1668,7 +1668,7 @@ _git_rebase () > { > local dir="$(__gitdir)" > if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then > - __gitcomp "--continue --skip --abort" > + __gitcomp "--continue --skip --abort --edit-todo" git-rebase.sh contains: if test "$action" = "edit-todo" && test "$type" != "interactive" then die "$(gettext "The --edit-todo action can only be used during interactive rebase.")" fi I wonder if it's worth doing a similar check here, which presumably means testing if "$dir"/interactive exists. > return > fi > __git_complete_strategy && return > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-13 13:11 ` John Keeping @ 2015-07-27 17:54 ` Thomas Braun 2015-07-30 11:24 ` SZEDER Gábor 0 siblings, 1 reply; 9+ messages in thread From: Thomas Braun @ 2015-07-27 17:54 UTC (permalink / raw) To: John Keeping; +Cc: git, Junio C Hamano, SZEDER Gábor, Ramkumar Ramachandra Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> --- > John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 geschrieben: > git-rebase.sh contains: > > if test "$action" = "edit-todo" && test "$type" != "interactive" > then > die "$(gettext "The --edit-todo action can only be used during interactive > rebase.")" > fi > > I wonder if it's worth doing a similar check here, which presumably > means testing if "$dir"/interactive exists. Good point. Thanks for the hint. contrib/completion/git-completion.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648..b03050e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1668,7 +1668,11 @@ _git_rebase () { local dir="$(__gitdir)" if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then - __gitcomp "--continue --skip --abort" + if [ -d "$dir"/interactive ]; then + __gitcomp "--continue --skip --abort --edit-todo" + else + __gitcomp "--continue --skip --abort" + fi return fi __git_complete_strategy && return -- 2.4.5.windows.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-27 17:54 ` [PATCH v2] " Thomas Braun @ 2015-07-30 11:24 ` SZEDER Gábor 2015-07-30 11:29 ` John Keeping 0 siblings, 1 reply; 9+ messages in thread From: SZEDER Gábor @ 2015-07-30 11:24 UTC (permalink / raw) To: Thomas Braun; +Cc: John Keeping, git, Junio C Hamano, Ramkumar Ramachandra Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>: > Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> > --- >> John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 geschrieben: >> git-rebase.sh contains: >> >> if test "$action" = "edit-todo" && test "$type" != "interactive" >> then >> die "$(gettext "The --edit-todo action can only be used during interactive >> rebase.")" >> fi >> >> I wonder if it's worth doing a similar check here, which presumably >> means testing if "$dir"/interactive exists. > > Good point. Thanks for the hint. Perhaps the subject line could say "completion: offer '--edit-todo' during interactive rebase" to be a bit more specific. > contrib/completion/git-completion.bash | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > index c97c648..b03050e 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1668,7 +1668,11 @@ _git_rebase () > { > local dir="$(__gitdir)" > if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then > - __gitcomp "--continue --skip --abort" > + if [ -d "$dir"/interactive ]; then This doesn't work for me, I think it looks for the right file at the wrong place. During an interactive rebase I have no '.git/interactive' file but a '.git/rebase-merge/interactive', so I never get '--edit-todo'. After some playing around and a cursory look at the source it seems to me that I have '.git/rebase-apply' during a "regular" rebase and '.git/rebase-merge' during an interactive rebase, and git-rebase.sh checks the presence of the 'interactive' file only in '.git/rebase-merge'. It's not clear to me yet whether it's possible to have a '.git/rebase-merge' without the file 'interactive' in it. If it is possible, then I'd like to know with which commands and under what circumstances. If it isn't, then we wouldn't have to look for the file at all, because checking the presence of the directory would be enough. Best, Gábor > + __gitcomp "--continue --skip --abort --edit-todo" > + else > + __gitcomp "--continue --skip --abort" > + fi > return > fi > __git_complete_strategy && return > -- > 2.4.5.windows.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-30 11:24 ` SZEDER Gábor @ 2015-07-30 11:29 ` John Keeping 2015-07-31 10:16 ` SZEDER Gábor 0 siblings, 1 reply; 9+ messages in thread From: John Keeping @ 2015-07-30 11:29 UTC (permalink / raw) To: SZEDER Gábor; +Cc: Thomas Braun, git, Junio C Hamano, Ramkumar Ramachandra On Thu, Jul 30, 2015 at 01:24:03PM +0200, SZEDER Gábor wrote: > > Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>: > > > Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> > > --- > >> John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 geschrieben: > >> git-rebase.sh contains: > >> > >> if test "$action" = "edit-todo" && test "$type" != "interactive" > >> then > >> die "$(gettext "The --edit-todo action can only be used during interactive > >> rebase.")" > >> fi > >> > >> I wonder if it's worth doing a similar check here, which presumably > >> means testing if "$dir"/interactive exists. > > > > Good point. Thanks for the hint. > > Perhaps the subject line could say "completion: offer '--edit-todo' > during interactive rebase" to be a bit more specific. > > > contrib/completion/git-completion.bash | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/contrib/completion/git-completion.bash > > b/contrib/completion/git-completion.bash > > index c97c648..b03050e 100644 > > --- a/contrib/completion/git-completion.bash > > +++ b/contrib/completion/git-completion.bash > > @@ -1668,7 +1668,11 @@ _git_rebase () > > { > > local dir="$(__gitdir)" > > if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then > > - __gitcomp "--continue --skip --abort" > > + if [ -d "$dir"/interactive ]; then > > This doesn't work for me, I think it looks for the right file at the > wrong place. During an interactive rebase I have no > '.git/interactive' file but a '.git/rebase-merge/interactive', so I > never get '--edit-todo'. > > After some playing around and a cursory look at the source it seems to > me that I have '.git/rebase-apply' during a "regular" rebase and > '.git/rebase-merge' during an interactive rebase, and git-rebase.sh > checks the presence of the 'interactive' file only in > '.git/rebase-merge'. It's not clear to me yet whether it's possible > to have a '.git/rebase-merge' without the file 'interactive' in it. > If it is possible, then I'd like to know with which commands and under > what circumstances. If it isn't, then we wouldn't have to look for > the file at all, because checking the presence of the directory would > be enough. "git rebase --merge" will use ".git/rebase-merge" without creating the "interactive" flag. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-30 11:29 ` John Keeping @ 2015-07-31 10:16 ` SZEDER Gábor 2015-07-31 17:37 ` Thomas Braun 0 siblings, 1 reply; 9+ messages in thread From: SZEDER Gábor @ 2015-07-31 10:16 UTC (permalink / raw) To: John Keeping; +Cc: Thomas Braun, git, Junio C Hamano, Ramkumar Ramachandra Quoting John Keeping <john@keeping.me.uk>: > On Thu, Jul 30, 2015 at 01:24:03PM +0200, SZEDER Gábor wrote: >> >> Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>: >> >>> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> >>> --- >>>> John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 >> geschrieben: >>>> git-rebase.sh contains: >>>> >>>> if test "$action" = "edit-todo" && test "$type" != "interactive" >>>> then >>>> die "$(gettext "The --edit-todo action can only be used during >> interactive >>>> rebase.")" >>>> fi >>>> >>>> I wonder if it's worth doing a similar check here, which presumably >>>> means testing if "$dir"/interactive exists. >>> >>> Good point. Thanks for the hint. >> >> Perhaps the subject line could say "completion: offer '--edit-todo' >> during interactive rebase" to be a bit more specific. >> >>> contrib/completion/git-completion.bash | 6 +++++- >>> 1 file changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git a/contrib/completion/git-completion.bash >>> b/contrib/completion/git-completion.bash >>> index c97c648..b03050e 100644 >>> --- a/contrib/completion/git-completion.bash >>> +++ b/contrib/completion/git-completion.bash >>> @@ -1668,7 +1668,11 @@ _git_rebase () >>> { >>> local dir="$(__gitdir)" >>> if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then >>> - __gitcomp "--continue --skip --abort" >>> + if [ -d "$dir"/interactive ]; then >> >> This doesn't work for me, I think it looks for the right file at the >> wrong place. During an interactive rebase I have no >> '.git/interactive' file but a '.git/rebase-merge/interactive', so I >> never get '--edit-todo'. Just noticed another issue here: it looks for a directory, though it should look for a file. >> After some playing around and a cursory look at the source it seems to >> me that I have '.git/rebase-apply' during a "regular" rebase and >> '.git/rebase-merge' during an interactive rebase, and git-rebase.sh >> checks the presence of the 'interactive' file only in >> '.git/rebase-merge'. It's not clear to me yet whether it's possible >> to have a '.git/rebase-merge' without the file 'interactive' in it. >> If it is possible, then I'd like to know with which commands and under >> what circumstances. If it isn't, then we wouldn't have to look for >> the file at all, because checking the presence of the directory would >> be enough. > > "git rebase --merge" will use ".git/rebase-merge" without creating the > "interactive" flag. Oh, right, thanks. I should have remembered, I wrote the test of the prompt script for that case... (On a related note: is it possible to have a '.git/rebase-apply' directory, but neither 'rebasing' or 'applying' files within? The prompt script has a long if-elif chain with such a branch, and I remember wondering how I could trigger it for testing.) Anyway, so this could be something like (modulo likely whitespace damage): diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 07c34ef913..fac01d6985 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1667,7 +1667,10 @@ _git_push () _git_rebase () { local dir="$(__gitdir)" - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then + if [ -f "$dir"/rebase-merge/interactive ]; then + __gitcomp "--continue --skip --abort --edit-todo" + return + elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then __gitcomp "--continue --skip --abort" return fi Best, Gábor ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-31 10:16 ` SZEDER Gábor @ 2015-07-31 17:37 ` Thomas Braun 2015-08-01 9:25 ` SZEDER Gábor 0 siblings, 1 reply; 9+ messages in thread From: Thomas Braun @ 2015-07-31 17:37 UTC (permalink / raw) To: SZEDER Gábor, John Keeping; +Cc: git, Junio C Hamano, Ramkumar Ramachandra Am 31.07.2015 um 12:16 schrieb SZEDER Gábor: > > Quoting John Keeping <john@keeping.me.uk>: > >> On Thu, Jul 30, 2015 at 01:24:03PM +0200, SZEDER Gábor wrote: >>> >>> Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>: >>> >>>> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> >>>> --- >>>>> John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 >>> geschrieben: >>>>> git-rebase.sh contains: >>>>> >>>>> if test "$action" = "edit-todo" && test "$type" != "interactive" >>>>> then >>>>> die "$(gettext "The --edit-todo action can only be used during >>> interactive >>>>> rebase.")" >>>>> fi >>>>> >>>>> I wonder if it's worth doing a similar check here, which presumably >>>>> means testing if "$dir"/interactive exists. >>>> >>>> Good point. Thanks for the hint. >>> >>> Perhaps the subject line could say "completion: offer '--edit-todo' >>> during interactive rebase" to be a bit more specific. >>> >>>> contrib/completion/git-completion.bash | 6 +++++- >>>> 1 file changed, 5 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/contrib/completion/git-completion.bash >>>> b/contrib/completion/git-completion.bash >>>> index c97c648..b03050e 100644 >>>> --- a/contrib/completion/git-completion.bash >>>> +++ b/contrib/completion/git-completion.bash >>>> @@ -1668,7 +1668,11 @@ _git_rebase () >>>> { >>>> local dir="$(__gitdir)" >>>> if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then >>>> - __gitcomp "--continue --skip --abort" >>>> + if [ -d "$dir"/interactive ]; then >>> >>> This doesn't work for me, I think it looks for the right file at the >>> wrong place. During an interactive rebase I have no >>> '.git/interactive' file but a '.git/rebase-merge/interactive', so I >>> never get '--edit-todo'. > > Just noticed another issue here: it looks for a directory, though it > should look for a file. > > >>> After some playing around and a cursory look at the source it seems to >>> me that I have '.git/rebase-apply' during a "regular" rebase and >>> '.git/rebase-merge' during an interactive rebase, and git-rebase.sh >>> checks the presence of the 'interactive' file only in >>> '.git/rebase-merge'. It's not clear to me yet whether it's possible >>> to have a '.git/rebase-merge' without the file 'interactive' in it. >>> If it is possible, then I'd like to know with which commands and under >>> what circumstances. If it isn't, then we wouldn't have to look for >>> the file at all, because checking the presence of the directory would >>> be enough. >> >> "git rebase --merge" will use ".git/rebase-merge" without creating the >> "interactive" flag. > > Oh, right, thanks. I should have remembered, I wrote the test of the > prompt script for that case... > (On a related note: is it possible to have a '.git/rebase-apply' > directory, but neither 'rebasing' or 'applying' files within? The > prompt script has a long if-elif chain with such a branch, and I > remember wondering how I could trigger it for testing.) > > Anyway, so this could be something like (modulo likely whitespace damage): > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > index 07c34ef913..fac01d6985 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1667,7 +1667,10 @@ _git_push () > _git_rebase () > { > local dir="$(__gitdir)" > - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then > + if [ -f "$dir"/rebase-merge/interactive ]; then > + __gitcomp "--continue --skip --abort --edit-todo" > + return > + elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then > __gitcomp "--continue --skip --abort" > return > fi This looks much better than my attempt. Thanks. How is the protocol now? Do I reroll and add Helped-By: John Keeping <john@keeping.me.uk> Completely-Overhauled-And-Properly-Implemented: SZEDER Gábor <szeder@ira.uka.de> ? Thomas ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] completion: Add '--edit-todo' to rebase 2015-07-31 17:37 ` Thomas Braun @ 2015-08-01 9:25 ` SZEDER Gábor 2015-08-05 13:40 ` [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase Thomas Braun 0 siblings, 1 reply; 9+ messages in thread From: SZEDER Gábor @ 2015-08-01 9:25 UTC (permalink / raw) To: Thomas Braun; +Cc: John Keeping, git, Junio C Hamano, Ramkumar Ramachandra Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>: > Am 31.07.2015 um 12:16 schrieb SZEDER Gábor: >> Anyway, so this could be something like (modulo likely whitespace damage): >> >> diff --git a/contrib/completion/git-completion.bash >> b/contrib/completion/git-completion.bash >> index 07c34ef913..fac01d6985 100644 >> --- a/contrib/completion/git-completion.bash >> +++ b/contrib/completion/git-completion.bash >> @@ -1667,7 +1667,10 @@ _git_push () >> _git_rebase () >> { >> local dir="$(__gitdir)" >> - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then >> + if [ -f "$dir"/rebase-merge/interactive ]; then >> + __gitcomp "--continue --skip --abort --edit-todo" >> + return >> + elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then >> __gitcomp "--continue --skip --abort" >> return >> fi > > This looks much better than my attempt. Thanks. > > How is the protocol now? Do I reroll and add > Helped-By: John Keeping <john@keeping.me.uk> > Completely-Overhauled-And-Properly-Implemented: SZEDER Gábor > <szeder@ira.uka.de> Ugh :) I'm quite happy with Helped-by, if you do a proper reroll after trying it out to see that it indeed does what it should. Thanks, Gábor ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase 2015-08-01 9:25 ` SZEDER Gábor @ 2015-08-05 13:40 ` Thomas Braun 0 siblings, 0 replies; 9+ messages in thread From: Thomas Braun @ 2015-08-05 13:40 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, John Keeping, SZEDER Gábor, Ramkumar Ramachandra Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de> Helped-by: John Keeping <john@keeping.me.uk> Helped-by: SZEDER Gábor <szeder@ira.uka.de> --- Tested by: - ensuring I'm in a bash shell - source git-completion.bash - git rebase -i HEAD~1, choose edit instead of pick in the editor - on entering "git rebase" you should be offered "--edit-todo" contrib/completion/git-completion.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648..087771b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1667,7 +1667,10 @@ _git_push () _git_rebase () { local dir="$(__gitdir)" - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then + if [ -f "$dir"/rebase-merge/interactive ]; then + __gitcomp "--continue --skip --abort --edit-todo" + return + elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then __gitcomp "--continue --skip --abort" return fi -- 2.4.3.413.ga5fe668 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-08-05 13:40 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-13 11:27 [PATCH] completion: Add '--edit-todo' to rebase Thomas Braun 2015-07-13 13:11 ` John Keeping 2015-07-27 17:54 ` [PATCH v2] " Thomas Braun 2015-07-30 11:24 ` SZEDER Gábor 2015-07-30 11:29 ` John Keeping 2015-07-31 10:16 ` SZEDER Gábor 2015-07-31 17:37 ` Thomas Braun 2015-08-01 9:25 ` SZEDER Gábor 2015-08-05 13:40 ` [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase Thomas Braun
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.