Submitted a patch and it was added to the wrong rietveld issue

2014-03-17 Thread Paul Morris
Greetings dev list,

I submitted a patch and I am sorry to say that somehow it was added to the
wrong issue:
https://codereview.appspot.com/54050043

And a new issue (with the wrong title and content) was created in the google
code tracker:
https://code.google.com/p/lilypond/issues/detail?id=3883

It seems that my local git branch was still associated with that previous
issue, the one I had submitted a patch for before.  I was using git-cl. 
Below is the terminal log.  

My apologies for this.  Please advise me on how to proceed.  How to avoid
this in the future?

-Paul


paul@paul-laptop ~/lilypond-git (dev/local_working)$ git status
# On branch dev/local_working
nothing to commit (working directory clean)
paul@paul-laptop ~/lilypond-git (dev/local_working)$ git pull -r
Current branch dev/local_working is up to date.
paul@paul-laptop ~/lilypond-git (dev/local_working)$ git cl upload
origin/master
Documentation/notation/input.itely |2 ++
ly/titling-init.ly |   10 ++
2 files changed, 12 insertions(+), 0 deletions(-)
This branch is associated with issue 54050043. Adding patch to that issue.
Upload server: codereview.appspot.com (change with -s/--server)
Message describing this patch set: Add on-page-greater-than, -less-than
(on-the-fly conditional markup procedures)
Loaded authentication cookies from /home/paul/.codereview_upload_cookies
Email (login for uploading to codereview.appspot.com) []: 
Password for : 
Saving authentication cookies to /home/paul/.codereview_upload_cookies
Issue updated. URL: http://codereview.appspot.com/54050043
Uploading base file for Documentation/notation/input.itely
Uploading base file for ly/titling-init.ly
Could not find stored credentials
/home/paul/.lilypond-project-hosting-login
Please enter login details manually

Username (google account name):

Password: 
We were not able to associate this patch with a google tracker issue.
Please enter a valid google tracker issue number (or enter nothing to create
a new issue): 
Tracker issue done
paul@paul-laptop ~/lilypond-git (dev/local_working)$



--
View this message in context: 
http://lilypond.1069038.n5.nabble.com/Submitted-a-patch-and-it-was-added-to-the-wrong-rietveld-issue-tp160519.html
Sent from the Dev mailing list archive at Nabble.com.

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Submitted a patch and it was added to the wrong rietveld issue

2014-03-17 Thread David Kastrup
Paul Morris  writes:

> Greetings dev list,
>
> I submitted a patch and I am sorry to say that somehow it was added to the
> wrong issue:
> https://codereview.appspot.com/54050043
>
> And a new issue (with the wrong title and content) was created in the google
> code tracker:
> https://code.google.com/p/lilypond/issues/detail?id=3883
>
> It seems that my local git branch was still associated with that previous
> issue, the one I had submitted a patch for before.  I was using git-cl. 
> Below is the terminal log.  
>
> My apologies for this.  Please advise me on how to proceed.  How to avoid
> this in the future?

Delete the branch before reusing it.

-- 
David Kastrup

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Submitted a patch and it was added to the wrong rietveld issue

2014-03-17 Thread Benkő Pál
hi Paul,

> I submitted a patch and I am sorry to say that somehow it was added to the
> wrong issue:
> https://codereview.appspot.com/54050043
>
> And a new issue (with the wrong title and content) was created in the google
> code tracker:
> https://code.google.com/p/lilypond/issues/detail?id=3883
>
> It seems that my local git branch was still associated with that previous
> issue, the one I had submitted a patch for before.  I was using git-cl.

yes, git-cl associates the rietveld issue permanently to a branch
(in your ~/lilypond-git/.git/config); it seems you do all your work on
the same branch again and again.  you can reset the issue after push
with
$ git cl issue 0

my workflow is to open a new topic branch each time, then delete it
when content reaches origin/master.

p

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Submitted a patch and it was added to the wrong rietveld issue

2014-03-17 Thread Urs Liska
Sometimes you also need the other way round. When you have started a new branch 
(e.g. because you have to review your code) or even when you want to submit the 
same branch from a different computer you have to run git cl issue old-number 
to associate the branch to an existing issue.

HTH
Urs

"Benkő Pál"  schrieb am 17.03.2014:
>hi Paul,
>
>> I submitted a patch and I am sorry to say that somehow it was added
>to the
>> wrong issue:
>> https://codereview.appspot.com/54050043
>>
>> And a new issue (with the wrong title and content) was created in the
>google
>> code tracker:
>> https://code.google.com/p/lilypond/issues/detail?id=3883
>>
>> It seems that my local git branch was still associated with that
>previous
>> issue, the one I had submitted a patch for before.  I was using
>git-cl.
>
>yes, git-cl associates the rietveld issue permanently to a branch
>(in your ~/lilypond-git/.git/config); it seems you do all your work on
>the same branch again and again.  you can reset the issue after push
>with
>$ git cl issue 0
>
>my workflow is to open a new topic branch each time, then delete it
>when content reaches origin/master.
>
>p
>
>___
>lilypond-devel mailing list
>lilypond-devel@gnu.org
>https://lists.gnu.org/mailman/listinfo/lilypond-devel

-- 
Diese Nachricht wurde mit https://play.google.com/store/apps/details?id=com.onegravity.k10.pro2";>K-@
 Mail gesendet.___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Open counterpoint text, thanks to devs

2014-03-17 Thread Stefaan Himpe

This looks super interesting!
Thanks for sharing.

Stefaan.


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Submitted a patch and it was added to the wrong rietveld issue

2014-03-17 Thread Paul Morris
Hi Benko,


benko.pal wrote
>> It seems that my local git branch was still associated with that previous
>> issue, the one I had submitted a patch for before.  I was using git-cl.
> 
> yes, git-cl associates the rietveld issue permanently to a branch
> (in your ~/lilypond-git/.git/config); it seems you do all your work on
> the same branch again and again.  you can reset the issue after push
> with
> $ git cl issue 0
> 
> my workflow is to open a new topic branch each time, then delete it
> when content reaches origin/master.

Ah, ok, so at this point if I do
$ git cl issue 0

and then resubmit the patch, that should get things back on the right track. 
In the future I'll probably go with that topic branch workflow. 
Unfortunately, I don't think I have the privileges to clean up the rietveld
and google code tracker where things went wrong... thanks in advance to
anyone who can help me out with that.

And thanks Benko, David, and Urs for the tips on this,

-Paul



--
View this message in context: 
http://lilypond.1069038.n5.nabble.com/Submitted-a-patch-and-it-was-added-to-the-wrong-rietveld-issue-tp160519p160527.html
Sent from the Dev mailing list archive at Nabble.com.

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: Python 3 support

2014-03-17 Thread Graham Percival
On Sun, Mar 16, 2014 at 04:41:46PM -0400, Julien Rioux wrote:
> I think the following would be a good 1-2 punch approach for the
> current development cycle: First, upgrade python in GUB and make
> sure we can build current dev and stable branches of lilypond from
> it. Then bump the python requirement in the dev branch and start
> migrating to a codebase that supports python 2.6+ and python 3+

Sounds great!  Thanks for working on this.

Cheers,
- Graham

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Add on-page-greater-than, -less-than (on-the-fly) (issue 74540044)

2014-03-17 Thread paulwmorris

Reviewers: ,

Message:
Using a different local branch did the trick.  -Paul

Description:
Add on-page-greater-than, -less-than (on-the-fly)

Adds two new ready-made procedures for use with the
\on-the-fly conditional markup command.  They test whether a
page is greater than or less than a user-specified number.
Documentation for both of them is also part of this commit.

Please review this at https://codereview.appspot.com/74540044/

Affected files (+12, -0 lines):
  M Documentation/notation/input.itely
  M ly/titling-init.ly


Index: Documentation/notation/input.itely
diff --git a/Documentation/notation/input.itely  
b/Documentation/notation/input.itely
index  
fc2ead626d388a27ad52491105450a6ac0c5dfd9..21d43f1f090d91ced92b08e94179a0ba3fa3fbb7  
100644

--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -1138,6 +1138,8 @@ provided:
 @item print-all-headers @tab  print-all-headers true?
 @item first-page@tab  first page in the book?
 @item (on-page nmbr)@tab  page number = nmbr?
+@item (on-page-greater-than nmbr)   @tab  page number > nmbr?
+@item (on-page-less-than nmbr)  @tab  page number < nmbr?
 @item last-page @tab  last page in the book?
 @item not-first-page@tab  not first page in the book?
 @item part-first-page   @tab  first page in the book part?
Index: ly/titling-init.ly
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index  
da2bf166c94e063ec5b419b2bf38cc5325ce7603..a15298a33ce91dd2e405ac4cab709ef8dd657e52  
100644

--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -108,6 +108,16 @@ book last one."
(interpret-markup layout props arg)
empty-stencil))

+#(define ((on-page-greater-than nmbr) layout props arg)
+   (if (> (chain-assoc-get 'page:page-number props -1) nmbr)
+   (interpret-markup layout props arg)
+   empty-stencil))
+
+#(define ((on-page-less-than nmbr) layout props arg)
+   (if (< (chain-assoc-get 'page:page-number props -1) nmbr)
+   (interpret-markup layout props arg)
+   empty-stencil))
+
 %% Bookpart first page and last page predicates
 #(define (part-first-page? layout props)
   (= (chain-assoc-get 'page:page-number props -1)



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel