Finding out in which beta some ticket was merged

[Jeroen Demeyer]

What is currently the right way to determine in which Sage beta a given
ticket was merged? I would expect to see this in the output of "git trac
log TICKET", but that's not the case.

[Volker Braun]

I usually just search in the history:

git log --first-parent --oneline 

[R. Andrew Ohana]

You can get the beta into which the release manager merged the ticket (i.e. the beta that you want minus 1) with

git describe --abbrev=0 TICKET_SHA1

where TICKET_SHA1 is the sha1 of the merge commit for the ticket in question (i.e. the first sha1 in git trac log TICKET).

--
You received this message because you are subscribed to the Google Groups "sage-git" group.
To unsubscribe from this group and stop receiving emails from it, send an email to sage-git+u...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

--

Andrew

[Nicolas M. Thiery]

On Tue, Oct 07, 2014 at 04:30:23PM -0700, R. Andrew Ohana wrote:
> You can get the beta into which the release manager merged the ticket
> (i.e. the beta that you want minus 1) with
> git describe --abbrev=0 TICKET_SHA1
> where TICKET_SHA1 is the sha1 of the merge commit for the ticket in
> question (i.e. the first sha1 in git trac log TICKET).

Maybe a good candidate for a git trac command?

> git trac status 13242
new

> git trac status 13243
needs review

> git trac status 17987
merged in 6.4.beta 2

Thanks in advance!

Cheers,
Nicolas
--
Nicolas M. Thiéry "Isil" <nth...@users.sf.net>
http://Nicolas.Thiery.name/

[John Palmieri]

A followup: I wanted to know which trac ticket was responsible for sagenb-0.11.0, so I did

   git log build/pkgs/sagenb/package-version.txt

The sha1 for the relevant change was c5354abd32c0f396ab06a46a4141e77ce487eb8e. So I did

   git describe --abbrev=0 c5354abd32c0f396ab06a46a4141e77ce487eb8e

and was told "6.2.rc1", which is completely wrong: I know that the change was either in 6.4.rc0 or 6.4.rc1. So I did

   git log

and searched for "c5354". I then found ticket #16911, but when I looked at the commits listed at #16911, it didn't seem to have this change. So now I'm really confused. Can anyone clarify what's going on? In particular:

- why didn't "git describe --abbrev=0 ..." work?
- how do I figure out which trac ticket caused a particular change?

  John

[Volker Braun]

Works for me: 

$ git describe --abbrev=0 c5354abd32c0f396ab06a46a4141e77ce487eb8e

6.4.beta6

You might have to actually download all tags though. Whats the output of "git tag". Maybe try to "git pull" (but not: "git pull --no-tags"). Also with the git-trac script:

$ git trac find c5354abd32c0f396ab06a46a4141e77ce487eb8e

Commit has been merged in 6.4.rc0.

commit 22836987ac42ef6917c5e3c5f801201a6314e251

Merge: de7c38e a4c94cd

Author: Release Manager <rel...@sagemath.org>

Date:   Wed Oct 29 22:24:07 2014 +0000

    Trac #16004: Update notebook to utilize pure javascript JSmol for default live 3-D

    

    The notebook needs updates to utilize a pure javascript version of Jmol

    by default for live 3-D.  This includes changes to make the notebook

    compatible with the newer jquery-1.9 (some things used in the notebook

    have been deprecated).

    

    Jmol is cross compiled to java and javascript.  Because so many

    browser/OS combinations now actively try to avoid using java applets, it

    is necessary to have a pure javascript alternative.  This solution

    provides all the functionality of Jmol, but as expected since javascript

    is interpreted rather than bytecode ("~3/4" of the way to compiled) the

    performance when interacting with the plot is slower.

    

    This first implementation removes the user tools that have appeared to

    the right of the 3-D plot as they need to be rewritten as well.

    

    One added feature is a "load 3-D live" check box that can be used to

    make a worksheet load 3-D plots live when the worksheet is opened.  For

    worksheets with a single interact or only 1-2 plots this should be OK.

    

    This requires installation of an updated Jmol.spkg.  See ticket #17020.

    Will require a new sagenb release: [INSERT HERE]

    

    How to test:

    1. Update Sage with #17020

    1. Download the repackaged Jmol from the link provide in #17020 and save

    the package in the "upstream" directory of your sage install.

    1. run `sage -f jmol` to install the new jmol.

    1. If you don't have it yet, update Sage with #16911 '''or''' just use

    this branch that Volker has merged with that one.

    1. Same with #16396 if you want to build doc correctly.

    1. Update Sage with the branch here

    1. Put [http://sage.math.washington.edu/home/kcrisman/sagenb-0.11.0.tar

    the new upstream package] into `SAGE_ROOT/upstream`

    1. Do `sage -f sagenb-0.11.0`

    1. Test!

    1. For testing, #17170 is also advised, since without it display in the

    notebook does not work properly.

    

    URL: http://trac.sagemath.org/16004

    Reported by: gutow

    Ticket author(s): Jonathan Gutow, Volker Braun

    Reviewer(s): Steven Trogdon, Karl-Dieter Crisman, Jonathan Gutow

[John Palmieri]

On Wednesday, November 5, 2014 11:21:13 AM UTC-8, Volker Braun wrote:

Works for me: 

$ git describe --abbrev=0 c5354abd32c0f396ab06a46a4141e77ce487eb8e

6.4.beta6

You might have to actually download all tags though. Whats the output of "git tag". Maybe try to "git pull" (but not: "git pull --no-tags").

Ah, this fixed it.

 

Also with the git-trac script:

$ git trac find c5354abd32c0f396ab06a46a4141e77ce487eb8e

This works, too. Thanks.

--
John