git.sagemath.org

[kcrisman]

Just a question about this site.  It has everything we need, apparently... but the 'tree' and 'log' views don't seem to be on the current master.  For instance,

http://git.sagemath.org/sage.git/log/src/sage/misc/session.pyx

tails off one commit before

$ git log src/sage/misc/session.pyx 

does.  I'm asking sage-release because I assume it has something to do with the release process, but if sage-devel is more appropriate just let me know.

Thanks,

- kcrisman

[Volker Braun]

What is the output that you think is incorrect? My history matches git.sagemath.org (Note that you can pick the branch in the drop-down box on the top right):

Master branch:

$ git log --oneline master src/sage/misc/session.pyx

0c7d2ff reviewer patch

1c7f78f Merge branch 'develop' into py3_misc

68d9687 sage/misc: use "in" instead of deprecated "has_key()"

8c69c8c trac 13255: replace some deprecated python functions in sage/misc

509ed36 Trac #14523: Improve attach()

39b300e Trac #13715: Review patch for #13715 which cleans up the rest of the doc in session.pyx.

0851b64 Trac #13715: documentation for attach() should mention load_attach_path()

9b7ae79 Trac #12415: Chang various doctests to account for differences between the new framework and the 

1c213eb Trac #5155: When doctesting, don't write files in $SAGE_ROOT

d99d876 Trac #13533: No longer mark Cython tests as "optional - gcc"

5b42d86 Trac #13681: Use os.path.join() to construct temporary filenames

0e6f62b Trac #13579: Use tempfile for tmp_dir() and tmp_filename() and move these to sage/misc/temporary_

498e256 Trac #12633: #12633: Fix documentation of attach

64e16de #378: Configurable load + attach path

03a85e1 trac 7972 -- show_identifiers is broken in the notebook; needs to not include globals; also ReST-

d60bae6 trac 7514 -- rewrite load and attach

94a93b3 trac #4894 -- save_session -- bug when saving %cython functions, etc.

4f98c53 Fixing the fact that some doc tests of session.pyx could destroy user data.

ffa76cf Changes for cython 0.10 due to locals behaving like it does in Python now.

f0ae7d2 trac #2901 -- completely rewrite load_session and save_session in a more modern way.

And develop branch:

$ git log --oneline develop src/sage/misc/session.pyx

be5f45d provide information instead of error for sagenb save session

0c7d2ff reviewer patch

1c7f78f Merge branch 'develop' into py3_misc

68d9687 sage/misc: use "in" instead of deprecated "has_key()"

8c69c8c trac 13255: replace some deprecated python functions in sage/misc

509ed36 Trac #14523: Improve attach()

39b300e Trac #13715: Review patch for #13715 which cleans up the rest of the doc in session.pyx.

0851b64 Trac #13715: documentation for attach() should mention load_attach_path()

9b7ae79 Trac #12415: Chang various doctests to account for differences between the new framework and the 

1c213eb Trac #5155: When doctesting, don't write files in $SAGE_ROOT

d99d876 Trac #13533: No longer mark Cython tests as "optional - gcc"

5b42d86 Trac #13681: Use os.path.join() to construct temporary filenames

0e6f62b Trac #13579: Use tempfile for tmp_dir() and tmp_filename() and move these to sage/misc/temporary_

498e256 Trac #12633: #12633: Fix documentation of attach

64e16de #378: Configurable load + attach path

03a85e1 trac 7972 -- show_identifiers is broken in the notebook; needs to not include globals; also ReST-

d60bae6 trac 7514 -- rewrite load and attach

94a93b3 trac #4894 -- save_session -- bug when saving %cython functions, etc.

4f98c53 Fixing the fact that some doc tests of session.pyx could destroy user data.

ffa76cf Changes for cython 0.10 due to locals behaving like it does in Python now.

f0ae7d2 trac #2901 -- completely rewrite load_session and save_session in a more modern way.

[Jean-Pierre Flori]

Note that files only show the last commit that modigfied them.

On Wednesday, December 10, 2014 3:59:22 PM UTC+1, kcrisman wrote:

[kcrisman]

And develop branch:

$ git log --oneline develop src/sage/misc/session.pyx

be5f45d provide information instead of error for sagenb save session

Well, this is the missing one, of course.  I guess that since "Milestone: sage-6.4" was on the ticket http://trac.sagemath.org/ticket/9805 that it was in Sage 6.4!  That is really frustrating - and now I sent a senseless email to sage-release because of that.  Why did that happen?  And don't tell me it's because of the non-auto-bump - surely a release script is smart enough to check whether the current milestone is *older* than the one worked on, even if one doesn't know exactly what the current milestone is going to be.

[Volker Braun]

The trac milestone is unrelated. Its just that git.sagemath.org defaults to displaying the tree/log of the master branch, not the develop branch.

[kcrisman]

The trac milestone is unrelated. Its just that git.sagemath.org defaults to displaying the tree/log of the master branch, not the develop branch.

So was that merged in 6.4 or not, is the question?  If not, that is bad.  At least upon merging the milestone should be updated.  (No, I'm not suggesting the huge spam again of changes each time... just that when merged, the milestone should change.  And Merged In should be used.  <ducks>)

[Volker Braun]

That is back to the old discussion, at the time of merging I don't know for sure where it will be released in. Feel free to write a bot that updates the "merged-in" field of tickets after each release, though.

[Volker Braun]

PS: be5f45d has been merged in 6.5.beta0

$ git trac find be5f45d

Commit has been merged in 6.5.beta0.

commit bbf1de708551be530afcd2f284465678999ca823

Merge: f8b7591 be5f45d

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

Date:   Fri Nov 14 15:17:35 2014 +0000

    Trac #9805: save_session is completely broken in the notebook

    

    Try

    {{{

    save_session('foo')

    }}}

    in the notebook.  Boom!

    

    The problem is these lines in misc/session.pyx:

    {{{

        if embedded():

            # Also save D to the data directory if we're using the notebook.

            save(D, '../../data/' + name)

    }}}

    

    When I rewrote the notebook I forgot to change this appropriately.  I'm

    not sure exactly what the right fix is, but it is to somehow replace

    '../../data/' by the data

    directory (which is defined by the variable DATA in the notebook).

    ----

    Apply [attachment:trac_9805.patch] to devel/sage (it is a workaround)

    

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

    Reported by: was

    Ticket author(s): Punarbasu Purkayastha

    Reviewer(s): Karl-Dieter Crisman

On Thursday, December 11, 2014 7:04:21 PM UTC, kcrisman wrote:

[Jeroen Demeyer]

On 2014-12-11 17:38, kcrisman wrote:
> surely a release script is smart enough to check
> whether the current milestone is *older* than the one worked on, even if
> one doesn't know exactly what the current milestone is going to be.

Checking is easy, changing is a lot harder.

[kcrisman]

PS: be5f45d has been merged in 6.5.beta0

So was that merged in 6.4 or not, is the question?

Ach.