Re: git-{diff,merge} refactor round 2
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 5, 2009, 09:45 UTC
- Message-ID
- <7vzlevv3fy.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <20090405033443.GA16219@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 22 quoted lines
> On 0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
>> David Aguilar, 01.04.2009:
>> > Here's the 2nd round of refactoring.
>>
>> I just noticed that mergetool.<mergetool>.path doesn't work anymore.
>> git grep mergetool.*path only hits one line in git-difftool--helper.sh
>> Neither does it seem to work with difftool, but I'm gonna go to bed now.
>>
>> Markus
>>
>
> Oops. Well, I have one final patch that removes the last bit of
> redundant code. It also fixed this problem so I'll go ahead
> and send it (it's based on top of da/difftool mentioned in
> pu).
>
> Since the test cases didn't catch that breakage I added a test
> for it.
>
> Look for a patch called:
>
> mergetool--lib: consolidate the last redundant bits in {diff,merge}toolI'll try to queue all the outstanding da/difftool patches tonight, but I think the patches in the series are getting to the point of needing a fresh redoing. Patches like "oops, these non-user scripts should have been named with double-dash" can and should disappear.
Currently they are:
$ git log --oneline next..da/difftool 736e6b6 mergetool--lib: add new merge tool TortoiseMerge b3ef7cc mergetool--lib: make (g)vimdiff workable under Windows c4d690e mergetool--lib: consolidate the last redundant bits in {diff,merge}tool def88c8 mergetool-lib: specialize opendiff options when in diff mode bd52fab mergetool-lib: refactor run_mergetool and check_unchanged e87266c bash completion: add git-difftool 04c3b54 {diff,merge}tool: rename helpers to remove them from tab-completion 2a83022 mergetool-lib: add diffuse as merge and diff tool 73c59d9 mergetool-lib: specialize xxdiff options when in diff mode 273e7a2 mergetool-lib: specialize kdiff3 options when in diff mode 99511d8 mergetool: use run_mergetool from git-mergetool-lib 37c48c7 difftool: use run_mergetool from git-mergetool-lib 4e314b5 mergetool-lib: introduce run_mergetool 588954e difftool: use valid_tool from git-mergetool-lib 8af4556 mergetool: use valid_tool from git-mergetool-lib 72286b5 difftool: use get_mergetool_path from git-mergetool-lib d03b97f mergetool: use get_mergetool_path from git-mergetool-lib c6afc72 Add a mergetool-lib scriptlet for holding common merge tool functions 6108b75 mergetool: use $( ... ) instead of `backticks` 73786e2 difftool: add support for a difftool.prompt config variable 472ff62 difftool: add a -y shortcut for --no-prompt de2b85d difftool: use perl built-ins when testing for msys 9df990e difftool: add various git-difftool tests 8ac77f2 difftool: add git-difftool to the list of commands