#1464 Add branch name(s) to commit titlebar (git)

v1.0.0
closed
sf-4 (350)
SCM
nobody
2015-08-20
2011-02-07
No

This was broken out from [#1385]

the bar showing a branch should contain the branch name, e.g.,

3477a1c (master, dev)

Related

Tickets: #1385
Tickets: #1491
Tickets: #1725

Discussion

  • Dave Brondsema

    Dave Brondsema - 2011-02-10
    • size: --> 2

    • summary: Add branch name(s) to commit titlebar --> Add branch name(s) to commit titlebar (git)

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-16
    • assigned_to: Paul Sokolovsky
     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-16

    This would be good opportunity for me to get acquainted with SCM subsystem in Allura.

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-19

    I usually don't go far into (unspec'ed) design, but here I decided to make something which is nice to look at. I used paradigm familiar from many other tools - show branch/tags names as sticker-like labels by revision id. Screen shot is attached. The only question if it fits overall visual paradigm, but I guess by tweaking palette and corner styles it would fit well.

    Implementation wise, it's implemented on generic SCM level, so automagically works for Hg too.

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-22
    • status: open --> blocked
     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-22

    Waiting for UI input on current implementation, Kyle said he's working on it.

     
  • Dave Brondsema

    Dave Brondsema - 2011-02-22
     
  • Dave Brondsema

    Dave Brondsema - 2011-02-22

    This looks fine for what it implements. However, for branches, it's useful to show branches that contain the current commit - not just branches whose tip is the current commit. Tags functionality would stay how it's implemented here.

    If this turns out to be very difficult, I'm open to postponing it, and working on more important tasks

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-02-23
    • status: blocked --> in-progress
     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-02

    Given the nature of git commit graph structure, where there're pointers to parent commit, solving this task would require walking large part of a graph (because we need to child pointers here - to trace path from a given commit down to branch heads). That's doable in GitPython, but without doubt wouldn't be too performant for a repo with hundreds of heads and thosands of commits. So, as was proposed previously, git branch --contains invocation is used instead (i.e. the same algo coded in C).

    That's implemented (using GitPython's git command wrapper), ready for review.

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-02
    • status: in-progress --> code-review
    • assigned_to: Paul Sokolovsky --> Dave Brondsema
    • size: 4 --> 4
     
  • Dave Brondsema

    Dave Brondsema - 2011-03-03

    Code works & looks fine. The visuals do not.... the bright green is too much.

     
  • Dave Brondsema

    Dave Brondsema - 2011-03-03

    Kyle suggests white on blue (use a blue from elsewhere in our CSS styles), drop the border, add rounded-corner.

     
  • Dave Brondsema

    Dave Brondsema - 2011-03-03
    • milestone: mar-03 --> mar-10
     
  • Dave Brondsema

    Dave Brondsema - 2011-03-03
    • status: code-review --> in-progress
    • assigned_to: Dave Brondsema --> Paul Sokolovsky
     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-04

    Well, I used colors from gitg to have some reference ;-). And I would need two sets of colors - for branch labels vs tag labels. I'll ping Kyle on that.

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-04

    (2011-03-04 16:25:22) Kyle Adams: What about two shades of the same color?
    (2011-03-04 16:25:26) Kyle Adams: http://sourceforge.net/downloads/styleguide/
    (2011-03-04 16:25:35) Kyle Adams: Dave showed this to me yesterday
    (2011-03-04 16:26:03) Kyle Adams: I think we could do something with $highlight-light and $highlight-dark
    (2011-03-04 16:26:10) psokolovsky@geek.net/newbook: Ok, I'll what I come with, and we can add textual tooltip too I guess
    (2011-03-04 16:26:12) Kyle Adams: for the background
    (2011-03-04 16:26:23) Kyle Adams: white for the text
    (2011-03-04 16:26:33) Kyle Adams: 2 or 4px rounded corners
    (2011-03-04 16:26:43) Kyle Adams: Should help tighten up the visual appearance
    (2011-03-04 16:27:00) Kyle Adams: Yeah, we should have the textual tooltip no matter what colors we use for accessibility

     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-17
    • status: in-progress --> closed
     
  • Paul Sokolovsky

    Paul Sokolovsky - 2011-03-17

    Merged to dev.

     
  • Dave Brondsema

    Dave Brondsema - 2011-03-17
    • milestone: mar-24 --> mar-17
     

Log in to post a comment.