Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(64)

Issue 5504092: Update lilygit.tcl (Issue 2092) (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
12 years, 3 months ago by Carl
Modified:
12 years, 1 month ago
Reviewers:
Graham Percival, pkx166h, dak, jonlancekulp, janek
CC:
lilypond-devel_gnu.org
Visibility:
Public.

Description

Update lilygit.tcl (Issue 2092) Makes lilygit.tcl respect the environment variable $LILYPOND_GIT. If $LILYPOND_GIT is unset, default of $HOME/lilypond-git will be used. Also does all working on dev/local_working branch, instead of master Adds a Push Patch button to push patch to staging.

Patch Set 1 #

Patch Set 2 : Make push button optional, add support for branches #

Patch Set 3 : Base working branch on master #

Total comments: 1

Patch Set 4 : Added window to display git-log and confirm push #

Patch Set 5 : Rebase to current staging #

Total comments: 1

Patch Set 6 : Fix problem with bad staging creation #

Patch Set 7 : Make lily-git robust to missing branches #

Patch Set 8 : Proper treatment of staging #

Patch Set 9 : Rebase to current master #

Total comments: 12

Patch Set 10 : Respond to Janek's comments #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+144 lines, -8 lines) Patch
M scripts/auxiliar/lily-git.tcl View 1 2 3 4 5 6 7 8 9 12 chunks +144 lines, -8 lines 1 comment Download

Messages

Total messages: 22
Carl
Here's a stab at revising lily-git.tcl to facilitate patch pushing by git novices. Please review. ...
12 years, 3 months ago (2011-12-29 06:00:06 UTC) #1
Graham Percival
Thanks for working on this! Unfortunately I'm between cities at the moment; I'll try to ...
12 years, 3 months ago (2011-12-29 06:45:53 UTC) #2
dak
On 2011/12/29 06:45:53, Graham Percival wrote: > First thought: I'm a bit leery of adding ...
12 years, 3 months ago (2011-12-29 08:31:38 UTC) #3
pkx166h
On 2011/12/29 08:31:38, dak wrote: > > It would seem to me that this button ...
12 years, 3 months ago (2011-12-29 10:47:04 UTC) #4
janek
2011/12/29 <pkx166h@gmail.com>: > On 2011/12/29 08:31:38, dak wrote: >> It would seem to me that ...
12 years, 3 months ago (2011-12-29 11:15:49 UTC) #5
jonlancekulp_gmail.com
Graham, can you ping me when changes to lily-git.tcl are finalized and I'll get new ...
12 years, 3 months ago (2011-12-29 17:05:53 UTC) #6
Carl
I've uploaded a new patch set. The Push button is disabled by default; an experienced ...
12 years, 3 months ago (2011-12-29 17:21:33 UTC) #7
Graham Percival
On Thu, Dec 29, 2011 at 05:21:34PM +0000, Carl.D.Sorensen@gmail.com wrote: > The Push button is ...
12 years, 3 months ago (2011-12-29 18:19:26 UTC) #8
Carl
On 2011/12/29 18:19:26, Graham Percival wrote: > On Thu, Dec 29, 2011 at 05:21:34PM +0000, ...
12 years, 3 months ago (2011-12-29 19:15:36 UTC) #9
Graham Percival
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:$pushHead ...
12 years, 3 months ago (2011-12-30 20:57:02 UTC) #10
dak
On 2011/12/30 20:57:02, Graham Percival wrote: > Patchy will not question any > ridiculous git ...
12 years, 3 months ago (2011-12-30 21:09:28 UTC) #11
Carl
On 2011/12/30 20:57:02, Graham Percival wrote: > LGTM apart from one detail > > > ...
12 years, 3 months ago (2011-12-31 00:10:14 UTC) #12
Graham Percival
On Sat, Dec 31, 2011 at 12:10:14AM +0000, Carl.D.Sorensen@gmail.com wrote: > On 2011/12/30 20:57:02, Graham ...
12 years, 3 months ago (2011-12-31 01:02:32 UTC) #13
dak
The problem is not merges. The problem is unintentional merges. merges _from_ staging (or origin/staging) ...
12 years, 3 months ago (2011-12-31 10:46:45 UTC) #14
Graham Percival
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.
12 years, 2 months ago (2012-01-14 09:24:18 UTC) #15
Graham Percival
After commenting out the "git push" line, and also disconnecting my network cable, then going ...
12 years, 2 months ago (2012-01-14 09:31:39 UTC) #16
Carl
On 2012/01/14 09:31:39, Graham Percival wrote: > Look, could we just treat this as three ...
12 years, 2 months ago (2012-01-14 19:27:20 UTC) #17
Carl
New version of lilygit.tcl that: 1. Treats staging properly -- i.e. does not create a ...
12 years, 2 months ago (2012-01-16 14:48:49 UTC) #18
Graham Percival
LGTM
12 years, 2 months ago (2012-01-20 13:52:42 UTC) #19
janek
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: proc update_lilypond_norebase {} ...
12 years, 2 months ago (2012-01-21 21:12:58 UTC) #20
Carl
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 ...
12 years, 2 months ago (2012-01-22 01:11:05 UTC) #21
Graham Percival
12 years, 1 month ago (2012-02-13 10:56:28 UTC) #22
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.tc...
scripts/auxiliar/lily-git.tcl:248: git remote add -t $originHead \
This should change to git clone, but that can happen in a later edit.  Let's get
this first change pushed.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b