Feature #5501

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

Added by Ralph Broenink over 7 years ago. Updated almost 6 years ago.

Status:ClosedStart date:2010-05-11
Priority:NormalDue date:
Assignee:Toshi MARUYAMA% Done:

100%

Category:SCM
Target version:1.3.0
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.

branch-graph-redmine.png - Branch graph screenshot (102 KB) Jan Topiński, 2011-09-05 13:29

branch-graph-redmine.png - Branch graph screenshot (102 KB) Jan Topiński, 2011-09-05 13:30

bitbucket-thg-shellext.png (109 KB) Toshi MARUYAMA, 2011-09-05 14:25

vertical-graph.png - Vertical graph. (248 KB) Jan Topiński, 2011-09-06 09:12

fix_typo_changeset_parents.diff Magnifier (1.53 KB) Toshi MARUYAMA, 2011-09-06 15:13

thg-shellext.png (180 KB) Toshi MARUYAMA, 2011-12-01 10:59


Related issues

Related to Redmine - Feature #5386: Branch/Tags in Changeset Description New 2010-04-27
Related to Redmine - Defect #7984: Confusing revisions links on repository root New 2011-03-24
Related to Redmine - Feature #7246: Handle "named branch" for mercurial Closed 2011-01-07
Related to Redmine - Defect #5357: Git: SCM revisions ordered by date/time (should be revers... New 2010-04-20
Related to Redmine - Defect #3724: Mercurial repositories display revision ID instead of cha... Closed 2009-08-10
Related to Redmine - Feature #1273: Need a way to re-sync repository history New 2008-05-21
Related to Redmine - Defect #9824: Visual merge/branch history words are cut off Closed
Related to Redmine - Defect #10172: There is no lines on revision graph between revisions in ... New
Duplicated by Redmine - Feature #3909: Mercurial: show repository graphic history Closed 2009-09-23

Associated revisions

Revision 7636
Added by Toshi MARUYAMA about 6 years ago

css: set margin 0px at top and bottom of changeset ul and ol (#5501)

Revision 7637
Added by Toshi MARUYAMA about 6 years ago

scm: view: truncate author with length 30 (#5501)

Revision 7638
Added by Toshi MARUYAMA about 6 years ago

css: set nowrap of changeset author and committed_on (#5501)

Revision 7639
Added by Toshi MARUYAMA about 6 years ago

scm: view: add #to_s to changeset.author (#5501)

On Ruby 1.8.6, following error raises.

undefined method `mb_chars' for #<ActiveRecord::Associations::BelongsToAssociation:0x7f86950f3e58>

Revision 7653
Added by Toshi MARUYAMA about 6 years ago

scm: git: use to_s for branches at model (#5501)

"scm.branches" will extend to have the revision for the branch.
no "to_s" will have a problem.

Revision 7654
Added by Toshi MARUYAMA about 6 years ago

scm: git: return saved revision at model "save_revision" (#5501)

Revision 7662
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: update test repository (#5501)

This test repository has one merged revision.

Revision 7663
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: add parents to xml log template (#5501)

Revision 7665
Added by Toshi MARUYAMA about 6 years ago

scm: lib: add parents attribute to Revision class of abstract adapter (#5501)

Revision 7666
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: lib: add parents to Revision class (#5501)

Revision 7667
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: test: add test of parents to unit lib test (#5501)

Revision 7668
Added by Toshi MARUYAMA about 6 years ago

scm: git: lib: add parents to Revision class (#5501)

Contributed by Jan Topiński.

Revision 7669
Added by Toshi MARUYAMA about 6 years ago

scm: git: test: add test of parents to unit lib test (#5501)

Revision 7670
Added by Toshi MARUYAMA about 6 years ago

scm: lib: add Branch class to abstract adapter (#5501)

Revision 7671
Added by Toshi MARUYAMA about 6 years ago

scm: git: lib: return array of Branch class instead of array of strings at branches method (#5501)

Contributed by Jan Topiński.

Revision 7672
Added by Toshi MARUYAMA about 6 years ago

scm: git: test: lib: update branches test for Branch class (#5501)

Revision 7673
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: lib: return array of Branch class instead of array of strings at branches method (#5501)

Revision 7674
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: test: lib: update branches test for Branch class (#5501)

Revision 7710
Added by Toshi MARUYAMA about 6 years ago

scm: db: model: add parent/child relation for changesets (#5501)

Contributed by Jan Topiński.

Revision 7711
Added by Toshi MARUYAMA about 6 years ago

scm: git: model: save parent/child relation for changesets (#5501)

Contributed by Jan Topiński.

Revision 7712
Added by Toshi MARUYAMA about 6 years ago

scm: git: test: model: add test of parents (#5501)

Revision 7713
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: model: save parent/child relation for changesets (#5501)

Revision 7714
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: test: model: add test of parents (#5501)

Revision 7715
Added by Toshi MARUYAMA about 6 years ago

scm: controller: include parents in changesets (#5501)

Contributed by Jan Topiński.

Revision 7716
Added by Toshi MARUYAMA about 6 years ago

scm: model: add method to switch revision graph support or not and set default false (#5501)

Revision 7717
Added by Toshi MARUYAMA about 6 years ago

scm: model: git: set revision graph support true (#5501)

Revision 7718
Added by Toshi MARUYAMA about 6 years ago

scm: model: mercurial: set revision graph support true (#5501)

Revision 7719
Added by Toshi MARUYAMA about 6 years ago

scm: mercurial: test: model: fix failing test_parents on PostgreSQL (#5501)

Revision 7720
Added by Toshi MARUYAMA about 6 years ago

scm: git: test: model: fix failing test_parents on PostgreSQL (#5501)

Revision 7721
Added by Toshi MARUYAMA about 6 years ago

scm: view: add parents and children on the revision page (#5501)

Contributed by Jan Topiński.

Revision 7722
Added by Toshi MARUYAMA about 6 years ago

scm: add Japanese translation of parent and child revision (#5501)

Revision 7723
Added by Toshi MARUYAMA about 6 years ago

scm: update translations of parent and child revision (#5501)

Revision 7724
Added by Toshi MARUYAMA about 6 years ago

add raphael.js (#5501)

Revision 7725
Added by Toshi MARUYAMA about 6 years ago

scm: git: mercurial: add a new feature of revision graph (#5501)

Contributed by Jan Topiński.

Revision 7727
Added by Toshi MARUYAMA about 6 years ago

scm: view: remove redundant br tag from the revision page (#5501)

Revision 8022
Added by Toshi MARUYAMA almost 6 years ago

scm: git: mercurial: not show revision graph in sub directory (#5501)

History

#1 Updated by Toshi MARUYAMA over 6 years ago

  • Category set to SCM

#2 Updated by Jan Topiński about 6 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?

#3 Updated by Jan Topiński about 6 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.

#5 Updated by Etienne Massip about 6 years ago

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

#6 Updated by Toshi MARUYAMA about 6 years ago

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

#7 Updated by Jan Topiński about 6 years ago

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

#8 Updated by Jan Topiński about 6 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.

#9 Updated by Etienne Massip about 6 years ago

Very nice, indeed!

#10 Updated by Toshi MARUYAMA about 6 years ago

  • Status changed from New to 7
  • Assignee set to Toshi MARUYAMA

#11 Updated by Toshi MARUYAMA about 6 years ago

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

#12 Updated by Jan Topiński about 6 years ago

Thanks Toshi patch applied.

#13 Updated by Sylvain Berfini about 6 years ago

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

#14 Updated by Toshi MARUYAMA about 6 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

#15 Updated by Toshi MARUYAMA about 6 years ago

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

#16 Updated by Toshi MARUYAMA almost 6 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.

#17 Updated by Toshi MARUYAMA almost 6 years ago

  • File deleted (the-shellext.png)

#19 Updated by Toshi MARUYAMA almost 6 years ago

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

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

Also available in: Atom PDF