Skip to content

nd/struct-pathspec v2

Nguyễn Thái Ngọc Duy git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 13 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21Add struct pathspeccache.h dir.c+42 -00 replies
2/21diff-no-index: use diff_tree_setup_paths()diff-no-index.c+5 -40 replies
3/21Convert struct diff_options to use struct pathspecbuiltin/diff-files.c builtin/diff.c builtin/log.c +5 more+22 -500 replies
4/21tree_entry_interesting(): remove dependency on struct diff_optionstree-diff.c+10 -160 replies
5/21Move tree_entry_interesting() to tree-walk.c and export ittree-diff.c tree-walk.c tree-walk.h+114 -1100 replies
6/21glossary: define pathspecDocumentation/glossary-content.txt+23 -00 replies
7/21diff-tree: convert base+baselen to writable strbuftree-diff.c tree-walk.c tree-walk.h+57 -690 replies
8/21tree_entry_interesting(): refactor into separate smaller functionstree-walk.c+93 -770 replies
9/21tree_entry_interesting(): support depth limitcache.h dir.c dir.h +2 more+38 -33 replies
10/21tree_entry_interesting(): fix depth limit with overlapping pathspecsdir.c tree-walk.c+14 -14 replies
11/21tree_entry_interesting(): support wildcard matchingcache.h dir.c t/t4010-diff-pathspec.sh +2 more+47 -44 replies
12/21tree_entry_interesting(): optimize wildcard matching when base is matchedt/t4010-diff-pathspec.sh tree-walk.c+32 -00 replies
13/21pathspec: add match_pathspec_depth()dir.c dir.h+92 -00 replies
14/21Convert ce_path_match() to use struct pathspecbuiltin/update-index.c cache.h diff-lib.c +4 more+31 -115 replies
14/21struct rev_info: convert prune_data to struct pathspecbuiltin/add.c builtin/diff.c builtin/fast-export.c +4 more+20 -230 replies
15/21Convert ce_path_match() to use match_pathspec_depth()read-cache.c+1 -230 replies
15/21Convert ce_path_match() to use struct pathspecbuiltin/update-index.c cache.h diff-lib.c +4 more+22 -110 replies
16/21grep: convert to use struct pathspecbuiltin/grep.c+16 -140 replies
17/21grep: use match_pathspec_depth() for cache/worktree greppingbuiltin/grep.c+1 -10 replies
18/21strbuf: allow "buf" to point to the middle of the allocated bufferstrbuf.c strbuf.h+32 -140 replies
19/21grep: use writable strbuf from caller in grep_tree()builtin/grep.c+25 -272 replies
19/21grep: use writable strbuf from caller for grep_tree()builtin/grep.c+24 -270 replies
20/21grep: drop pathspec_matches() in favor of tree_entry_interesting()builtin/grep.c+14 -1110 replies
20/21grep: drop pathspec_matches() in favor of tree_entry_interesting()builtin/grep.c tree-diff.c tree-walk.c +1 more+27 -1230 replies
21/21t7810: overlapping pathspecs and depth limitt/t7810-grep.sh+18 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/21] nd/struct-pathspec v2

Changes from previous version [1]

- fixes depth limit and overlapping pathspecs, by checking deepest pathspecs first. struct pathspec is now sorted (raw[] untouched)

- match_pathspec_depth depends on new match_pathspec_item() (a clone of match_one(), but takes advantage of struct pathspec)

- ce_path_match uses struct pathspec

- strbuf is used instead of fixed length "base" buffer. This introduces the weird strbuf_offset() function.

- never_interesting is disabled if any wildcards is present

- struct pathspec * == NULL is unacceptable, callers must pass non-NULL.

- a bit more tests

[1] http://mid.gmane.org/[email protected]

Jonathan Nieder (1):
glossary: define pathspec

Nguyễn Thái Ngọc Duy (20):
Add struct pathspec
diff-no-index: use diff_tree_setup_paths()
Convert struct diff_options to use struct pathspec tree_entry_interesting(): remove dependency on struct diff_options Move tree_entry_interesting() to tree-walk.c and export it
diff-tree: convert base+baselen to writable strbuf tree_entry_interesting(): refactor into separate smaller functions tree_entry_interesting(): support depth limit tree_entry_interesting(): fix depth limit with overlapping pathspecs tree_entry_interesting(): support wildcard matching tree_entry_interesting(): optimize wildcard matching when base is matched
pathspec: add match_pathspec_depth()
Convert ce_path_match() to use struct pathspec
Convert ce_path_match() to use match_pathspec_depth()
grep: convert to use struct pathspec
grep: use match_pathspec_depth() for cache/worktree grepping
strbuf: allow "buf" to point to the middle of the allocated buffer
grep: use writable strbuf from caller for grep_tree()
grep: drop pathspec_matches() in favor of tree_entry_interesting()
t7810: overlapping pathspecs and depth limit

 Documentation/glossary-content.txt |   23 +++
 builtin/diff-files.c               |    2 +-
 builtin/diff.c                     |    4 +-
 builtin/grep.c                     |  197 +++++++-------------------
 builtin/log.c                      |    2 +-
 builtin/update-index.c             |    8 +-
 cache.h                            |   17 ++-
 diff-lib.c                         |   12 ++-
 diff-no-index.c                    |   13 +-
 diff.h                             |    4 +-
 dir.c                              |  151 ++++++++++++++++++++
 dir.h                              |    4 +
 preload-index.c                    |    5 +-
 read-cache.c                       |   25 +---
 revision.c                         |   11 +-
 strbuf.c                           |   36 ++++--
 strbuf.h                           |   10 +-
 t/t4010-diff-pathspec.sh           |   32 ++++
 t/t7810-grep.sh                    |   18 +++
 tree-diff.c                        |  277 +++++++++---------------------------
 tree-walk.c                        |  180 +++++++++++++++++++++++
 tree-walk.h                        |    2 +
 wt-status.c                        |    5 +-
 23 files changed, 615 insertions(+), 423 deletions(-)
Signature · 1 line
1.7.3.3.476.g10a82