Re: [sage-devel] Re: git diff branch1..develop
On 1 May 2014 12:08, Volker Braun vbraun.n...@gmail.com wrote: If you click on the branch name (not the Commits) on trac then it'll show you just the cumulative diff against the current develop branch. It actually does the merge and then the diff from the merge, which is a bit more useful than just git diff my_branch...develop. When I do that I see the list of about 15 commits with commit messages but not the diffs. I can clisck on any of these commits and see the diffs for that commit, but how do I see the cumulative diffs for the sequence of commits (in trac)? John If you want to do it offline this is also implemented as git trac review in the git-trac script. On Thursday, May 1, 2014 12:00:02 PM UTC+1, Martin Albrecht wrote: Hi all, currently it is a bit awkward to review a branch on trac which has many commits. For example http://trac.sagemath.org/ticket/15976 has quite a few commits so it seems quite daunting to review it, whereas the actual difference to the main development branch is not that much. Locally, we can do: $ git diff my_branch..develop and $ git diff my_branch...develop cf. https://stackoverflow.com/questions/9834689/comparing-two-branches-in-git Could something like this be added to trac? Cheers, Martin -- 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. -- 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: git diff branch1..develop
Ok, let me try again. If you go to http://trac.sagemath.org/ticket/15976 the ticket says: Branch:public/ticket/15976 (Commits) If you click on public/ticket/15976 then you see the cumulative diff If you click on (Commits) you'll see the individual commits. On Thursday, May 1, 2014 12:32:57 PM UTC+1, John Cremona wrote: When I do that I see the list of about 15 commits with commit messages but not the diffs. I can clisck on any of these commits and see the diffs for that commit, but how do I see the cumulative diffs for the sequence of commits (in trac)? -- 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: git diff branch1..develop
On 1 May 2014 12:37, Volker Braun vbraun.n...@gmail.com wrote: Ok, let me try again. If you go to http://trac.sagemath.org/ticket/15976 the ticket says: Branch:public/ticket/15976 (Commits) If you click on public/ticket/15976 then you see the cumulative diff In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976 (and logged in), the public/ticket/15976 was not a link! I think I would have found it otherwise. But I refeshed the page and now it is a link, and displays exactly as you say. So this is fine, and exactly what Marti nand I wanted to see; the only mystery is why that link was unlinked when I first looked at it. John If you click on (Commits) you'll see the individual commits. On Thursday, May 1, 2014 12:32:57 PM UTC+1, John Cremona wrote: When I do that I see the list of about 15 commits with commit messages but not the diffs. I can clisck on any of these commits and see the diffs for that commit, but how do I see the cumulative diffs for the sequence of commits (in trac)? -- 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. -- 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: git diff branch1..develop
I've seen that occasionally, if you leave a trac window open for a long time then sometimes the ticket name is no longer a link. I don't know exactly what triggers it, possibly when the ticket is updated by somebody else (ajax call?). In any case its easily fixed by reloading the page. On Thursday, May 1, 2014 1:17:38 PM UTC+1, John Cremona wrote: In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976 (and logged in), the public/ticket/15976 was not a link! -- 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: git diff branch1..develop
That happens when you've started making a comment (or any other change to the ticket) as part of the preview. Best, Travis On Thursday, May 1, 2014 6:25:31 AM UTC-7, Volker Braun wrote: I've seen that occasionally, if you leave a trac window open for a long time then sometimes the ticket name is no longer a link. I don't know exactly what triggers it, possibly when the ticket is updated by somebody else (ajax call?). In any case its easily fixed by reloading the page. On Thursday, May 1, 2014 1:17:38 PM UTC+1, John Cremona wrote: In my browser (firefox) viewing http://trac.sagemath.org/ticket/15976 (and logged in), the public/ticket/15976 was not a link! -- 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: git diff branch1..develop
On Thu, May 1, 2014 at 9:30 AM, leif not.rea...@online.de wrote: Travis Scrimshaw wrote: That happens when you've started making a comment (or any other change to the ticket) as part of the preview. Hardly related, but is it intentional that trac meanwhile also colors (and even strikes!) trac user names in replies / quotes (depending on or according to the /state of the ticket/)? No, this came about from upgrading our version of trac -- it seemed so minor that I didn't spend the time investigating it. Just asking... -leif -- () The ASCII Ribbon Campaign /\ Help Cure HTML E-Mail -- 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. -- Andrew -- 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: git diff branch1..develop
Dear list, On Thu, 1 May 2014 22:21:51 + (UTC) Simon King simon.k...@uni-jena.de wrote: On 2014-05-01, Dima Pasechnik dimp...@gmail.com wrote: did you look at http://boxen.math.washington.edu/home/vbraun/doc/developer/git_trac.html#section-git-trac-readonly ? Yes. I understand that it tells me how to configure stuff so that I can *only* pull (and this without password), but can not push (even with password). I don't see why I would be impossible to use read-only for fetching and ssh-key for pushing. In fact, with git = 1.6.4 (needed according to [1]) and with this in my .git/config: [remote trac] pushurl = g...@trac.sagemath.org:sage.git url = git://trac.sagemath.org/sage.git fetch = +refs/heads/*:refs/remotes/trac/* which yields this from git remote -v: origin git://github.com/sagemath/sage.git (fetch) origin git://github.com/sagemath/sage.git (push) tracgit://trac.sagemath.org/sage.git (fetch) tracg...@trac.sagemath.org:sage.git (push) I can push to trac with my ssh-key-password (the branch I pushed is at [2]) and fetch from trac without a password. It's a bit too late in the evening for me to learn git-trac now, so I tried this only with pure git (git fetch trac and git push trac master:u/emassop/test). I really don't see why this would interfere with git-trac though. Regards, Erik Massop [1] http://technosorcery.net/blog/2011/12/26/how-i-use-different-fetch-and-push-urls-in-git/ [2] http://git.sagemath.org/sage.git/log/?h=u/emassop/test -- 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.
