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 08/19] ls-files: support --max-depth Date: Sun, 30 Nov 2014 15:55:56 +0700 Message-ID: <1417337767-4505-9-git-send-email-pclouds@gmail.com> References: <1417337767-4505-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?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 Nov 30 09:57:31 2014 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 1Xv0Ju-0002tj-J4 for gcvg-git-2@plane.gmane.org; Sun, 30 Nov 2014 09:57:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbaK3I5Z convert rfc822-to-quoted-printable (ORCPT ); Sun, 30 Nov 2014 03:57:25 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:63065 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752039AbaK3I5W (ORCPT ); Sun, 30 Nov 2014 03:57:22 -0500 Received: by mail-pa0-f53.google.com with SMTP id kq14so9169966pab.40 for ; Sun, 30 Nov 2014 00:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=U+67aeCJGcnWVt9jp/s5/g015dZvLTkVNrjMssLi2QI=; b=fzP0SATB+1rmjFk4sW8WruVPctTSSBVhawy9l6jObOBoaVzC2czQxZHtQSpWQcwdzk PsNL27D5VqxC3WB4Fm4OKJFWFhJV2vyNfj3M+ExTsfFyRYiSmNQPeT3B0Ftp6O2utpXx eQc72nl8g2MlK3M8tjX+uXMBcWvNyRBOtoUe+YbRFZ8fG33PTiE7mdJHe+0lYPTPc4wo nL5jvM47XhjvTjb68OSOKMoTcRxI7maPRUJ3xGRytsj7+1UAv+x1C//2DCNW7Ooj0OWw 6bYHs3vBeeBfsQI18Vz/l+VSlEYtelKqAE6u6RxPtCVLGN/5mruL6s2iO0IpGIlKOYrK 0MBA== X-Received: by 10.68.139.68 with SMTP id qw4mr61692409pbb.164.1417337842273; Sun, 30 Nov 2014 00:57:22 -0800 (PST) Received: from lanh ([115.73.247.22]) by mx.google.com with ESMTPSA id ud7sm14345386pbc.11.2014.11.30.00.57.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2014 00:57:21 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sun, 30 Nov 2014 15:57:20 +0700 X-Mailer: git-send-email 2.2.0.60.gb7b3c64 In-Reply-To: <1417337767-4505-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 --- Documentation/git-ls-files.txt | 7 +++++++ builtin/ls-files.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-file= s.txt index 99328b9..3d921eb 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -160,6 +160,13 @@ a space) at the start of each line: for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively. =20 +--max-depth=3D:: + For each given on command line, descend at most + levels of directories. A negative value means no limit (default). + This option is ignored if contains active wildcards. + In other words if "a*" matches a directory named "a*", + "*" is matched literally so --max-depth is still effective. + \--:: Do not interpret any more arguments as options. =20 diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 79e1944..40fe0f2 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -503,6 +503,7 @@ static int option_parse_exclude_standard(const stru= ct option *opt, int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) { int require_work_tree =3D 0, show_tag =3D 0, i; + int max_depth =3D -1; const char *max_prefix; struct dir_struct dir; struct exclude_list *el; @@ -560,6 +561,9 @@ int cmd_ls_files(int argc, const char **argv, const= char *cmd_prefix) N_("pretend that paths removed since are still present")= ), OPT__COLOR(&use_color, N_("show color")), OPT_COLUMN(0, "column", &colopts, N_("show files in columns")), + { OPTION_INTEGER, 0, "max-depth", &max_depth, N_("depth"), + N_("descend at most levels"), PARSE_OPT_NONEG, + NULL, 1 }, OPT__ABBREV(&abbrev), OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")), OPT_END() @@ -624,8 +628,11 @@ int cmd_ls_files(int argc, const char **argv, cons= t char *cmd_prefix) =20 parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD | + (max_depth !=3D -1 ? PATHSPEC_MAXDEPTH_VALID : 0) | PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, prefix, argv); + pathspec.max_depth =3D max_depth; + pathspec.recursive =3D 1; =20 /* Find common prefix for all pathspec's */ max_prefix =3D common_prefix(&pathspec); --=20 2.2.0.60.gb7b3c64