From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-5.4 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A8E1020A17 for ; Thu, 19 Jan 2017 20:32:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932106AbdASUcF (ORCPT ); Thu, 19 Jan 2017 15:32:05 -0500 Received: from mout.gmx.net ([212.227.15.18]:62140 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754320AbdASUal (ORCPT ); Thu, 19 Jan 2017 15:30:41 -0500 Received: from virtualbox ([37.24.141.236]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LaooK-1c6Dvm122i-00kPEM; Thu, 19 Jan 2017 21:30:34 +0100 Date: Thu, 19 Jan 2017 21:30:32 +0100 (CET) From: Johannes Schindelin X-X-Sender: virtualbox@virtualbox To: git@vger.kernel.org cc: Junio C Hamano , David Aguilar , Dennis Kaarsemaker , Paul Sbarra Subject: [PATCH v6 1/3] difftool: add a skeleton for the upcoming builtin In-Reply-To: Message-ID: <0f51573f770cbef32d71b188c3bb0b941529eaed.1484857756.git.johannes.schindelin@gmx.de> References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:bcNkXMp4mgitJB+r2T8A8tQSclX1XnrHWWGrVdMjfQ1GALpWG+a k2mFHcaJGmR+flwXhkuXuFDb4sacdR7sKThCkhzxBuKKK8ZH4UvWUB8e6MBN0Amn0vrYDIy 4d3w3kT4OD0AKI2xIwT375UOtlw+RvIjC1U33SAUAaCRosW3YsbksgtDE1XE/K9M1lRmZDg cKhN+888Sd5SRIyv5YdsA== X-UI-Out-Filterresults: notjunk:1;V01:K0:wicSNOkKSXg=:B9gID4kfWNt0GhxEhfMy72 bimUnhHNR6Uz0VxmkYD/zNBSZ+UjqWWVvdoBi9mu2CLYKiw7tkhi+El/5RRiZ1r27fieemXON 6MWXz5PUumDwCcNlqRnYBISbf2czPbYxI9x+HSI0uDObwgnDNVyar7Ss2l7lEGz+SNmSr/2ml cSkEXIvFsEZaFl2iYfEKKRPCItRWmdZoEcRkelFwPtBZo+Mbwvk+DngdY68nyzjl5gNT+xQm5 YRLD0fdfx9dobrxBNrBdEQIuyIJCy1BEt/aX3D+A0rXJsvI40c2aLZvx7S7YU4rDrCiScvI+C lEsMp1O5eWBJFVx9xmYXx2gETjVgTcqa/LPzAs5MfATEPgiGYiFGW3VlWyLn+oz5pWVsSNqzA p/PVyzhHNdkan2fxevxeKktH44trU/wulvsZafOA8238kKYxiR3gpDVpsx9zuknuSVheCKQW8 dPdGkT4GwCBzCu8nBVX7jHgACs/RmtaLIjIDsgb0dSpxtCqh0MeeFeZMJj+UjqGyOBS/XcFEs gXh2RAJy7JGEgeB9xDQWWwTNxoD7ctNTUaqGH9OCA3z74G34uf/nT5R8KKpTVEv5KAX1xenu3 k0b0Wcw0R70Po+mAoF+u1no0JGoMzhegcm1oSaMSBoQmjTuhvbSkfEGaLATC8/cEteVP7DTqa YH0uTfFYt4uqnlW41/auHXJUPAnlbgSpOV3fttOgJkHUEA9Yben0OCQuuqrV18MmuSkMzpiZQ pCB/TVH7fQ4JlDh5/38Tbe0vOwj4TVWll7Tb5CTmO+ZDYkUed9oZji//MCqiRQC/1RRfSTwEl /9tadwk Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This adds a builtin difftool that still falls back to the legacy Perl version, which has been renamed to `legacy-difftool`. The idea is that the new, experimental, builtin difftool immediately hands off to the legacy difftool for now, unless the config variable difftool.useBuiltin is set to true. This feature flag will be used in the upcoming Git for Windows v2.11.0 release, to allow early testers to opt-in to use the builtin difftool and flesh out any bugs. Signed-off-by: Johannes Schindelin --- .gitignore | 1 + Makefile | 3 +- builtin.h | 1 + builtin/difftool.c | 63 +++++++++++++++++++++++++++ git-difftool.perl => git-legacy-difftool.perl | 0 git.c | 6 +++ t/t7800-difftool.sh | 2 + 7 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 builtin/difftool.c rename git-difftool.perl => git-legacy-difftool.perl (100%) diff --git a/.gitignore b/.gitignore index 6722f78f9a..5555ae025b 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,7 @@ /git-init-db /git-interpret-trailers /git-instaweb +/git-legacy-difftool /git-log /git-ls-files /git-ls-remote diff --git a/Makefile b/Makefile index d861bd9985..8cf5bef034 100644 --- a/Makefile +++ b/Makefile @@ -522,7 +522,7 @@ SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n SCRIPT_PERL += git-add--interactive.perl -SCRIPT_PERL += git-difftool.perl +SCRIPT_PERL += git-legacy-difftool.perl SCRIPT_PERL += git-archimport.perl SCRIPT_PERL += git-cvsexportcommit.perl SCRIPT_PERL += git-cvsimport.perl @@ -883,6 +883,7 @@ BUILTIN_OBJS += builtin/diff-files.o BUILTIN_OBJS += builtin/diff-index.o BUILTIN_OBJS += builtin/diff-tree.o BUILTIN_OBJS += builtin/diff.o +BUILTIN_OBJS += builtin/difftool.o BUILTIN_OBJS += builtin/fast-export.o BUILTIN_OBJS += builtin/fetch-pack.o BUILTIN_OBJS += builtin/fetch.o diff --git a/builtin.h b/builtin.h index b9122bc5f4..67f80519da 100644 --- a/builtin.h +++ b/builtin.h @@ -60,6 +60,7 @@ extern int cmd_diff_files(int argc, const char **argv, const char *prefix); extern int cmd_diff_index(int argc, const char **argv, const char *prefix); extern int cmd_diff(int argc, const char **argv, const char *prefix); extern int cmd_diff_tree(int argc, const char **argv, const char *prefix); +extern int cmd_difftool(int argc, const char **argv, const char *prefix); extern int cmd_fast_export(int argc, const char **argv, const char *prefix); extern int cmd_fetch(int argc, const char **argv, const char *prefix); extern int cmd_fetch_pack(int argc, const char **argv, const char *prefix); diff --git a/builtin/difftool.c b/builtin/difftool.c new file mode 100644 index 0000000000..53870bbaf7 --- /dev/null +++ b/builtin/difftool.c @@ -0,0 +1,63 @@ +/* + * "git difftool" builtin command + * + * This is a wrapper around the GIT_EXTERNAL_DIFF-compatible + * git-difftool--helper script. + * + * This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git. + * The GIT_DIFF* variables are exported for use by git-difftool--helper. + * + * Any arguments that are unknown to this script are forwarded to 'git diff'. + * + * Copyright (C) 2016 Johannes Schindelin + */ +#include "builtin.h" +#include "run-command.h" +#include "exec_cmd.h" + +/* + * NEEDSWORK: this function can go once the legacy-difftool Perl script is + * retired. + * + * We intentionally avoid reading the config directly here, to avoid messing up + * the GIT_* environment variables when we need to fall back to exec()ing the + * Perl script. + */ +static int use_builtin_difftool(void) { + struct child_process cp = CHILD_PROCESS_INIT; + struct strbuf out = STRBUF_INIT; + int ret; + + argv_array_pushl(&cp.args, + "config", "--bool", "difftool.usebuiltin", NULL); + cp.git_cmd = 1; + if (capture_command(&cp, &out, 6)) + return 0; + strbuf_trim(&out); + ret = !strcmp("true", out.buf); + strbuf_release(&out); + return ret; +} + +int cmd_difftool(int argc, const char **argv, const char *prefix) +{ + /* + * NEEDSWORK: Once the builtin difftool has been tested enough + * and git-legacy-difftool.perl is retired to contrib/, this preamble + * can be removed. + */ + if (!use_builtin_difftool()) { + const char *path = mkpath("%s/git-legacy-difftool", + git_exec_path()); + + if (sane_execvp(path, (char **)argv) < 0) + die_errno("could not exec %s", path); + + return 0; + } + prefix = setup_git_directory(); + trace_repo_setup(prefix); + setup_work_tree(); + + die("TODO"); +} diff --git a/git-difftool.perl b/git-legacy-difftool.perl similarity index 100% rename from git-difftool.perl rename to git-legacy-difftool.perl diff --git a/git.c b/git.c index bbaa949e9c..c58181e5ef 100644 --- a/git.c +++ b/git.c @@ -424,6 +424,12 @@ static struct cmd_struct commands[] = { { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, { "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, + /* + * NEEDSWORK: Once the redirection to git-legacy-difftool.perl in + * builtin/difftool.c has been removed, this entry should be changed to + * RUN_SETUP | NEED_WORK_TREE + */ + { "difftool", cmd_difftool }, { "fast-export", cmd_fast_export, RUN_SETUP }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 99d4123461..e94910c563 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -23,6 +23,8 @@ prompt_given () test "$prompt" = "Launch 'test-tool' [Y/n]? branch" } +# NEEDSWORK: lose all the PERL prereqs once legacy-difftool is retired. + # Create a file on master and change it on branch test_expect_success PERL 'setup' ' echo master >file && -- 2.11.0.windows.3