{"thread":{"id":"22720","subject":"Add new option in the right click menu in git gui","startedAt":"2010-02-18T23:11:57Z","lastAt":"2010-03-26T13:53:49Z","messageCount":5,"participants":["Sylvain Rabot","Heiko Voigt","Bert Wesarg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"135022","messageId":"7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com","threadId":"22720","inReplyTo":null,"subject":"Add new option in the right click menu in git gui","fromName":"Sylvain Rabot","fromEmail":"sylvain@abstraction.fr","sentAt":"2010-02-18T23:11:57Z","receivedAt":"2010-02-18T23:11:57Z","isPatch":false,"sender":{"key":"sylvain@abstraction.fr","avatar":"https://avatars.githubusercontent.com/u/153052?v=4"},"body":"Hi,\n\nIn case of conflicts it is possible in git gui, through the right\nclick menu, to use local or remote versions, but, unless I missed\nsomething, it is not possible, after using the merge tool, to add\nmerged files to the index.\n\nIt would be nice if we could add merged files in the index directly in git gui.\n\nBesides, having this third option will avoid the mistake I used to\nmake when I was a git beginner, knowing, after using the merge tools I\nwas using the \"use local version\" options thinking it will add to the\nindex the local changes I just made to the conflicted file.\n\nRegards.\n\n-- \nSylvain\n"},{"id":"135958","messageId":"20100301171222.GA35830@book.hvoigt.net","threadId":"22720","inReplyTo":"7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com","subject":"Re: Add new option in the right click menu in git gui","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2010-03-01T17:12:29Z","receivedAt":"2010-03-01T17:12:29Z","isPatch":false,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote:\n> Hi,\n> \n> In case of conflicts it is possible in git gui, through the right\n> click menu, to use local or remote versions, but, unless I missed\n> something, it is not possible, after using the merge tool, to add\n> merged files to the index.\n> \n> It would be nice if we could add merged files in the index directly in git gui.\n\nI do not see anything missing. After resolving a conflict you usually\njust need to add the files (in git gui click on the icon of the file).\nAm I missing something? This is the usual conflict resolution workflow\nfor git, I see no need for an extra menu option.\n\ncheers Heiko\n"},{"id":"135977","messageId":"1267478971.4400.5.camel@kheops","threadId":"22720","inReplyTo":"20100301171222.GA35830@book.hvoigt.net","subject":"Re: Add new option in the right click menu in git gui","fromName":"Sylvain Rabot","fromEmail":"sylvain@abstraction.fr","sentAt":"2010-03-01T21:29:31Z","receivedAt":"2010-03-01T21:29:31Z","isPatch":false,"sender":{"key":"sylvain@abstraction.fr","avatar":"https://avatars.githubusercontent.com/u/153052?v=4"},"body":"On Mon, 2010-03-01 at 18:12 +0100, Heiko Voigt wrote:\n> On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote:\n> > Hi,\n> > \n> > In case of conflicts it is possible in git gui, through the right\n> > click menu, to use local or remote versions, but, unless I missed\n> > something, it is not possible, after using the merge tool, to add\n> > merged files to the index.\n> > \n> > It would be nice if we could add merged files in the index directly in git gui.\n> \n> I do not see anything missing. After resolving a conflict you usually\n> just need to add the files (in git gui click on the icon of the file).\n> Am I missing something? This is the usual conflict resolution workflow\n> for git, I see no need for an extra menu option.\n> \n> cheers Heiko\n\nHaaaaaaa, I don't know how many times I tried to do a right click on the\npath itself but I never had the idea to click the icon :P\n\nThanks.\n\n-- \nSylvain Rabot <sylvain@abstraction.fr>\n"},{"id":"135979","messageId":"36ca99e91003011345n43aad0c5m5c02eaf692d54efd@mail.gmail.com","threadId":"22720","inReplyTo":"1267478971.4400.5.camel@kheops","subject":"Re: Add new option in the right click menu in git gui","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-03-01T21:45:10Z","receivedAt":"2010-03-01T21:45:10Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Mon, Mar 1, 2010 at 22:29, Sylvain Rabot <sylvain@abstraction.fr> wrote:\n> On Mon, 2010-03-01 at 18:12 +0100, Heiko Voigt wrote:\n>> On Fri, Feb 19, 2010 at 12:11:57AM +0100, Sylvain Rabot wrote:\n>> > Hi,\n>> >\n>> > In case of conflicts it is possible in git gui, through the right\n>> > click menu, to use local or remote versions, but, unless I missed\n>> > something, it is not possible, after using the merge tool, to add\n>> > merged files to the index.\n>> >\n>> > It would be nice if we could add merged files in the index directly in git gui.\n>>\n>> I do not see anything missing. After resolving a conflict you usually\n>> just need to add the files (in git gui click on the icon of the file).\n>> Am I missing something? This is the usual conflict resolution workflow\n>> for git, I see no need for an extra menu option.\n>>\n>> cheers Heiko\n>\n> Haaaaaaa, I don't know how many times I tried to do a right click on the\n> path itself but I never had the idea to click the icon :P\n\nActually, I would like to be able to have a right click menu for the\npath too and have access to the guitool entries in the Tools menu\nwhich require a path (ie. needsfile=true). That would reduce by mouse\nmovements drastically.\n\nI have looked into this issue by myself, but I'm not that familiar with tcl/tk.\n\nBert\n"},{"id":"137846","messageId":"20100326135346.GB22339@book.hvoigt.net","threadId":"22720","inReplyTo":"36ca99e91003011345n43aad0c5m5c02eaf692d54efd@mail.gmail.com","subject":"Re: Re: Add new option in the right click menu in git gui","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2010-03-26T13:53:49Z","receivedAt":"2010-03-26T13:53:49Z","isPatch":false,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"Hi,\n\nthis email has been lying in my mailbox for while ...\n\nOn Mon, Mar 01, 2010 at 10:45:10PM +0100, Bert Wesarg wrote:\n> Actually, I would like to be able to have a right click menu for the\n> path too and have access to the guitool entries in the Tools menu\n> which require a path (ie. needsfile=true). That would reduce by mouse\n> movements drastically.\n> \n> I have looked into this issue by myself, but I'm not that familiar with tcl/tk.\n\nJust try it. The \"Tcl Introduction\" sample chapter from this book[1]\nexplains the tcl language in 17 pages quite nicely.\n\nI thought of this myself but never had the time to do it. If you are\nstill interested in implementing it take a look at the 'bind' command.\nIt lets you bind procedures to events that occur on widgets or the\napplication. For the diff view this is done in git-gui.sh on around line\n3465 with this command:\n\n  bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]\n\nbind_button3 is just a wrapper so bind is platform independent. So you\nprobably want to implement a method similar to popup_diff_menu which\npopups the right menu for the selected file.\n\nBTW, the widgets for the files are of the same type (text) as $ui_diff\nand are stored in the variables: $ui_index and $ui_workdir for the index\nand working directory respectively.\n\nHope that helps.\n\ncheers Heiko\n\n[1] http://www.beedub.com/book/\n"}]}