git flow support

[Antonio D'Mora]

Hi, I'm using git cola from some months and I'm wondering if there is a chance to support git flow branching model as implemented on this plug in

Actually, I'm trying to implement this feature, but there are some programmings patterns I haven't understand yet.

[David Aguilar]

We have a mechanism[1] for adding arbitrary actions to the
"Actions" menu that can used to implement a git-flow workflow.

If you do develop a set of git-flow guitool actions, would you
mind sharing them? That way if someone wants to use git-flow
then they can copy/paste the settings into their .gitconfig and
won't have to rediscover how to do it themselves.

git-flow is pretty popular so it'd be a good idea to feature
these examples prominently in the documentation.

If you have a good sense of what actions we'd need to implement
then please open an issue on github and we can hash it out and
get something working pretty quickly.

[1] https://git-cola.readthedocs.org/en/latest/git-cola.html#custom-gui-actions

cheers,
--
David

[Antonio D'Mora]

Thanks for the quick reply.

I'm now reading about the mechanism you mentioned and will work on get guitools for a git-flow workflow within guit-cola.

As soon as I figure out actions needed, will submite the issue on github.

Cheers,

Antonio

[Antonio D'Mora]

Well, I managed to get git flow into a buggy state with this configuration:

[guitool "Start Feature"]

title = Start Feature

cmd = git flow feature start $ARGS

        argprompt = Feature Name

[guitool "Finish Feature"]

title = Finish Feature

cmd = git flow feature finish $ARGS

        argprompt = Feature Name

[guitool "Start Hotfix"]

        title = Start Hotfix

        cmd = git flow hotfix start $ARGS

        argprompt = Hotfix Name

[guitool "Finish Hotfix"]

        title = Finish Hotfix

        cmd = git flow hotfix finish $ARGS

        argprompt = Hotfix Name

[guitool "Start Release"]

        title = Start Release

        cmd = git flow release start $ARGS

        argprompt = Release Name

[guitool "Finish Release"]

        title = Finish Release

        cmd = git flow release finish $ARGS

        argprompt = Release Name

but first we need to satisfy the dependency on git-flow plugin[1]

some bugs I cannot manage to handle are:

+  as git flow init propmps the user several times for prefix naming configuration, I cannot find the proper mechanism in the guitool api

+  when finishing a release, i got this error (eventhought i have editor setting configured...):

    error: Terminal is dumb, but EDITOR unset

    Please supply the message using either -m or -F option.

    Fatal: Tagging failed. Please run finish again to retry.

+ same on finishing a hotfix.

I hope you can give me some advice on addressing this issues.

Regards,

Antonio.

[1] https://github.com/nvie/gitflow

[Famelis George]

Hi,

You need to have a program to handle all the intricantsies of git flow.

I have a working configuration using the attached git-cola-flow-sh.config 

and the git-cola-flow.sh shell script in the path.

The problem, I have, is that if git-cola is called from a terminal, the prompt

from zenity is hidden behind the git-cola and appears when the terminal 

has the focus. Maybe a pyQt version can solve this problem, and be more

close to git-cola base. I am trying somthing, for the time being.

The commented part that deletes a flow, which I used to delete a flow 

that was accidentally created, during testing, can delete actually any 

branch. The deletion shold be allowed only if the flow has no commits.

Regards 

George

[Taylor Braun-Jones]

On Thursday, January 7, 2016 at 8:29:30 PM UTC-5, Famelis George wrote:

The problem, I have, is that if git-cola is called from a terminal, the prompt

from zenity is hidden behind the git-cola and appears when the terminal 

has the focus. Maybe a pyQt version can solve this problem, and be more

close to git-cola base.

David, et al - If this script was ported from bash+zenity to python+pyqt4, is it something that could ship with git-cola? If nothing else, it could be a contrib script with a README that tells what needs to be added to gitconfig.

Thanks for sharing, George!

Taylor