Re: problem uploading a patch
David, On Wed, Oct 17, 2012 at 12:44 AM, David Kastrup d...@gnu.org wrote: Try git rebase origin first I tried this, and this is what happened: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git rebase origin fatal: Needed a single revision invalid upstream origin Should I try something like git rebase origin/master ? -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) This should be the issue number from the Rietveld page, not the one from google code page. OK, I see. Thanks! I figured that I'd need to create the Rietveld issue first, which I attempted to do using the issue creation form. Unfortunately, I can't get past the requirement for a url or uploaded file. What should I do here? -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
David Nalesnik david.nales...@gmail.com writes: David, On Wed, Oct 17, 2012 at 12:44 AM, David Kastrup d...@gnu.org wrote: Try git rebase origin first I tried this, and this is what happened: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git rebase origin fatal: Needed a single revision invalid upstream origin Should I try something like git rebase origin/master ? Huh. You can try that, but I am surprised that this should not be the same as origin. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
David Nalesnik david.nales...@gmail.com writes: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) This should be the issue number from the Rietveld page, not the one from google code page. OK, I see. Thanks! I figured that I'd need to create the Rietveld issue first, which I attempted to do using the issue creation form. No, git cl does that automatically. Unfortunately, I can't get past the requirement for a url or uploaded file. What should I do here? Probably you have done too much already. If you don't have a Google issue created as a result of all the hassle so far (check the issue tracker), your best bet is likely to clear the issue again with git cl issue 0 (I believe) and then restart with git cl upload, answering all questions except for your credentials just with return. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
David, On Wed, Oct 17, 2012 at 8:04 AM, David Kastrup d...@gnu.org wrote: David Nalesnik david.nales...@gmail.com writes: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) This should be the issue number from the Rietveld page, not the one from google code page. OK, I see. Thanks! I figured that I'd need to create the Rietveld issue first, which I attempted to do using the issue creation form. No, git cl does that automatically. Unfortunately, I can't get past the requirement for a url or uploaded file. What should I do here? Probably you have done too much already. If you don't have a Google issue created as a result of all the hassle so far (check the issue tracker), your best bet is likely to clear the issue again with git cl issue 0 (I believe) and then restart with git cl upload, answering all questions except for your credentials just with return. I did: git rebase origin/master git cl upload origin/master and it worked like a charm. The patch is uploaded, associated with the right issue, and the announcement is sent. Thanks so much for your help! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
On 10/17/2012 02:55 PM, David Nalesnik wrote: Julien, On Wed, Oct 17, 2012 at 1:33 AM, Julien Rioux jri...@physics.utoronto.ca wrote: On 16/10/2012 4:36 PM, David Nalesnik wrote: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) This should be the issue number from the Rietveld page, not the one from google code page. OK, I see. Thanks! I figured that I'd need to create the Rietveld issue first, which I attempted to do using the issue creation form. Unfortunately, I can't get past the requirement for a url or uploaded file. What should I do here? -David $ git cl issue 0 to reset (remove any association to a Rietveld issue) $ git cl upload origin/master to upload (given that the branch is no longer associated to a Rietveld issue, it will create a new Rietveld issue) Cheers, Julien ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
Julien, On Wed, Oct 17, 2012 at 9:25 AM, Julien Rioux jri...@physics.utoronto.ca wrote: $ git cl issue 0 to reset (remove any association to a Rietveld issue) $ git cl upload origin/master to upload (given that the branch is no longer associated to a Rietveld issue, it will create a new Rietveld issue) Thanks, I managed to upload the patch successfully! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
- Original Message - From: David Nalesnik david.nales...@gmail.com To: Lilypond Dev lilypond-devel@gnu.org Sent: Tuesday, October 16, 2012 8:56 PM Subject: problem uploading a patch Hi, I'm trying to upload a patch created in a branch to Rietveld, but I seem to be creating an unholy mess. I attempted to run git-cl upload master within my branch, but I end up with a huge list of recent commits not my own. The same thing happened when I ran git format-patch master and earlier, when I tried to merge several commits with git rebase -i master I'm not sure what's going on here. I did manage to get a .patch file with my commits (in the midst of dozens of others). Is there a simple command to upload this to Rietveld? Thanks, David If you have a record of changes you've made, then I tend to use git reset --hard origin/master which takes you back to the current state of master, and then git am your.patch which applies the patch you have. Follow this with git cl issue your_issue_number in case git cl is confused, and finally git cl upload -- Phil Holmes ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
Hi Phil, On Tue, Oct 16, 2012 at 3:11 PM, Phil Holmes [...] If you have a record of changes you've made, then I tend to use git reset --hard origin/master which takes you back to the current state of master, and then git am your.patch which applies the patch you have. Follow this with git cl issue your_issue_number in case git cl is confused, and finally git cl upload Everything went fine until this point, but then I get a number of errors: david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload Unable to determine default branch to diff against. Either pass complete git diff-style arguments, like git cl upload origin/master or verify this branch is set up to track another (via the --track argument to git checkout -b ...). david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload origin/master input/regression/measure-counter.ly | 41 ly/spanners-init.ly |4 + scm/define-event-classes.scm|6 +- scm/define-grob-interfaces.scm |5 ++ scm/define-grob-properties.scm |1 + scm/define-grobs.scm| 18 + scm/define-music-types.scm |5 ++ scm/music-functions.scm | 117 +++ 8 files changed, 194 insertions(+), 3 deletions(-) This branch is associated with issue 2445. Adding patch to that issue. Traceback (most recent call last): File /home/david/bin/git-cl, line 888, in module sys.exit(main(sys.argv)) File /home/david/bin/git-cl, line 882, in main return func(argv[2:]) File /home/david/bin/git-cl, line 584, in CmdUpload desc = cl.GetDescription() File /home/david/bin/git-cl, line 278, in GetDescription self.description = urllib2.urlopen(url).read().strip() File /usr/lib/python2.6/urllib2.py, line 126, in urlopen return _opener.open(url, data, timeout) File /usr/lib/python2.6/urllib2.py, line 397, in open response = meth(req, response) File /usr/lib/python2.6/urllib2.py, line 510, in http_response 'http', request, response, code, msg, hdrs) File /usr/lib/python2.6/urllib2.py, line 435, in error return self._call_chain(*args) File /usr/lib/python2.6/urllib2.py, line 369, in _call_chain result = func(*args) File /usr/lib/python2.6/urllib2.py, line 518, in http_error_default raise HTTPError(req.get_full_url(), code, msg, hdrs, fp) urllib2.HTTPError: HTTP Error 404: Not Found I have no idea what's going on here :( I don't want to nuke the build directory and start again, branch-free. Hopefully there's another option! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
Hi Phil. david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl issue 2445 Issue number: 2445 (http://codereview.appspot.com/2445) david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload Unable to determine default branch to diff against. Either pass complete git diff-style arguments, like git cl upload origin/master or verify this branch is set up to track another (via the --track argument to git checkout -b ...). david@david-desktop ~/lilypond-git (dev/measure_counter)$ git cl upload origin/master input/regression/measure-counter.ly | 41 ly/spanners-init.ly |4 + scm/define-event-classes.scm|6 +- scm/define-grob-interfaces.scm |5 ++ scm/define-grob-properties.scm |1 + scm/define-grobs.scm| 18 + scm/define-music-types.scm |5 ++ scm/music-functions.scm | 117 +++ 8 files changed, 194 insertions(+), 3 deletions(-) This branch is associated with issue 2445. Adding patch to that issue. Traceback (most recent call last): File /home/david/bin/git-cl, line 888, in module sys.exit(main(sys.argv)) File /home/david/bin/git-cl, line 882, in main return func(argv[2:]) File /home/david/bin/git-cl, line 584, in CmdUpload desc = cl.GetDescription() File /home/david/bin/git-cl, line 278, in GetDescription self.description = urllib2.urlopen(url).read().strip() File /usr/lib/python2.6/urllib2.py, line 126, in urlopen return _opener.open(url, data, timeout) File /usr/lib/python2.6/urllib2.py, line 397, in open response = meth(req, response) File /usr/lib/python2.6/urllib2.py, line 510, in http_response 'http', request, response, code, msg, hdrs) File /usr/lib/python2.6/urllib2.py, line 435, in error return self._call_chain(*args) File /usr/lib/python2.6/urllib2.py, line 369, in _call_chain result = func(*args) File /usr/lib/python2.6/urllib2.py, line 518, in http_error_default raise HTTPError(req.get_full_url(), code, msg, hdrs, fp) urllib2.HTTPError: HTTP Error 404: Not Found Looking into this further, I discovered a thread where Harm ran into a similar situation: http://www.mail-archive.com/lilypond-devel@gnu.org/msg47866.html It's clearly not the same error, but it prompted me to look at the way git cl is configured. I get: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote origin] url = git://git.sv.gnu.org/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master [branch master] remote = origin merge = refs/heads/master rebase = true [rietveld] server = codereview.appspot.com cc = lilypond-devel@gnu.org [branch dev/measure_counter] rietveldissue = 2445 [gui] wmstate = normal Is everything here OK? I even tried adding http:// before the server address, but this led to [...] File /usr/lib/python2.6/httplib.py, line 682, in _set_hostport raise InvalidURL(nonnumeric port: '%s' % host[i+1:]) httplib.InvalidURL: nonnumeric port: '' No idea what to do :( -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem uploading a patch
David Nalesnik david.nales...@gmail.com writes: Hi, I'm trying to upload a patch created in a branch to Rietveld, but I seem to be creating an unholy mess. I attempted to run git-cl upload master within my branch, but I end up with a huge list of recent commits not my own. The same thing happened when I ran git format-patch master and earlier, when I tried to merge several commits with git rebase -i master I'm not sure what's going on here. Try git rebase origin first, and also use git-cl upload origin rather than master. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
