From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcus Comstedt Subject: [PATCH] convert: fix normalization of foreign idents Date: Mon, 23 Aug 2010 23:30:32 +0200 Message-ID: <1282599032-11369-2-git-send-email-marcus@mc.pp.se> References: <1282599032-11369-1-git-send-email-marcus@mc.pp.se> Cc: gitster@pobox.com, Marcus Comstedt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Aug 23 23:30:50 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OnebR-0003lD-VH for gcvg-git-2@lo.gmane.org; Mon, 23 Aug 2010 23:30:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754758Ab0HWVao (ORCPT ); Mon, 23 Aug 2010 17:30:44 -0400 Received: from ua-85-227-1-6.cust.bredbandsbolaget.se ([85.227.1.6]:58755 "EHLO bahamut.mc.pp.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754670Ab0HWVam (ORCPT ); Mon, 23 Aug 2010 17:30:42 -0400 Received: from chiyo.mc.pp.se (chiyo [192.168.42.32]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by bahamut.mc.pp.se (Postfix) with ESMTPS id E45E3F82B; Mon, 23 Aug 2010 23:30:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mc.pp.se; s=hedgehog; t=1282599040; bh=BUwIT6znS4YW6aIG7F0VFpIfnxmIIw8SPtFWEGKkcr4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=lidE MAGG3RwdVj3EeDaP1MY1KBROZfufktvNfV2ebRqOFnWr3MQHJeOVGX8gXnJSMIuo66h JEneodSzyBo8GNPmq2SUX2R5KMc0LYT3eJPzPvxCuVb/jU6KDdqTdyKzS/6J+ZwHFSZ OLZ4jDyUbnBlqseWG/uxy5TZkHkw4U/lA= Received: from marcus by chiyo.mc.pp.se with local (Exim 4.71) (envelope-from ) id 1OnebI-0002y6-Nm; Mon, 23 Aug 2010 23:30:40 +0200 X-Mailer: git-send-email 1.7.2 In-Reply-To: <1282599032-11369-1-git-send-email-marcus@mc.pp.se> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Since ident_to_worktree() does not touch $Id$ tags which contain foreign expansions in the repository, make sure that ident_to_git() does not either. This fixes the problem that such files show spurious modification upon checkout. There is however one case where we want ident_to_git() to normalize the tag to $Id$ despite the asymmetry: When committing a modification to a file which has a foreign ident, the foreign ident should be replaced with a regular git ident. Thus, add a new parameter to convert_to_git() that indicates if we want the foreign idents normalized after all. Signed-off-by: Marcus Comstedt --- builtin/apply.c | 2 +- builtin/blame.c | 2 +- cache.h | 3 ++- combine-diff.c | 2 +- convert.c | 21 +++++++++++++++++---- diff.c | 2 +- sha1_file.c | 3 ++- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index f38c1f7..7e503f4 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1759,7 +1759,7 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf) case S_IFREG: if (strbuf_read_file(buf, path, st->st_size) != st->st_size) return error("unable to open or read %s", path); - convert_to_git(path, buf->buf, buf->len, buf, 0); + convert_to_git(path, buf->buf, buf->len, buf, 0, 0); return 0; default: return -1; diff --git a/builtin/blame.c b/builtin/blame.c index 437b1a4..83c6561 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2095,7 +2095,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); } - convert_to_git(path, buf.buf, buf.len, &buf, 0); + convert_to_git(path, buf.buf, buf.len, &buf, 0, 0); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1); diff --git a/cache.h b/cache.h index eb77e1d..b98042f 100644 --- a/cache.h +++ b/cache.h @@ -1055,7 +1055,8 @@ extern void trace_argv_printf(const char **argv, const char *format, ...); /* convert.c */ /* returns 1 if *dst was used */ extern int convert_to_git(const char *path, const char *src, size_t len, - struct strbuf *dst, enum safe_crlf checksafe); + struct strbuf *dst, enum safe_crlf checksafe, + int normalize_foreign_ident); extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst); /* add */ diff --git a/combine-diff.c b/combine-diff.c index 655fa89..e81aa7d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -758,7 +758,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, if (is_file) { struct strbuf buf = STRBUF_INIT; - if (convert_to_git(elem->path, result, len, &buf, safe_crlf)) { + if (convert_to_git(elem->path, result, len, &buf, safe_crlf, 0)) { free(result); result = strbuf_detach(&buf, &len); result_size = len; diff --git a/convert.c b/convert.c index e41a31e..00d0612 100644 --- a/convert.c +++ b/convert.c @@ -519,9 +519,10 @@ static int count_ident(const char *cp, unsigned long size) } static int ident_to_git(const char *path, const char *src, size_t len, - struct strbuf *buf, int ident) + struct strbuf *buf, int ident, + int normalize_foreign_ident) { - char *dst, *dollar; + char *dst, *dollar, *spc; if (!ident || !count_ident(src, len)) return 0; @@ -548,6 +549,16 @@ static int ident_to_git(const char *path, const char *src, size_t len, continue; } + spc = memchr(src + 4, ' ', dollar - src - 4); + if (spc && spc < dollar-1 && + !normalize_foreign_ident) { + /* There are spaces in unexpected places. + * This is probably an id from some other + * versioning system. Keep it for now. + */ + continue; + } + memcpy(dst, "Id$", 3); dst += 3; len -= dollar + 1 - src; @@ -704,7 +715,8 @@ enum action determine_action(enum action text_attr, enum eol eol_attr) { } int convert_to_git(const char *path, const char *src, size_t len, - struct strbuf *dst, enum safe_crlf checksafe) + struct strbuf *dst, enum safe_crlf checksafe, + int normalize_foreign_ident) { struct git_attr_check check[5]; enum action action = CRLF_GUESS; @@ -736,7 +748,8 @@ int convert_to_git(const char *path, const char *src, size_t len, src = dst->buf; len = dst->len; } - return ret | ident_to_git(path, src, len, dst, ident); + return ret | ident_to_git(path, src, len, dst, ident, + normalize_foreign_ident); } int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst) diff --git a/diff.c b/diff.c index 6fb97d4..c5be513 100644 --- a/diff.c +++ b/diff.c @@ -2372,7 +2372,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only) /* * Convert from working tree format to canonical git format */ - if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) { + if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf, 0)) { size_t size = 0; munmap(s->data, s->size); s->should_munmap = 0; diff --git a/sha1_file.c b/sha1_file.c index 0cd9435..37e8657 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2434,7 +2434,8 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size, if ((type == OBJ_BLOB) && path) { struct strbuf nbuf = STRBUF_INIT; if (convert_to_git(path, buf, size, &nbuf, - write_object ? safe_crlf : 0)) { + write_object ? safe_crlf : 0, + write_object)) { buf = strbuf_detach(&nbuf, &size); re_allocated = 1; } -- 1.7.2