{"thread":{"id":"32713","subject":"[PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool","startedAt":"2013-01-24T07:16:06Z","lastAt":"2013-01-25T08:44:40Z","messageCount":5,"participants":["Alexey Shumkin","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"207670","messageId":"1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com","threadId":"32713","inReplyTo":null,"subject":"[PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool","fromName":"Alexey Shumkin","fromEmail":"alex.crezoff@gmail.com","sentAt":"2013-01-24T07:16:06Z","receivedAt":"2013-01-24T07:16:06Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"Options are taken from <Git source>/mergetools/vim\n\nSigned-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>\n---\n git-gui/lib/mergetool.tcl | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex 3c8e73b..4fc1cab 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {\n \t\t}\n \t}\n \tgvimdiff {\n-\t\tset cmdline [list \"$merge_tool_path\" -f \"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n+\t\tif {$base_stage ne {}} {\n+\t\t\tset cmdline [list \"$merge_tool_path\" -f -d -c \"wincmd J\" \\\n+\t\t\t\t\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"]\n+\t\t} else {\n+\t\t\tset cmdline [list \"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n+\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n+\t\t}\n \t}\n \tkdiff3 {\n \t\tif {$base_stage ne {}} {\n-- \n1.8.1.1.10.g9255f3f\n"},{"id":"207671","messageId":"1359011768-7665-2-git-send-email-Alex.Crezoff@gmail.com","threadId":"32713","inReplyTo":"1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com","subject":"[PATCH 2/3] mergetool--lib: Add diffuse as a tool","fromName":"Alexey Shumkin","fromEmail":"alex.crezoff@gmail.com","sentAt":"2013-01-24T07:16:07Z","receivedAt":"2013-01-24T07:16:07Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>\n---\n git-gui/lib/mergetool.tcl | 9 +++++++++\n 1 file changed, 9 insertions(+)\n\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex 4fc1cab..837ce17 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -194,6 +194,15 @@ proc merge_resolve_tool2 {} {\n \t\t\tset cmdline [list \"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" -mergeoutput=\"$MERGED\"]\n \t\t}\n \t}\n+\tdiffuse {\n+\t\tif {$base_stage ne {}} {\n+\t\t\tset cmdline [list \"$merge_tool_path\" \\\n+\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\" \"$BASE\"]\n+\t\t} else {\n+\t\t\tset cmdline [list \"$merge_tool_path\" \\\n+\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n+\t\t}\n+\t}\n \tecmerge {\n \t\tif {$base_stage ne {}} {\n \t\t\tset cmdline [list \"$merge_tool_path\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" --default --mode=merge3 --to=\"$MERGED\"]\n-- \n1.8.1.1.10.g9255f3f\n"},{"id":"207672","messageId":"1359011768-7665-3-git-send-email-Alex.Crezoff@gmail.com","threadId":"32713","inReplyTo":"1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com","subject":"[PATCH 3/3] mergetool--lib: Add TortoiseMerge as a tool","fromName":"Alexey Shumkin","fromEmail":"alex.crezoff@gmail.com","sentAt":"2013-01-24T07:16:08Z","receivedAt":"2013-01-24T07:16:08Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"Also added Russian translation of the added error message\n\"%s cannot be used without a base\"\n\nSigned-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>\n---\n git-gui/lib/mergetool.tcl | 10 ++++++++++\n git-gui/po/ru.po          |  4 ++++\n 2 files changed, 14 insertions(+)\n\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex 837ce17..d978770 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -257,6 +257,16 @@ proc merge_resolve_tool2 {} {\n \t\t\tset cmdline [list \"$merge_tool_path\" -o \"$MERGED\" \"$LOCAL\" \"$REMOTE\"]\n \t\t}\n \t}\n+\ttortoisemerge {\n+\t\tif {$base_stage ne {}} {\n+\t\t\tset cmdline [list \"$merge_tool_path\" \\\n+\t\t\t\t-base:$BASE -mine:$LOCAL \\\n+\t\t\t\t-theirs:$REMOTE -merged:$MERGED]\n+\t\t} else {\n+\t\t\terror_popup [mc \"%s cannot be used without a base\" \"TortoiseMerge\"]\n+\t\t\treturn\n+\t\t}\n+\t}\n \tvimdiff {\n \t\terror_popup [mc \"Not a GUI merge tool: '%s'\" $tool]\n \t\treturn\ndiff --git a/git-gui/po/ru.po b/git-gui/po/ru.po\nindex ca4343b..e9ef810 100644\n--- a/git-gui/po/ru.po\n+++ b/git-gui/po/ru.po\n@@ -1948,6 +1948,10 @@ msgstr \"Конфликтующий файл не существует\"\n msgid \"Not a GUI merge tool: '%s'\"\n msgstr \"'%s' не является программой слияния\"\n \n+#: lib/mergetool.tcl:280\n+msgid \"%s cannot be used without a base\"\n+msgstr \"%s не может использоваться без базовой версии\"\n+\n #: lib/mergetool.tcl:268\n #, tcl-format\n msgid \"Unsupported merge tool '%s'\"\n-- \n1.8.1.1.10.g9255f3f\n"},{"id":"207761","messageId":"CAJDDKr4Zi-pVVtX4LxRv9K7ocjdpLS_5NH5P_wrx0+ZRSwmfFA@mail.gmail.com","threadId":"32713","inReplyTo":"1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com","subject":"Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2013-01-25T05:07:10Z","receivedAt":"2013-01-25T05:07:10Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin <alex.crezoff@gmail.com> wrote:\n> Options are taken from <Git source>/mergetools/vim\n>\n> Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>\n> ---\n>  git-gui/lib/mergetool.tcl | 8 +++++++-\n>  1 file changed, 7 insertions(+), 1 deletion(-)\n\nA better long-term solution might be to teach git gui to use \"git difftool\".\n\nWould it be better to teach git-gui (and gitk) about mergetool/difftool?\nThat would allow us to possibly eliminate this duplication.\n\nWe did start towards that path when difftool learned the --extcmd\noption (for use by gitk) but I have not followed through.\n\nWhat do you think about trying that approach?\n\n\n> diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\n> index 3c8e73b..4fc1cab 100644\n> --- a/git-gui/lib/mergetool.tcl\n> +++ b/git-gui/lib/mergetool.tcl\n> @@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {\n>                 }\n>         }\n>         gvimdiff {\n> -               set cmdline [list \"$merge_tool_path\" -f \"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n> +               if {$base_stage ne {}} {\n> +                       set cmdline [list \"$merge_tool_path\" -f -d -c \"wincmd J\" \\\n> +                               \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"]\n> +               } else {\n> +                       set cmdline [list \"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n> +                               \"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n> +               }\n>         }\n>         kdiff3 {\n>                 if {$base_stage ne {}} {\n> --\n> 1.8.1.1.10.g9255f3f\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n\n\n\n-- \nDavid\n"},{"id":"207772","messageId":"20130125124440.40fc60e0@ashu.dyn1.rarus.ru","threadId":"32713","inReplyTo":"CAJDDKr4Zi-pVVtX4LxRv9K7ocjdpLS_5NH5P_wrx0+ZRSwmfFA@mail.gmail.com","subject":"Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool","fromName":"Alexey Shumkin","fromEmail":"alex.crezoff@gmail.com","sentAt":"2013-01-25T08:44:40Z","receivedAt":"2013-01-25T08:44:40Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"Maybe, some time ;)\nActually, I'm not TCL-programmer. With one of these patches I just have\nsolved one my problem (to run tortoisemerge with git-gui) when I\nwas showing to my collegue how to work with Git, and on the side I\nfixed another two bugs. So, I decided to sumbit these patches, to avoid\napplying them every time after each Git update as I did last 1.5 years\nwith other patches which still are not submitted, because I'm too lazy\nto follow Git development workflow in my free time )\n\n> On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin\n> <alex.crezoff@gmail.com> wrote:\n> > Options are taken from <Git source>/mergetools/vim\n> >\n> > Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>\n> > ---\n> >  git-gui/lib/mergetool.tcl | 8 +++++++-\n> >  1 file changed, 7 insertions(+), 1 deletion(-)\n> \n> A better long-term solution might be to teach git gui to use \"git\n> difftool\".\n> \n> Would it be better to teach git-gui (and gitk) about\n> mergetool/difftool? That would allow us to possibly eliminate this\n> duplication.\n> \n> We did start towards that path when difftool learned the --extcmd\n> option (for use by gitk) but I have not followed through.\n> \n> What do you think about trying that approach?\n> \n> \n> > diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\n> > index 3c8e73b..4fc1cab 100644\n> > --- a/git-gui/lib/mergetool.tcl\n> > +++ b/git-gui/lib/mergetool.tcl\n> > @@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {\n> >                 }\n> >         }\n> >         gvimdiff {\n> > -               set cmdline [list \"$merge_tool_path\" -f \"$LOCAL\"\n> > \"$MERGED\" \"$REMOTE\"]\n> > +               if {$base_stage ne {}} {\n> > +                       set cmdline [list \"$merge_tool_path\" -f -d\n> > -c \"wincmd J\" \\\n> > +                               \"$MERGED\" \"$LOCAL\" \"$BASE\"\n> > \"$REMOTE\"]\n> > +               } else {\n> > +                       set cmdline [list \"$merge_tool_path\" -f -d\n> > -c \"wincmd l\" \\\n> > +                               \"$LOCAL\" \"$MERGED\" \"$REMOTE\"]\n> > +               }\n> >         }\n> >         kdiff3 {\n> >                 if {$base_stage ne {}} {\n> > --\n> > 1.8.1.1.10.g9255f3f\n> >\n> > --\n> > To unsubscribe from this list: send the line \"unsubscribe git\" in\n> > the body of a message to majordomo@vger.kernel.org\n> > More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n> \n> \n"}]}