Project

General

Profile

Actions

Feature #5501

closed

Git: Mercurial: Adding visual merge/branch history to repository view

Added by Ralph Broenink almost 14 years ago. Updated about 12 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Toshi MARUYAMA
Category:
SCM
Target version:
Start date:
2010-05-11
Due date:
% Done:

100%

Estimated time:
Resolution:
Fixed

Description

I really like the merge/branch lines in 'gitk' (or 'git log --graph') or the network view at http://github.com/edavis10/redmine/network. I couldn't find any plugin or feature request to perform this task, so I would like to suggest as a feature.


Files

branch-graph-redmine.png (102 KB) branch-graph-redmine.png Branch graph screenshot Jan Topiński, 2011-09-05 13:29
branch-graph-redmine.png (102 KB) branch-graph-redmine.png Branch graph screenshot Jan Topiński, 2011-09-05 13:30
bitbucket-thg-shellext.png (109 KB) bitbucket-thg-shellext.png Toshi MARUYAMA, 2011-09-05 14:25
vertical-graph.png (248 KB) vertical-graph.png Vertical graph. Jan Topiński, 2011-09-06 09:12
fix_typo_changeset_parents.diff (1.53 KB) fix_typo_changeset_parents.diff Toshi MARUYAMA, 2011-09-06 15:13
thg-shellext.png (180 KB) thg-shellext.png Toshi MARUYAMA, 2011-12-01 10:59

Related issues

Related to Redmine - Feature #5386: Branch/Tags in Changeset DescriptionNew2010-04-27

Actions
Related to Redmine - Defect #7984: Confusing revisions links on repository rootNewToshi MARUYAMA2011-03-24

Actions
Related to Redmine - Feature #7246: Handle "named branch" for mercurialClosedToshi MARUYAMA2011-01-07

Actions
Related to Redmine - Defect #5357: Git: SCM revisions ordered by date/time (should be reverse commit order)NewToshi MARUYAMA2010-04-20

Actions
Related to Redmine - Defect #3724: Mercurial repositories display revision ID instead of changeset IDClosedToshi MARUYAMA2009-08-10

Actions
Related to Redmine - Defect #9824: Visual merge/branch history words are cut offClosed

Actions
Related to Redmine - Defect #10172: There is no lines on revision graph between revisions in fetching before Redmine 1.2Closed

Actions
Has duplicate Redmine - Feature #3909: Mercurial: show repository graphic historyClosed2009-09-23

Actions
Actions #1

Updated by Toshi MARUYAMA almost 13 years ago

  • Category set to SCM
Actions #2

Updated by Jan Topiński over 12 years ago

I made working patch. Please tel me if you like it or not. I don't know if you like it to be added to redmine or shall I made a plugin?

Actions #3

Updated by Jan Topiński over 12 years ago

I made working patch. Please tel me if you like it or not. I don't know if you like it to be added to redmine or shall I made a plugin? Code is at https://github.com/simcha/redmine.

Actions #5

Updated by Etienne Massip over 12 years ago

I agree with Toshi ; moreover that would be easier to integrate into existing revision / change list.

Actions #6

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Adding visual merge/branch history to repository view to Git: Adding visual merge/branch history to repository view
Actions #7

Updated by Jan Topiński over 12 years ago

Toshi I also like vertical graph. I will try to make one like this for revision/revisions page.

Actions #8

Updated by Jan Topiński over 12 years ago

So, I made one with no to-the-right-align. I did not do it cause I don't like it and it is some more work ;) let me know it you like this version. I know that line curve is not ideal and I am aware of some other bugs like margin problem, it is still just a prototype.
Vertical graph.

Actions #9

Updated by Etienne Massip over 12 years ago

Very nice, indeed!

Actions #10

Updated by Toshi MARUYAMA over 12 years ago

  • Status changed from New to 7
  • Assignee set to Toshi MARUYAMA
Actions #11

Updated by Toshi MARUYAMA over 12 years ago

There is table name typo 'changesets_parents'.
It seems that 'changeset_parents' is correct.
This patch fixes it.

Actions #12

Updated by Jan Topiński over 12 years ago

Thanks Toshi patch applied.

Actions #13

Updated by Sylvain Berfini over 12 years ago

Hi. It would be nice to make a plugin for this for the redmine branch. Thanks !

Actions #14

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Git: Adding visual merge/branch history to repository view to Git: Mercurial: Adding visual merge/branch history to repository view
Actions #15

Updated by Toshi MARUYAMA over 12 years ago

  • Target version set to 1.3.0
  • % Done changed from 0 to 100
Actions #16

Updated by Toshi MARUYAMA about 12 years ago

  • File the-shellext.png added

Limitations

Before Redmine 1.2 database data

Fetching revisions before Redmine 1.2 does not have parents revisions.
So, there is no lines between revisions.

If you want to draw lines all revisions,
You need to reset repository.

There is a issue for re-syncing repository (#1273).

Git revision order

Redmine between 0.9 and 1.1 has git database inconsistency (#5357).
Redmine 1.3 git order is date order due to historical reasons.
So, git revision graph is sometimes strange.

Actions #17

Updated by Toshi MARUYAMA about 12 years ago

  • File deleted (the-shellext.png)
Actions #18

Updated by Toshi MARUYAMA about 12 years ago

Actions #19

Updated by Toshi MARUYAMA about 12 years ago

  • Status changed from 7 to Closed
  • Resolution set to Fixed

If you have bugs or improvements, please create new issues.

Actions

Also available in: Atom PDF