Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
builtin/list-files.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 66 insertions(+), 5 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index a82410d..74836f6 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -17,8 +17,10 @@ static int max_depth;
static int show_dirs;
static int use_color = -1;
static int show_indicator;
-static int show_cached, show_untracked, show_unmerged;
+static int show_cached, show_untracked, show_unmerged, show_changed;
static int show_ignored;
+static int show_added, show_deleted, show_modified;
+static int show_wt_added, show_wt_deleted, show_wt_modified;
static const char * const ls_usage[] = {
N_("git list-files [options] [<pathspec>...]"),
@@ -35,6 +37,18 @@ struct option ls_options[] = {
N_("show ignored files")),
OPT_BOOL('u', "unmerged", &show_unmerged,
N_("show unmerged files")),
+ OPT_BOOL('a', "added", &show_added,
+ N_("show added files compared to HEAD")),
+ OPT_BOOL('d', "deleted", &show_deleted,
+ N_("show deleted files compared to HEAD")),
+ OPT_BOOL('m', "modified", &show_modified,
+ N_("show modified files compared to HEAD")),
+ OPT_BOOL('A', "wt-added", &show_wt_added,
+ N_("show added files in worktree")),
+ OPT_BOOL('D', "wt-deleted", &show_wt_deleted,
+ N_("show deleted files in worktree")),
+ OPT_BOOL('M', "wt-modified", &show_wt_modified,
+ N_("show modified files on worktree")),
OPT_GROUP(N_("Other")),
OPT_COLUMN('C', "column", &colopts, N_("show files in columns")),
@@ -221,12 +235,52 @@ static void populate_unmerged(struct string_list *result,
}
}
+static void populate_changed(struct string_list *result,
+ const struct string_list *change)
+{
+ int i;
+
+ for (i = 0; i < change->nr; i++) {
+ const struct string_list_item *item = change->items + i;
+ struct wt_status_change_data *d = item->util;
+ const char *name = item->string;
+ struct stat st;
+ char tag[2];
+
+ switch (d->stagemask)
+ continue;
+
+ tag[0] = d->index_status ? d->index_status : ' ';
+ tag[1] = d->worktree_status ? d->worktree_status : ' ';
+
+ if ((show_added && tag[0] == 'A') ||
+ (show_deleted && tag[0] == 'D') ||
+ (show_modified && tag[0] != ' ') ||
+ (show_wt_added && tag[1] == 'A') ||
+ (show_wt_deleted && tag[1] == 'D') ||
+ (show_wt_modified && tag[1] != ' '))
+ ; /* keep going */
+ else
+ continue;
+
+ if (lstat(name, &st))
+ /* color_filename() treats this as an orphan file */
+ st.st_mode = 0;
+
+ if (!matched(result, name, st.st_mode))
+ continue;
+
+ add_one(result, name, st.st_mode, tag);
+ }
+}
+
static void wt_status_populate(struct string_list *result,
struct index_state *istate)
{
struct wt_status ws;
- if (!show_untracked && !show_ignored && !show_unmerged)
+ if (!show_untracked && !show_ignored &&
+ !show_unmerged && !show_changed)
return;
wt_status_prepare(&ws);
@@ -244,6 +298,8 @@ static void wt_status_populate(struct string_list *result,
populate_untracked(result, &ws.ignored, "!!");
if (show_unmerged)
populate_unmerged(result, &ws.change);
+ if (show_changed)
+ populate_changed(result, &ws.change);
qsort(result->items, result->nr, sizeof(*result->items),
compare_output);
string_list_remove_duplicates(result, 0);
@@ -253,8 +309,9 @@ static void cleanup_tags(struct string_list *result)
{
int i, same_1 = 1, same_2 = 1, pos, len;
- if (show_cached + show_untracked + show_ignored > 1 ||
- show_unmerged)
+ if (show_cached + show_untracked + show_ignored +
+ show_added + show_deleted + show_wt_added + show_wt_deleted > 1 ||
+ show_unmerged || show_modified || show_wt_modified)
return;
for (i = 1; i < result->nr && (same_1 || same_2); i++) {
@@ -334,7 +391,11 @@ int cmd_list_files(int argc, const char **argv, const char
*cmd_prefix)
argc = parse_options(argc, argv, prefix, ls_options, ls_usage, 0);
- if (!show_cached && !show_untracked && !show_ignored && !show_unmerged)
+ show_changed =
+ show_added || show_deleted || show_modified ||
+ show_wt_added || show_wt_deleted || show_wt_modified;
+ if (!show_cached && !show_untracked && !show_ignored &&
+ !show_unmerged && !show_changed)
show_cached = 1;
if (want_color(use_color))
--
2.3.0.rc1.137.g477eb31
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
