Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-02-13 Thread graham
LGTM http://codereview.appspot.com/5504092/diff/20001/scripts/auxiliar/lily-git.tcl File scripts/auxiliar/lily-git.tcl (right): http://codereview.appspot.com/5504092/diff/20001/scripts/auxiliar/lily-git.tcl#newcode248 scripts/auxiliar/lily-git.tcl:248: git remote add -t $originHead \ This shoul

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-21 Thread Carl . D . Sorensen
Nice review. I will make changes in response to your comments. Thanks, Carl http://codereview.appspot.com/5504092/diff/14001/scripts/auxiliar/lily-git.tcl File scripts/auxiliar/lily-git.tcl (right): http://codereview.appspot.com/5504092/diff/14001/scripts/auxiliar/lily-git.tcl#newcode222 sc

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-21 Thread Carl Sorensen
On 1/21/12 5:36 PM, "Janek Warchoł" wrote: >2012/1/21 James : >> Hello >> >> On 21 January 2012 21:12, wrote: >>> Some questions and concerns. >> >> While I don't understand any of this really, isn't lily-git.tcl >> supposed to be for git-idiots (like me) who don't even want to think >> about b

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-21 Thread Janek Warchoł
2012/1/21 James : > Hello > > On 21 January 2012 21:12,   wrote: >> Some questions and concerns. > > While I don't understand any of this really, isn't lily-git.tcl > supposed to be for git-idiots (like me) who don't even want to think > about branches? :) That's exactly why they should work thems

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-21 Thread James
Hello On 21 January 2012 21:12, wrote: > Some questions and concerns. While I don't understand any of this really, isn't lily-git.tcl supposed to be for git-idiots (like me) who don't even want to think about branches? :) Just wondering if Janek is 'overthinking' this - apologies if not. Also

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-21 Thread janek . lilypond
Some questions and concerns. thanks, Janek http://codereview.appspot.com/5504092/diff/14001/scripts/auxiliar/lily-git.tcl File scripts/auxiliar/lily-git.tcl (right): http://codereview.appspot.com/5504092/diff/14001/scripts/auxiliar/lily-git.tcl#newcode222 scripts/auxiliar/lily-git.tcl:222: pro

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-20 Thread graham
LGTM http://codereview.appspot.com/5504092/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-16 Thread Carl . D . Sorensen
New version of lilygit.tcl that: 1. Treats staging properly -- i.e. does not create a local staging branch 2. Does rebase before pushing patch on a detached head (as now described in cg patch) 3. Has an environment variable setting push access, so no editing of the file is necessary (which mak

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-14 Thread Carl . D . Sorensen
On 2012/01/14 09:31:39, Graham Percival wrote: Look, could we just treat this as three separate stages? 1. update lily-git.tcl to use $LILYPOND_GIT and use dev/local-staging. 2. get the git instructions for the command-line nailed down (issue 2100). 3. if it's still relevant, work on adding pu

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-14 Thread graham
After commenting out the "git push" line, and also disconnecting my network cable, then going to "push patch", I get this: fatal: ambiguous argument 'staging..dev/local_working': unknown revision or path not in the working tree. Use '--' to separate paths from revisions Look, could we just tre

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2012-01-14 Thread graham
http://codereview.appspot.com/5504092/diff/8001/scripts/auxiliar/lily-git.tcl File scripts/auxiliar/lily-git.tcl (right): http://codereview.appspot.com/5504092/diff/8001/scripts/auxiliar/lily-git.tcl#newcode13 scripts/auxiliar/lily-git.tcl:13: set push_access 1 This must be set to 0. http://cod

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-31 Thread dak
The problem is not merges. The problem is unintentional merges. merges _from_ staging (or origin/staging) are usually a mistake. http://codereview.appspot.com/5504092/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailm

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-30 Thread Graham Percival
On Sat, Dec 31, 2011 at 12:10:14AM +, carl.d.soren...@gmail.com wrote: > On 2011/12/30 20:57:02, Graham Percival wrote: > >I'm still concerned about this type of automatic pushing. The revised > CG > >material on branches > > http://codereview.appspot.com/5484043/ > >makes a bit deal about

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-30 Thread Carl . D . Sorensen
On 2011/12/30 20:57:02, Graham Percival wrote: LGTM apart from one detail http://codereview.appspot.com/5504092/diff/5001/scripts/auxiliar/lily-git.tcl#newcode295 scripts/auxiliar/lily-git.tcl:295: git push origin HEAD:$pushHead I'm still concerned about this type of automatic pushing. The

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-30 Thread dak
On 2011/12/30 20:57:02, Graham Percival wrote: Patchy will not question any ridiculous git history that arises due to any kind of weird series of commands in git. Maybe it would make sense if Patchy refused fast forwarding over a history involving a merge _from_ staging. I think that merges

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-30 Thread graham
LGTM apart from one detail http://codereview.appspot.com/5504092/diff/5001/scripts/auxiliar/lily-git.tcl File scripts/auxiliar/lily-git.tcl (right): http://codereview.appspot.com/5504092/diff/5001/scripts/auxiliar/lily-git.tcl#newcode295 scripts/auxiliar/lily-git.tcl:295: git push origin HEAD:$

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread Carl . D . Sorensen
On 2011/12/29 18:19:26, Graham Percival wrote: On Thu, Dec 29, 2011 at 05:21:34PM +, mailto:carl.d.soren...@gmail.com wrote: > The Push button is disabled by default; an experienced user can enable > it with a simple edit to the script. By "disabled", do you mean "commented out" ? If

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread Graham Percival
On Thu, Dec 29, 2011 at 05:21:34PM +, carl.d.soren...@gmail.com wrote: > The Push button is disabled by default; an experienced user can enable > it with a simple edit to the script. By "disabled", do you mean "commented out" ? If new contributors see a greyed-out button, they'll get confused

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread Carl . D . Sorensen
I've uploaded a new patch set. The Push button is disabled by default; an experienced user can enable it with a simple edit to the script. I couldn't find a good value that I believed would work for automatic detection, since my push-enabled configuration is different from that listed in the CG.

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread Jonathan Kulp
Graham, can you ping me when changes to lily-git.tcl are finalized and I'll get new version into lilydev-remix image. Thanks, Jon 2011/12/29 Janek Warchoł : > 2011/12/29  : >> On 2011/12/29 08:31:38, dak wrote: >>> It would seem to me that this button need only appear when you have >>> told the c

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread Janek Warchoł
2011/12/29 : > On 2011/12/29 08:31:38, dak wrote: >> It would seem to me that this button need only appear when you have >> told the configuration (is there one?) > > Not for lily-git.tcl specifically, but there _is_ something it checks > wen you run it; for instance if you use it for the very fir

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread pkx166h
On 2011/12/29 08:31:38, dak wrote: It would seem to me that this button need only appear when you have told the configuration (is there one?) Not for lily-git.tcl specifically, but there _is_ something it checks wen you run it; for instance if you use it for the very first time it knows you

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-29 Thread dak
On 2011/12/29 06:45:53, Graham Percival wrote: First thought: I'm a bit leery of adding a "push to staging", since: 1. that clutters up the interface. Sure, it's just one more button, but OTOH that's 25% more buttons. :) It would seem to me that this button need only appear when you have t

Re: Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-28 Thread graham
Thanks for working on this! Unfortunately I'm between cities at the moment; I'll try to comment more tomorrow evening. First thought: I'm a bit leery of adding a "push to staging", since: 1. that clutters up the interface. Sure, it's just one more button, but OTOH that's 25% more buttons. :) 2

Update lilygit.tcl (Issue 2092) (issue 5504092)

2011-12-28 Thread Carl . D . Sorensen
Reviewers: , Message: Here's a stab at revising lily-git.tcl to facilitate patch pushing by git novices. Please review. Thanks, Carl Description: Update lilygit.tcl (Issue 2092) Makes lilygit.tcl respect the environment variable $LILYPOND_GIT. If $LILYPOND_GIT is unset, default of $HOME/lil