Re: [sage-devel] Re: The Sage dev scripts
On Sun, Jan 11, 2015 at 3:00 AM, Simon King wrote: > Hi! > > On 2015-01-11, Nils Bruin wrote: >> On Sunday, January 11, 2015 at 12:54:56 AM UTC-8, Martin von Gagern wrote: >>> >>> On 11.01.2015 09:38, Robert Bradshaw wrote: >>> > Hopefully it's becoming stable enough that >>> > we should start shipping it as part of Sage? >>> >>> At first I thought so, too. But now I'm no longer sure: if you ship it >>> with Sage, then it will be difficult to use it if you want to work with >>> a patch from an older branch. >> >> >> So we should *ship* it with sage but not *use* it yet. In a year or so, >> git-trac will have been stable enough for long enough that most people can >> start using the version shipped with sage, because any branch they meet >> will have about the same git-trac. > > Or: We should ship it with Sage, but it should live in a repository that > is independent of the rest of Sage. Hence, if one works on an old branch > of Sage, git-trac would still be available. Yes, I meant that it should be an spkg. You can install it in old sage's, you can have a different version, but at least you get some version by default. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
The branch is there, ready for a review: http://trac.sagemath.org/ticket/17555 Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> If you want to remove the documentation about them from the developper > guide, it is ok with me. Okay okay, fine. I think that I will do that then, unless somebody objects. This way those who still use them can continue, and we hope that in something like 6 months~1 year you will have switched to git trac or git by yourself ;-) By the way, if you feel like learning it now, it would be cool if you could take a look at the developer's manual and report what is unclear in there about 'git trac' or 'git the hard way'. Thanks ! Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
Sorry, it seems my message was interrupted. If you want to remove the documentation about them from the developper guide, it is ok with me. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> > > > Could you why you use them instead of 'git trac' ? Is there something > that they do and that git trac can't do ? > > > As i said, it is just what i am used to. It is what i did learn to use in the beginning, and up to now i didn't had any reason to stop using them. I don't really know what git trac can do because i didn't look at it. I understand that this is just my personal preference, so it is not a strong reason to take a community decission. I just wanted to state that there is still some people that feels more comfortable with the dev scripts than the other possible choices. If you want -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
-a, --all List both remote-tracking branches and local branches. I of course agree that you can set git to not look at remote branches, but as long as you don't explicitly ask for the list of remote branches they are not shown in the output of "git branch". And, regardless of how the remote is set up, remote branches are never local git branches that you can add commits to etc. On Saturday, December 27, 2014 1:53:50 PM UTC+1, Nathann Cohen wrote: > > Okay. Then Dima: instead of "git branch" try "git branch -a". > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> The output of "git branch" will always only contain branches that you > created locally. Okay. Then Dima: instead of "git branch" try "git branch -a". It gives only two lines on my version, but my guess is that it will take several screens for you. Only because of the --single-branch flag. Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
On Saturday, December 27, 2014 1:22:29 PM UTC+1, Nathann Cohen wrote: > > Type "git branch". If you see one thousand things you never fetched > from trac, that's a confirmation. > The output of "git branch" will always only contain branches that you created locally. There is a slight difference between setting up a remote as tracking or not, but that only changes what is downloaded during "git fetch" / "git pull". The fetched data is of course stored locallly, but not as a "branch": http://www.patrickzahnd.ch/wp-content/uploads/2014/02/git-transport-v1.pdf -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> I reglarly use the dev scripts. So i would really appreciate if they remain. Oh. Well, the developer's manual advises you to NOT use them :-P > But of course, if they are removed i will adapt to plain git or git trac. > But my personal preference is to keep them. Could you why you use them instead of 'git trac' ? Is there something that they do and that git trac can't do ? It is a bit about reducing the number of ways to contribute, because 3 is honestly too many. Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> Further, 'Git the hard way' should be consistent, but it > does not tell you about '--single-branch'. Dima: If you want it to change, do something. 1) Write doc tickets 2) help me review mine. > well, before improving at this point, we need to dig up the truth :-) I gave you two ways out: 1) Type "git branch" in SAGE_ROOT, tell me if you get 10 lines or 10 screens 2) do a 'git clone' again with the options I gave you, and tell me if the behaviour is different when you fetch stuff. Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> Are you saying that the default is to constantly pull the data from the > remote, in the background? Really? Type "git branch". If you see one thousand things you never fetched from trac, that's a confirmation. > Could you point to documentation confirming this? I do not think that it is written anywhere. I am working on the developer's doc a lot these days, so if you want it to improve you can: 1) Write a doc patch, add me in Cc 2) Help me by reviewing my doc patches: http://trac.sagemath.org/ticket/17545 http://trac.sagemath.org/ticket/17549 http://trac.sagemath.org/ticket/17551 Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> I don't know how one can automatically maintain a mirror of git trac, > without running a special script, and I believe I don't do this. I believe that it is what happens in your case, because that's the default. If you want to check, you can "git clone" Sage again and fetch a branch from there. You will see that it does not happen (if I make no mistake). If you want to try, do a "git clone" again but use the following flags: -b develop --single-branch No need to recompile the new copy. Just download it, fetch branches, see if it does what you want. Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
Yo ! > I did give it here: > https://groups.google.com/d/msg/sage-devel/JtVWAdvw-3A/603M_PziLfUJ > > (if it matters, my git version is 1.9.1) Oh !!! That's because your git instal contains a complete copy of the trac's git server. You've got "ALL" branches on your computer. So when you download a new branch, it remembers the remote name that this branch has : trac/u/dimpase/16929 In this case, "the branch u/dimpase/16329 that is on the trac remote". I used the "--single-branch" flag when I "git cloned" Sage for the first time, so that only "develop" is linked with trac's develop on my machine. No other branches Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> Once again: whenever I do git fetch from trac I get a local branch > created on the spot: Can you give us the command that you type that produces this result ? Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
Yo ! > Nathann, that's about git in developer docs, so that's not 100% off the > thread :-) Well, as long as we can close the question related to the removal of the sage-dev scripts, I personally don't care what this thread becomes. But I need to know what to do with that ! :-P > One thing that is confusing in the "Git the hard way" is that the > example of git fetch in > http://sagemath.org/doc/developer/manual_git.html#checking-out-tickets > does not show a line like > * [new branch] u/dimpase/16929 -> trac/u/dimpase/16929 I do not understand. "Git the hard way" is about only git: it does what you want, and nothing else. If you want something like that you should type: git fetch trac u/dimpase/16929:trac/u/dimpase/16929 I planned on rewriting this section too in order to explain the problems related to doing a "checkout" on a very old patch, and the recompilation that follows. But I expect this patch to be a bit controversial so I did not touch this section yet. > Should the docs be updated? All this manual should be updated, now that we got used to git. So please help me by reviewing the patches I wrote: http://trac.sagemath.org/ticket/17551 Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> I found them quite practical, and you may recall from the discussions in > Paris that I'd like them to be extended so that they are also able to > send bug reports to the bug trackers of Singular/Gap/..., so that there is > no need to google "how to report bugs in Singular". > > Nonetheless, I stopped using the scripts, simply because everybody seems > to fancy git-trac now. Oh. So what do you think we should do with them ? Remove them from Sage and keep our 3 tools, or give them up and focus on [pure git/git trac] ? Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
Hey guys... I hate to interrupt your debugging but I had a question about . Can I create a patch to remove that, in the end ? Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
Hey guys... I hate to interrupt your debugging but I had a question about Sage-devel. Can I create a patch to remove that, in the end ? Nathann On 27 December 2014 at 03:45, Volker Braun wrote: > I'd say by definition a git branch is what is listed by "git branch". Having > said that, it is just a label for a commit. There are other kinds of labels > for commits, for example tags. Whenever you fetch (pull) something from a > remote a local copy (of the commits on the remote) is made, and they also > have labels. But its not really a git branch, as you saw you can't check it > out directly and you can't add commits on top without actually creating a > new branch off it. > > > > On Friday, December 26, 2014 9:07:06 PM UTC+1, Dima Pasechnik wrote: >> >> On 2014-12-26, Volker Braun wrote: >> > --=_Part_5531_1685050387.1419616059330 >> > Content-Type: multipart/alternative; >> > boundary="=_Part_5532_1775001320.1419616059330" >> > >> > --=_Part_5532_1775001320.1419616059330 >> > Content-Type: text/plain; charset=UTF-8 >> > >> > On Friday, December 26, 2014 6:23:43 PM UTC+1, Dima Pasechnik wrote: >> >> >> >> By the way, I noticed some change in the behaviour of trac git server; >> >> it seems that fetching u/foo/bar automatically results in >> >> creation of a local branch trac/u/foo/bar. >> > >> > >> > No it doesn't. Local branches would be in the output of "git branch". >> > The >> > fetched branch is of course know to the local repo under a name, e.g. in >> > the output of "git ls-remote trac". >> >> but then what does the following mean: >> >> $ git fetch trac u/dimpase/16929 >> remote: Counting objects: 21, done. >> remote: Compressing objects: 100% (12/12), done. >> remote: Total 14 (delta 9), reused 7 (delta 2) >> Unpacking objects: 100% (14/14), done. >> From git://trac.sagemath.org/sage >> * branchu/dimpase/16929 -> FETCH_HEAD >> * [new branch] u/dimpase/16929 -> trac/u/dimpase/16929 >> >> $ git remote -v >> originhttps://github.com/sagemath/sage.git (fetch) >> originhttps://github.com/sagemath/sage.git (push) >> tracgit://trac.sagemath.org/sage.git (fetch) >> tracg...@trac.sagemath.org:sage.git (push) >> >> >> What does this [new branch] mean? >> >> Note that now I can e.g. do >> >> $ git checkout trac/u/dimpase/16929 >> Note: checking out 'trac/u/dimpase/16929'. >> >> You are in 'detached HEAD' state. You can look around, make experimental >> changes and commit them, and you can discard any commits you make in >> this >> state without impacting any branches by performing another checkout. >> >> If you want to create a new branch to retain commits you create, you may >> do so (now or later) by using -b with the checkout command again. >> Example: >> >> git checkout -b new_branch_name >> >> HEAD is now at a576d91... Ported Ingo's code to Sage 6.5.beta1 >> >> >> That is to say, 'trac/u/dimpase/16929' really got created. >> >> Dima >> >> > -- > You received this message because you are subscribed to a topic in the > Google Groups "sage-devel" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/sage-devel/JtVWAdvw-3A/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > sage-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-devel@googlegroups.com. > Visit this group at http://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
Re: [sage-devel] Re: The Sage dev scripts
> By the way, I noticed some change in the behaviour of trac git server; > it seems that fetching u/foo/bar automatically results in > creation of a local branch trac/u/foo/bar. > > Is this documented anywhere? No idea. Really, these days I am trying to make the developer's manual something I can point people to when they have a question to ask. Come help me, and whenever something is not written add it somewhere. One day we will not have to answer those questions again, we will just have to link toward the developer's manual :-P Nathann -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
