From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 20/46] ls-files: convert to use parse_pathspec Date: Sun, 14 Jul 2013 15:35:43 +0700 Message-ID: <1373790969-13000-21-git-send-email-pclouds@gmail.com> References: <1373790969-13000-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jul 14 10:38:22 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UyHoz-0002GV-Pr for gcvg-git-2@plane.gmane.org; Sun, 14 Jul 2013 10:38:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752091Ab3GNIiS convert rfc822-to-quoted-printable (ORCPT ); Sun, 14 Jul 2013 04:38:18 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:55952 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751680Ab3GNIiR (ORCPT ); Sun, 14 Jul 2013 04:38:17 -0400 Received: by mail-pa0-f42.google.com with SMTP id rl6so10324950pac.15 for ; Sun, 14 Jul 2013 01:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=JVAtqnw9cPEXg1HlnZRRhx2+Jmt0fqH86uZCi3Ai+Xc=; b=zufvIJEKtTQqOqMf/HwUKkeUrz1B3Fjg9+D1JCHN0vdBBu3FkM2+Ckufg5dwUe6zpx vzkiYQ804OeR6hoXSuB94oBfDpjkoF9PUIIqmJQUDmwiiHNOBP5aBLN8b4voNcjB9lMT cWeaLixYOgCxVOK4TfA76I0Pj452X9inXiNKv+UqesETOzp1FAs6ZzuIPAu7vV2MBy/D 4JWEejI91wqrTqphrvyLhGKSEDAEjNZlOI+P0lgjjv2+b5ZMldC8OfUDMhAsDN+IRNN+ M9RjbZ2oKb0E4hmEN8YZxid2MolMklSQitRpEacM7kuyEgDj6lyb//wRW92rTle1hLiX q5+A== X-Received: by 10.66.178.174 with SMTP id cz14mr50685337pac.136.1373791096198; Sun, 14 Jul 2013 01:38:16 -0700 (PDT) Received: from lanh ([115.73.210.100]) by mx.google.com with ESMTPSA id om2sm54539787pbb.34.2013.07.14.01.38.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jul 2013 01:38:15 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sun, 14 Jul 2013 15:38:27 +0700 X-Mailer: git-send-email 1.8.2.83.gc99314b In-Reply-To: <1373790969-13000-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- builtin/ls-files.c | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 30357df..f1be425 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -31,7 +31,7 @@ static int debug_mode; static const char *prefix; static int max_prefix_len; static int prefix_len; -static const char **pathspec; +static struct pathspec pathspec; static int error_unmatch; static char *ps_matched; static const char *with_tree; @@ -60,7 +60,7 @@ static void show_dir_entry(const char *tag, struct di= r_entry *ent) if (len >=3D ent->len) die("git ls-files: internal error - directory entry not superset of = prefix"); =20 - if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched)) + if (!match_pathspec_depth(&pathspec, ent->name, ent->len, len, ps_mat= ched)) return; =20 fputs(tag, stdout); @@ -135,7 +135,7 @@ static void show_ce_entry(const char *tag, struct c= ache_entry *ce) if (len >=3D ce_namelen(ce)) die("git ls-files: internal error - cache entry not superset of pref= ix"); =20 - if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_match= ed)) + if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), len, p= s_matched)) return; =20 if (tag && *tag && show_valid_bit && @@ -191,7 +191,7 @@ static void show_ru_info(void) len =3D strlen(path); if (len < max_prefix_len) continue; /* outside of the prefix */ - if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched)= ) + if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_m= atched)) continue; /* uninterested */ for (i =3D 0; i < 3; i++) { if (!ui->mode[i]) @@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir) =20 /* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) { - fill_directory(dir, pathspec); + fill_directory(dir, pathspec.raw); if (show_others) show_other_files(dir); if (show_killed) @@ -284,21 +284,6 @@ static void prune_cache(const char *prefix) active_nr =3D last; } =20 -static void strip_trailing_slash_from_submodules(void) -{ - const char **p; - - for (p =3D pathspec; *p !=3D NULL; p++) { - int len =3D strlen(*p), pos; - - if (len < 1 || (*p)[len - 1] !=3D '/') - continue; - pos =3D cache_name_pos(*p, len - 1); - if (pos >=3D 0 && S_ISGITLINK(active_cache[pos]->ce_mode)) - *p =3D xstrndup(*p, len - 1); - } -} - /* * Read the tree specified with --with-tree option * (typically, HEAD) into stage #1 and then @@ -552,23 +537,18 @@ int cmd_ls_files(int argc, const char **argv, con= st char *cmd_prefix) if (require_work_tree && !is_inside_work_tree()) setup_work_tree(); =20 - pathspec =3D get_pathspec(prefix, argv); - - /* be nice with submodule paths ending in a slash */ - if (pathspec) - strip_trailing_slash_from_submodules(); + parse_pathspec(&pathspec, 0, + PATHSPEC_PREFER_CWD | + PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, + prefix, argv); =20 /* Find common prefix for all pathspec's */ - max_prefix =3D common_prefix(pathspec); + max_prefix =3D common_prefix(pathspec.raw); max_prefix_len =3D max_prefix ? strlen(max_prefix) : 0; =20 /* Treat unmatching pathspec elements as errors */ - if (pathspec && error_unmatch) { - int num; - for (num =3D 0; pathspec[num]; num++) - ; - ps_matched =3D xcalloc(1, num); - } + if (pathspec.nr && error_unmatch) + ps_matched =3D xcalloc(1, pathspec.nr); =20 if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) die("ls-files --ignored needs some exclude pattern"); @@ -595,7 +575,7 @@ int cmd_ls_files(int argc, const char **argv, const= char *cmd_prefix) =20 if (ps_matched) { int bad; - bad =3D report_path_error(ps_matched, pathspec, prefix); + bad =3D report_path_error(ps_matched, pathspec.raw, prefix); if (bad) fprintf(stderr, "Did you forget to 'git add'?\n"); =20 --=20 1.8.2.83.gc99314b