Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: Even better, we can hit a middle ground by abstracting away some of the complexity. The latter half of __git_ps1 is already fairly nice; w/i/s/u/c/p and friends can serve as the basis of such an abstraction, even though r does want to be separated further. I

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Ramkumar Ramachandra
Thomas Rast wrote: Do you have other ways of distinguishing the branch and the state? Colors? I'm a bit too lazy to check. Perhaps it could be made to only use caps if not in colored mode? Currently, no. See git-prompt.sh:401, 403, 409; we don't have a separate color for $r. I didn't

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Ramkumar Ramachandra artag...@gmail.com writes: Currently, when performing any operation that saves the state and expects the user the continue (like rebase, bisect, am), the prompt screams: artagnon|completion|REBASE-i 2/2:~/src/git$ Lowercase the

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Jeff King
On Mon, Jun 03, 2013 at 03:17:27PM +0530, Ramkumar Ramachandra wrote: Thomas Rast wrote: Do you have other ways of distinguishing the branch and the state? Colors? I'm a bit too lazy to check. Perhaps it could be made to only use caps if not in colored mode? Currently, no. See

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Ramkumar Ramachandra
Jeff King wrote: It seems silly to argue about output formats when we are writing a prompt in a convenient Turing-complete scripting language already. What about something like: Could you have a look at __git_ps1_colorize_gitstring from rr/zsh-color-prompt in pu? In the general case, wouldn't

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Jeff King
On Tue, Jun 04, 2013 at 09:14:23AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: It seems silly to argue about output formats when we are writing a prompt in a convenient Turing-complete scripting language already. What about something like: Could you have a look at