From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl =?utf-8?q?Hasselstr=C3=B6m?= Subject: [PATCH v3 3/4] Teach git diff-tree --stdin to diff trees Date: Sun, 10 Aug 2008 18:12:58 +0200 Message-ID: <20080810161258.7116.33770.stgit@yoghurt> References: <20080810161035.7116.2171.stgit@yoghurt> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Aug 10 18:17:26 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KSDbd-0005ov-7r for gcvg-git-2@gmane.org; Sun, 10 Aug 2008 18:17:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643AbYHJQQT convert rfc822-to-quoted-printable (ORCPT ); Sun, 10 Aug 2008 12:16:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752634AbYHJQQT (ORCPT ); Sun, 10 Aug 2008 12:16:19 -0400 Received: from diana.vm.bytemark.co.uk ([80.68.90.142]:3177 "EHLO diana.vm.bytemark.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752024AbYHJQQS (ORCPT ); Sun, 10 Aug 2008 12:16:18 -0400 Received: from localhost ([127.0.0.1] helo=[127.0.1.1]) by diana.vm.bytemark.co.uk with esmtp (Exim 3.36 #1 (Debian)) id 1KSDsw-0008Kz-00; Sun, 10 Aug 2008 17:35:14 +0100 In-Reply-To: <20080810161035.7116.2171.stgit@yoghurt> User-Agent: StGIT/0.14.3.223.g12ca.dirty Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When feeding trees on the command line, you can give exactly two trees, not three nor one; --stdin now supports this "two tree" form on its input, in addition to accepting lines with one or more commits. When diffing trees (either specified on the command line or from the standard input), the -s, -v, --pretty, --abbrev-commit, --encoding, --no-commit-id, and --always options are ignored, since they do not apply to trees; and the -m, -c, and --cc options are ignored since they would require three trees, which is not supported (yet). Signed-off-by: Karl Hasselstr=C3=B6m --- Documentation/git-diff-tree.txt | 15 ++++++++++----- builtin-diff-tree.c | 33 +++++++++++++++++++++++++++++--= -- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-t= ree.txt index 1f4b91e..5d48664 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -49,17 +49,22 @@ include::diff-options.txt[] --stdin:: When '--stdin' is specified, the command does not take arguments from the command line. Instead, it - reads either one or a list of - separated with a single space from its standard input. + reads lines containing either two , one , or a + list of from its standard input. (Use a single space + as separator.) + +When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit. + -The ID of the first (or only) commit, followed by a newline, is -printed before the differences. +When comparing two trees, the ID of both trees (separated by a space +and terminated by a newline) is printed before the difference. When +comparing commits, the ID of the first (or only) commit, followed by a +newline, is printed. + -The following flags further affects its behavior. +The following flags further affects the behavior when comparing +commits (but not trees). =20 -m:: By default, 'git-diff-tree --stdin' does not show diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index ebbd631..5a56178 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -42,21 +42,46 @@ static int stdin_diff_commit(struct commit *commit,= char *line, int len) return log_tree_commit(&log_tree_opt, commit); } =20 +/* Diff two trees. */ +static int stdin_diff_trees(struct tree *tree1, char *line, int len) +{ + unsigned char sha1[20]; + struct tree *tree2; + if (len !=3D 82 || !isspace(line[40]) || get_sha1_hex(line + 41, sha1= )) + return error("Need precisely two trees, separated by a space"); + tree2 =3D lookup_tree(sha1); + if (!tree2 || parse_tree(tree2)) + return -1; + printf("%s %s\n", sha1_to_hex(tree1->object.sha1), + sha1_to_hex(tree2->object.sha1)); + diff_tree_sha1(tree1->object.sha1, tree2->object.sha1, + "", &log_tree_opt.diffopt); + log_tree_diff_flush(&log_tree_opt); + return 0; +} + static int diff_tree_stdin(char *line) { int len =3D strlen(line); unsigned char sha1[20]; - struct commit *commit; + struct object *obj; =20 if (!len || line[len-1] !=3D '\n') return -1; line[len-1] =3D 0; if (get_sha1_hex(line, sha1)) return -1; - commit =3D lookup_commit(sha1); - if (!commit || parse_commit(commit)) + obj =3D lookup_object(sha1); + obj =3D obj ? obj : parse_object(sha1); + if (!obj) return -1; - return stdin_diff_commit(commit, line, len); + if (obj->type =3D=3D OBJ_COMMIT) + return stdin_diff_commit((struct commit *)obj, line, len); + if (obj->type =3D=3D OBJ_TREE) + return stdin_diff_trees((struct tree *)obj, line, len); + error("Object %s is a %s, not a commit or tree", + sha1_to_hex(sha1), typename(obj->type)); + return -1; } =20 static const char diff_tree_usage[] =3D