Feature #5501
Git: Mercurial: Adding visual merge/branch history to repository view
| Status: | Closed | Start date: | 2010-05-11 | |
|---|---|---|---|---|
| Priority: | Normal | Due 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)
branch-graph-redmine.png - Branch graph screenshot (102 KB)
bitbucket-thg-shellext.png (109 KB)
vertical-graph.png - Vertical graph. (248 KB)
fix_typo_changeset_parents.diff 
(1.53 KB)
thg-shellext.png (180 KB)
Related issues
Associated revisions
css: set margin 0px at top and bottom of changeset ul and ol (#5501)
scm: view: truncate author with length 30 (#5501)
css: set nowrap of changeset author and committed_on (#5501)
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>
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.
scm: git: return saved revision at model "save_revision" (#5501)
scm: mercurial: update test repository (#5501)
This test repository has one merged revision.
scm: mercurial: add parents to xml log template (#5501)
scm: lib: add parents attribute to Revision class of abstract adapter (#5501)
scm: mercurial: lib: add parents to Revision class (#5501)
scm: mercurial: test: add test of parents to unit lib test (#5501)
scm: git: lib: add parents to Revision class (#5501)
Contributed by Jan Topiński.
scm: git: test: add test of parents to unit lib test (#5501)
scm: lib: add Branch class to abstract adapter (#5501)
scm: git: lib: return array of Branch class instead of array of strings at branches method (#5501)
Contributed by Jan Topiński.
scm: git: test: lib: update branches test for Branch class (#5501)
scm: mercurial: lib: return array of Branch class instead of array of strings at branches method (#5501)
scm: mercurial: test: lib: update branches test for Branch class (#5501)
scm: db: model: add parent/child relation for changesets (#5501)
Contributed by Jan Topiński.
scm: git: model: save parent/child relation for changesets (#5501)
Contributed by Jan Topiński.
scm: git: test: model: add test of parents (#5501)
scm: mercurial: model: save parent/child relation for changesets (#5501)
scm: mercurial: test: model: add test of parents (#5501)
scm: controller: include parents in changesets (#5501)
Contributed by Jan Topiński.
scm: model: add method to switch revision graph support or not and set default false (#5501)
scm: model: git: set revision graph support true (#5501)
scm: model: mercurial: set revision graph support true (#5501)
scm: mercurial: test: model: fix failing test_parents on PostgreSQL (#5501)
scm: git: test: model: fix failing test_parents on PostgreSQL (#5501)
scm: view: add parents and children on the revision page (#5501)
Contributed by Jan Topiński.
scm: add Japanese translation of parent and child revision (#5501)
scm: update translations of parent and child revision (#5501)
add raphael.js (#5501)
scm: git: mercurial: add a new feature of revision graph (#5501)
Contributed by Jan Topiński.
scm: view: remove redundant br tag from the revision page (#5501)
scm: git: mercurial: not show revision graph in sub directory (#5501)
History
#1
Updated by Toshi MARUYAMA about 10 years ago
- Category set to SCM
#2
Updated by Jan Topiński over 9 years ago
- File branch-graph-redmine.png added
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 over 9 years ago
- File branch-graph-redmine.png added
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.
#4
Updated by Toshi MARUYAMA over 9 years ago
- File bitbucket-thg-shellext.png added
Great work!!
I prefer gitk, TortoiseHg, hgweb, bitbucket styles rather than github style.- http://hg.openttdcoop.org/chiliproject/graph
- https://bitbucket.org/redmine/chiliproject/changesets
- https://bitbucket.org/tortoisehg/shellext/changesets
#5
Updated by Etienne Massip over 9 years ago
I agree with Toshi ; moreover that would be easier to integrate into existing revision / change list.
#6
Updated by Toshi MARUYAMA over 9 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 over 9 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 over 9 years ago
- File vertical-graph.png added
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. 
#9
Updated by Etienne Massip over 9 years ago
Very nice, indeed!
#10
Updated by Toshi MARUYAMA over 9 years ago
- Status changed from New to 7
- Assignee set to Toshi MARUYAMA
#11
Updated by Toshi MARUYAMA over 9 years ago
- File fix_typo_changeset_parents.diff added
There is table name typo 'changesets_parents'.
It seems that 'changeset_parents' is correct.
This patch fixes it.
#12
Updated by Jan Topiński over 9 years ago
Thanks Toshi patch applied.
#13
Updated by Sylvain Berfini over 9 years ago
Hi. It would be nice to make a plugin for this for the redmine branch. Thanks !
#14
Updated by Toshi MARUYAMA over 9 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 over 9 years ago
- Target version set to 1.3.0
- % Done changed from 0 to 100
#16
Updated by Toshi MARUYAMA over 9 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 over 9 years ago
- File deleted (
the-shellext.png)
#18
Updated by Toshi MARUYAMA over 9 years ago
- File thg-shellext.png added
#19
Updated by Toshi MARUYAMA over 9 years ago
- Status changed from 7 to Closed
- Resolution set to Fixed
If you have bugs or improvements, please create new issues.