GitPlugin: Show branches in timeline, changesets, browser

[Peter Suter]

Created as part of the move of GitPlugin. Tickets originally reported for ​th:GitPlugin: ​th:#2633, ​th:#7860, ​th:#8522

Quoting ​jkp@...:

It would be best if you could see which branch a commit was made against in both the changeset view and the timeline view.

→ worksforme, but really needs to be improved, see comment:4

Quoting ​shogsbro:

For Git repos with multiple branches it would be useful to be able to browse the branch

→ worksforme

Quoting ​trac@...:

I'd like browse source to take me to the same [branch] by default each time.

→ duplicate

[Christian Boos]

For ​#TH8552:

Quoting ​trac@...:

I'd like browse source to take me to the same [branch] by default each time.

One proposal was ​https://github.com/hvr/trac-git-plugin/pull/13 (use .git.head())

[Christian Boos]

Replying to cboos:

For ​#TH8552:

Quoting ​trac@...:

I'd like browse source to take me to the same [branch] by default each time.

One proposal was ​https://github.com/hvr/trac-git-plugin/pull/13 (use `.git.

Note that this is similar to #10136 for TracMercurial, which suggests instead having a per-repository attribute.

[Christian Boos]

​#TH7860 Browse branches as virtual top-level folders:

For Git repos with multiple branches it would be useful to be able to browse the branch as a top-level virtual folder, with the actual files in the branch beneath it.

Well, we have the quickjump menu for that. It would be very surprising to show "virtual folders" for branches, and that would lead to all sorts of needless complications. So that's a worksforme I'd say.

[Christian Boos]

​#TH2633 It should be possible to see the branch in the timeline and for each changeset:

It would be best if you could see which branch a commit was made against in both the changeset view and the timeline view.

We have this feature, and it follows the git branch --contains commit… which is in fact very problematic when there are lots of topic branches and we go a bit deeper in the history than just the last commits: quite soon, any old changeset will be labelled with all the branches!

See for example:

• demo-1.0/changeset/c6e57ab5c0f35779b02e6134ebde8e01d6ca26a6/trac.git/
• demo-1.0/browser/trac.git/
• demo-1.0/log/trac.git/
• demo-1.0/timeline

At this day, we see the following list of branches: trunk +testing 1.0-stable ticket10012/final-on-r11128 ticket10437-mime_map_patterns-override ticket10779-tracopt-svn-auto-enabler ticket10779-tracopt-svn-db29 ticket10804/inline-block, ticket10847-deleted-custom-fields ticket5533-get-extra-mimetypes ticket5533-get-extra-mimetypes-r11227 ticket8866/take2-r11150

… and this can only get worse, as any additional branch will most certainly be a descendant of this changeset (2 month old).

OTOH, showing only the branch labels for the heads (i.e. for the commit which is directly pointed to by a ref) would be too restrictive, as it's quite convenient to be able to directly associate any changesets present on a topic branch to the name of that topic branch. Or to have a changeset on a maintenance branch show the name of that maintenance branch.

So we need to find a way to show the most appropriate branch name(s) for any given changeset.