support git flow-like view
Hi! I am not suscribed to the list, so please CC-me.
I think this may have been proposed before, but I could not find anything in the web, so I better try myself :)
The idea would be to gitk to show a "git flow-like"[0] view when it detects git flow (or the user ask for it or...)
Basiccaly, you can show the main two branches: master and develop. Of course, having the possibility to show feature/release/hotfixes branches would be ideal.
Kinds regards, Lisandro.
[0] <http://nvie.com/posts/a-successful-git-branching-model/>
Signature · 9 lines
Esperando confirmación de ingredientes necesarios que serán expuestos a la radiación... Manera geek de expresar que se espera la compra de carne para un típico asado argentino. Silvio Rikemberg. Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/
Quoted 2 lines · Lisandro Damián Nicanor Pérez Meyer
Hi! I am not suscribed to the list, so please CC-me.
That is the default etiquette on this list :)
Quoted 5 lines
I think this may have been proposed before, but I could not find anything in the web, so I better try myself :)
The idea would be to gitk to show a "git flow-like"[0] view when it detects git flow (or the user ask for it or...)
What does it mean to 'show a "git flow-like" view'? Show multiple branches? Place commits on each branch in 'swim-lanes', rather than moving them around on the horizontal to fit the space available? Some more detail, or even a mock-up would help a lot here.
Quoted 3 lines
Basiccaly, you can show the main two branches: master and develop. Of course, having the possibility to show feature/release/hotfixes branches would be ideal.
It is already possible to show multiple branches in gitk at the same time. You probably have some more specific needs beyond simply showing the different branches. Maybe you can be more specific?
Regards,
Andrew Ardill
Quoted 6 lines · On Tue 20 Nov 2012 20:56:26 Andrew Ardill escribió:
On 21 November 2012 10:42, Lisandro Damián Nicanor Pérez Meyer
Quoted 1 line · <[email protected]> wrote:
Hi! I am not suscribed to the list, so please CC-me.
That is the default etiquette on this list :)
Great :-)
Quoted 10 lines
Quoted 5 lines
I think this may have been proposed before, but I could not find anything in the web, so I better try myself :)
The idea would be to gitk to show a "git flow-like"[0] view when it detects git flow (or the user ask for it or...)
What does it mean to 'show a "git flow-like" view'? Show multiple branches? Place commits on each branch in 'swim-lanes', rather than moving them around on the horizontal to fit the space available? Some more detail, or even a mock-up would help a lot here.
I think the best mock-up would be:
<http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png>
Yes, I'm referring to "swim-lanes" like view. Which may be already there and I'm miserably failing to see :-/
Quoted 7 lines
Quoted 3 lines
Basiccaly, you can show the main two branches: master and develop. Of course, having the possibility to show feature/release/hotfixes branches would be ideal.
It is already possible to show multiple branches in gitk at the same time. You probably have some more specific needs beyond simply showing the different branches. Maybe you can be more specific?
Well, two ideas come to my mind:
- detect when using git flow (.git/config contains [gitflow "some_branch"] entries).
- Show "swim-lane"-like graphs, including branches that may not be present, but where there (release branches often are created and merged back, for example)
Maybe some of this is already there and/or it's too much trouble to do so, in those cases, please accept my apologies :-)
Kinds regards, Lisandro.
Signature · 3 lines
Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/
Am 11/21/2012 1:13, schrieb Lisandro Damián Nicanor Pérez Meyer:
Quoted 6 lines
I think the best mock-up would be:
<http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png>
Yes, I'm referring to "swim-lanes" like view. Which may be already there and I'm miserably failing to see :-/
Maybe you are just looking for gitk --date-order --branches?
-- Hannes
Quoted 5 lines · Lisandro Damián Nicanor Pérez Meyer
...
Well, two ideas come to my mind:- detect when using git flow (.git/config contains [gitflow "
some_branch"] entries).
I guess this part is just so the next part can be done automatically?
Quoted 3 lines
- Show "swim-lane"-like graphs, including branches that may not be present, but where there (release branches often are created and merged back, for example)
I think this could be useful in general, however it might struggle with already merged branches. I may be mistaken here, however I think in general there is no way to specify which commits belonged to a certain branch after they have been merged, as branch information is not kept in the commit object. There may be some exceptions that make it feasible at times, but a general solution would be to show any merged branches as part of the same swim-lane, as per current behaviour, but to have separate branch heads in different swim-lanes. This would be a nice feature, and is similar to the behaviour in, for example, Atlassian's Fisheye repository viewer and the GitHub network view.
Regards,
Andrew Ardill
Am 21.11.2012 01:13, schrieb Lisandro Damián Nicanor Pérez Meyer:
Quoted 4 lines
Well, two ideas come to my mind:
- detect when using git flow (.git/config contains [gitflow "
some_branch"] entries).
Shouldn't it be part of the gitflow package then?
Quoted 3 lines
- Show "swim-lane"-like graphs, including branches that may not be present, but where there (release branches often are created and merged back, for example)
As a general feature there could be a config option gitk reads with an ordered list of branch names (with wildcards). Those branches would always be printed in gitk as the leftmost branches (i.e. have their own lane on the left side). All other branches would be shown normally.
This would give you part of what you want, a special lane at least for master and develop and for branches you can group under wildcard branch names (for example if you prefix all release branches with "rel-").
And it would give others the ability to make special branches in gitk more visible.
(Yes I know, I'm talking again of stuff I won't have time or ability to implement ;-). Sigh)
Quoted 21 lines · On Wed 21 Nov 2012 11:52:05 Holger Hellmuth (IKS) escribió:
Am 21.11.2012 01:13, schrieb Lisandro Damián Nicanor Pérez Meyer:
Quoted 4 lines
Well, two ideas come to my mind:
- detect when using git flow (.git/config contains [gitflow "
some_branch"] entries).Shouldn't it be part of the gitflow package then?
Quoted 3 lines
- Show "swim-lane"-like graphs, including branches that may not be present, but where there (release branches often are created and merged back, for example)
As a general feature there could be a config option gitk reads with an ordered list of branch names (with wildcards). Those branches would always be printed in gitk as the leftmost branches (i.e. have their own lane on the left side). All other branches would be shown normally.
This would give you part of what you want, a special lane at least for master and develop and for branches you can group under wildcard branch names (for example if you prefix all release branches with "rel-").
Quoted 5 lines
And it would give others the ability to make special branches in gitk more visible.
(Yes I know, I'm talking again of stuff I won't have time or ability to implement ;-). Sigh)
That seems an interesting idea, indeed. Thanks!
Signature · 6 lines
Either he's dead or my watch has stopped. -- Groucho Marx Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/