Trac "log" view

[Marc Mezzarobba]

Hi everyone,

It looks like the log of the commits associated with a ticket
(http://trac.sagemath.org/log?...) sometimes stops before the last
common ancestor of 'master' and the ticket' branch. This happens for
instance with http://trac.sagemath.org/ticket/14711, where the log stops
with a merge of 'master' into the ticket's branch, even though there are
more commits that do not belong to 'master' further down the history. Is
this a deliberate choice?

--
Marc

[Simon King]

Hi Marc,

It could very well be that I explicitly merged the master branch into
the branch that I posted there. Meanwhile I learned that one shouldn't
merge master unless it is needed because of conflicts.

So, it could very well be that it was a deliberate choice, but a choice
made out of ignorance...

Best regards,
Simon

[Volker Braun]

I agree that this is incorrect, it should show:

$ git log trac/u/SimonKing/ticket/14711 ^develop --oneline

ee30c20 Address the "check" keyword of scheme morphisms by name, not position

d68c5df Minor fixes, that became needed since #14711 was not merged quickly enough

c42b539 Merge branch 'master' into ticket/14711

23f18f2 Merge branch 'master' into ticket/14711

364b985 Add warning to string repr of weakened maps. Implement copying for *all* kinds of maps.

5168cfd Generic copy method for maps, using _update_slots Use a cdef _codomain, since the codomain is strongly refed any

452d216 Add docs to SchemeMorphism

05fb569 Change SchemeMorphism back (to cope with a Cython bug), copying the new code from sage.categories.map.Map

8fd09d5 Copying of PolynomialBaseringInjection and FormalCompositeMap

be37145 Let SchemeMorphism inherit from Morphism, not from Element

0f38a2c Keep strong reference to codomain of weakened coerce maps Keep strong reference to domains of *registered* coerc

a53261d Keep a strong reference to the codomain of PrecomposedAction

1ff6f3f Add generic copy of maps. Fix copy of elements. Replace _(co)domain everywhere

61d818c Replace Map.(co)domain by constant functions, remove ._(co)domain

ebe82df Use a proper WeakValueDictionary for number fields

4685c73 convert_map_from() should only store weak references Similar to coerce_map_from, the detected morphism should be

but it actually shows only

ee30c20 Address the "check" keyword of scheme morphisms by name, not position

d68c5df Minor fixes, that became needed since #14711 was not merged quickly enough

c42b539 Merge branch 'master' into ticket/14711

Thats pretty bad. We should probably disable the changeset viewer until this works.

[Volker Braun]

To see this commit range in our cgit repository browser, you can use

http://git.sagemath.org/sage.git/log/?h=u%2FSimonKing%2Fticket%2F14711&qt=range&q=develop..u%2FSimonKing%2Fticket%2F14711

Apparently the GET parameters are

the h=<branch> sets the branch (top right drop-down)

the qt=range&q=<from>..<to> is the list of commits to show

[Marc Mezzarobba]

Simon King wrote:
> It could very well be that I explicitly merged the master branch into
> the branch that I posted there. Meanwhile I learned that one shouldn't
> merge master unless it is needed because of conflicts.
>
> So, it could very well be that it was a deliberate choice, but a
> choice made out of ignorance...

Sorry if this wasn't clear: I was talking about the choice of showing
only part of the commits, not of doing the merge.

--
Marc

[R. Andrew Ohana]

Ok, I've changed the commits link in the branch field to use cgit (as per Volker's suggestion).

--
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/groups/opt_out.

--

Andrew

[Volker Braun]

Thanks!

The trac diff viewer (branch name link) is almost certainly wrong, too. Its just the diff from the bottom to the top of the commit range, but if thats wrong then the diff is also wrong. Can we disable that until we have a better solution in place?