[sage-devel] Re: Git reviewing help needed

2014-01-30 Thread kcrisman
> > > > I think it would be very useful to have very explicit instructions for > > how to create and stay on "develop" from upstream *using the sage -dev > > scripts*. I'll eventually figure it out but it's nice to have it within > > Sage, again. Unified context. > > This is actually almost

[sage-devel] Re: Git reviewing help needed

2014-01-29 Thread P Purkayastha
On 01/30/2014 09:42 AM, kcrisman wrote: Volker's last thing makes a lot more sense. What I want to do is to get back to the "master" or "develop" from there with "sage -dev checkout" but I guess I need to already have known about the "--branch" parameter $ ./sage -dev checkout --branch master O

[sage-devel] Re: Git reviewing help needed

2014-01-29 Thread kcrisman
> > > > > > > > Unfortunately, the simple syntax didn't work. Maybe I have to do > > something else so it knows what "develop" is? But that isn't in the > doc. > > 1. What command are you running? > > Volker's last thing makes a lot more sense. What I want to do is to get back to the "ma

Re: [sage-devel] Re: Git reviewing help needed

2014-01-29 Thread Volker Braun
We can't really tell you what you want to do after you are finished with your task... maybe go and make a sandwich, drink a cup of tea? ;-) Usually you'd want to switch to whatever you were doing before. Annoyingly, the "sage -dev checkout" doesn't DWIM but expects you to add additional mandat

[sage-devel] Re: Git reviewing help needed

2014-01-29 Thread P Purkayastha
On 01/29/2014 11:36 PM, kcrisman wrote: > Oh, and it's not clear to me > from http://sagemath.org/doc/developer/walk_through.html#reviewing what > to do when I'm *done* reviewing! I guess one "checks out mas

[sage-devel] Re: Git reviewing help needed

2014-01-29 Thread kcrisman
> > > > > Oh, and it's not clear to me > > from http://sagemath.org/doc/developer/walk_through.html#reviewing what > > to do when I'm *done* reviewing! I guess one "checks out master" but > > that is just something I sort of got through osmosis and I don't know if > > it's right, nor the sage

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread P Purkayastha
On 01/25/2014 10:14 AM, P Purkayastha wrote: As mentioned earlier in this ML, using ccache will help. I haven't tried using cycache. I was trying to figure out how to enable cython caching. I can not find any documentation on it. Only #15430. -- You received this message because you are subs

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread P Purkayastha
On 01/24/2014 09:22 AM, kcrisman wrote: $ ./sage -dev checkout --ticket 15693 At this point I usually do a "manual" diff against develop. $ git diff origin/develop I usually keep my "current version" at develop. I also keep my develop up to date by creating a local branch called develop that

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread Volker Braun
On Friday, January 24, 2014 6:49:06 PM UTC, kcrisman wrote: > > I did now find the ssdiff mode, but the side-by-side requires a pretty > wide screen to be useful. Something like ssdiff but in a vertical format > would be really useful as an option, at least. > Well it wouldn't be side-by-side

Re: [sage-devel] Re: Git reviewing help needed

2014-01-24 Thread kcrisman
> > > The Sage repository should not contain binary files nor non-sage specific > source code, so > naturally cloning the sage repository would not include compressed > tarballs of upstream > code. There are two ways to get a copy of sage with these files (so you > can do an offline > build): e

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread kcrisman
On Friday, January 24, 2014 8:48:32 AM UTC-5, kcrisman wrote: > > > > On Friday, January 24, 2014 8:22:04 AM UTC-5, Volker Braun wrote: >> >> On Thursday, January 9, 2014 3:50:37 PM UTC, kcrisman wrote: >> > The highlighting/coloration on the patches on Trac was also easier to >> read, but I don

Re: [sage-devel] Re: Git reviewing help needed

2014-01-24 Thread kcrisman
> > >> $ export MAKE="make -j3" >> $ make >> > expecting to need to be on the internet to build Sage, just to download the >> source> >> > > The Sage repository should not contain binary files nor non-sage specific > source code, so > naturally cloning the sage repository would not include compr

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread kcrisman
On Friday, January 24, 2014 8:22:04 AM UTC-5, Volker Braun wrote: > > On Thursday, January 9, 2014 3:50:37 PM UTC, kcrisman wrote: > > The highlighting/coloration on the patches on Trac was also easier to > read, but I don't know if that is as easily fixable. > > I kind of prefer the new highlig

[sage-devel] Re: Git reviewing help needed

2014-01-24 Thread Volker Braun
On Thursday, January 9, 2014 3:50:37 PM UTC, kcrisman wrote: > The highlighting/coloration on the patches on Trac was also easier to read, but I don't know if that is as easily fixable. I kind of prefer the new highlighting generated by cgit. Do you have anything in particular that you don't lik

Re: [sage-devel] Re: Git reviewing help needed

2014-01-23 Thread R. Andrew Ohana
On Thu, Jan 23, 2014 at 5:22 PM, kcrisman wrote: > >>> By including another parameter "&id2=..." or perhaps "&h=..." or >> "&b=..." it should be possible to specify the state relative to which you >> want to see the diff. It should in principle be possible to paste in the >> hash of the #15107 co

Re: [sage-devel] Re: Git reviewing help needed

2014-01-23 Thread kcrisman
> > >> By including another parameter "&id2=..." or perhaps "&h=..." or "&b=..." > it should be possible to specify the state relative to which you want to > see the diff. It should in principle be possible to paste in the hash of > the #15107 commit somewhere and get the diff relative to that.

Re: [sage-devel] Re: Git reviewing help needed

2014-01-10 Thread Nils Bruin
On Friday, January 10, 2014 2:02:52 AM UTC-8, Stefan wrote: > On a git ticket, click on the name of the branch (which should be green if >> it applies cleanly) and you'll get a diff of the changes that would occur >> if the ticket were merged into the current development branch. This view >>

Re: [sage-devel] Re: Git reviewing help needed

2014-01-10 Thread Stefan
> On a git ticket, click on the name of the branch (which should be green if > it applies cleanly) and you'll get a diff of the changes that would occur > if the ticket were merged into the current development branch. This view > won't be affected by the kind of rebases that you mention. > O

Re: [sage-devel] Re: Git reviewing help needed

2014-01-09 Thread David Roe
On a git ticket, click on the name of the branch (which should be green if it applies cleanly) and you'll get a diff of the changes that would occur if the ticket were merged into the current development branch. This view won't be affected by the kind of rebases that you mention. I will be in Bal

Re: [sage-devel] Re: Git reviewing help needed

2014-01-09 Thread Nathann Cohen
Hell !! > I just want to mention that I have been pretty reluctant to move to the new flow (and hence start reviewing tickets again) because I can't figure out how to interpret all this either. One huge advantage of the "patch" system is that it was very clear what the changes were that were

Re: [sage-devel] Re: Git reviewing help needed

2014-01-09 Thread William Stein
On Thu, Jan 9, 2014 at 7:50 AM, kcrisman wrote: >> >> I've positively reviewed 6f247f6e7f3f704d30f12af082d3e8a4c2120227, which >> was placed on top of 6.1.beta3. But the current branch is placed on top of >> 6.1.beta4, so I get all those tickets too in my diff! How do I do this? >> Should Nathann

[sage-devel] Re: Git reviewing help needed

2014-01-09 Thread kcrisman
> > > I've positively reviewed 6f247f6e7f3f704d30f12af082d3e8a4c2120227, which > was placed on top of 6.1.beta3. But the current branch is placed on top of > 6.1.beta4, so I get all those tickets too in my diff! How do I do this? > Should Nathann have done his "rebase" merges at all, or are tho