Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
builtin/list-files.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++---
t/t7013-list-files.sh | 62 +++++++++++++++++++++++++++++++++++++++++++
wt-status.c | 8 +++---
wt-status.h | 1 +
4 files changed, 137 insertions(+), 7 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index fe15417..14ffd62 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -11,6 +11,7 @@
enum item_type {
FROM_INDEX,
FROM_WORKTREE,
+ FROM_DIFF,
IS_DIR,
IS_UNMERGED
};
@@ -39,8 +40,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>...]"),
@@ -57,6 +60,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_BOOL(0, "tag", &show_tag, N_("show tags")),
@@ -100,6 +115,7 @@ static mode_t get_mode(const struct item *item)
case FROM_INDEX:
return item->ce->ce_mode;
case FROM_WORKTREE:
+ case FROM_DIFF:
case IS_UNMERGED:
return item->st.st_mode;
}
@@ -263,18 +279,59 @@ static void populate_unmerged(struct item_list *result,
}
}
+static void populate_changed(struct item_list *result,
+ const struct string_list *change)
+{
+ int i;
+
+ for (i = 0; i < change->nr; i++) {
+ const struct string_list_item *it = change->items + i;
+ struct wt_status_change_data *d = it->util;
+ const char *name = it->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_wt_item(result, FROM_DIFF, name, tag, &st);
+ }
+}
+
static void wt_status_populate(struct item_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);
copy_pathspec(&ws.pathspec, &recursive_pathspec);
if (show_ignored)
ws.show_ignored_files = 1;
+ ws.no_rename = 1;
ws.relative_paths = 0;
ws.use_color = 0;
ws.fp = NULL;
@@ -286,6 +343,8 @@ static void wt_status_populate(struct item_list *result,
populate_untracked(result, &ws.ignored, "!!");
if (show_unmerged)
populate_unmerged(result, &ws.change);
+ if (show_changed)
+ populate_changed(result, &ws.change);
remove_duplicates(result);
}
@@ -301,7 +360,9 @@ static void cleanup_tags(struct item_list *result)
}
if (show_tag > 0 || show_unmerged ||
- show_cached + show_untracked + show_ignored > 1) {
+ show_cached + show_untracked + show_ignored +
+ show_added + show_deleted + show_wt_added + show_wt_deleted +
+ show_modified + show_wt_modified > 1) {
result->tag_pos = 0;
result->tag_len = 2;
return;
@@ -438,7 +499,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))
diff --git a/t/t7013-list-files.sh b/t/t7013-list-files.sh
index 7fe9673..c747453 100755
--- a/t/t7013-list-files.sh
+++ b/t/t7013-list-files.sh
@@ -253,4 +253,66 @@ test_expect_success 'list-files unmerged' '
)
'
+test_expect_success 'list-files --added' '
+ git list-files -a >actual &&
+ cat >expected <<-\EOF &&
+ A b
+ A c
+ sa
+ sc
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'list-files --modified' '
+ echo modified >>a &&
+ git add a &&
+ git list-files --modified >actual &&
+ cat >expected <<-\EOF &&
+ M a
+ A b
+ A c
+ sa
+ sc
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'list-files --deleted' '
+ git rm --cached a &&
+ git list-files --deleted >actual &&
+ cat >expected <<-\EOF &&
+ a
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'list-files --wt-modifed --wt-deleted' '
+ rm b &&
+ git list-files --wt-deleted >actual &&
+ cat >expected <<-\EOF &&
+ b
+ EOF
+ test_cmp expected actual &&
+ echo foo >>c &&
+ git list-files --wt-modified >actual &&
+ cat >expected <<-\EOF &&
+ D b
+ M c
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'list-files --wt-modifed --modified' '
+ git list-files -mM >actual &&
+ cat >expected <<-\EOF &&
+ D a
+ AD b
+ AM c
+ sa
+ sc
+ EOF
+ test_cmp expected actual
+'
+
test_done
diff --git a/wt-status.c b/wt-status.c
index cdbc8d7..ba9b56c 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -537,9 +537,11 @@ static void wt_status_collect_changes_index(struct
wt_status *s)
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_collect_updated_cb;
rev.diffopt.format_callback_data = s;
- rev.diffopt.detect_rename = 1;
- rev.diffopt.rename_limit = 200;
- rev.diffopt.break_opt = 0;
+ if (!s->no_rename) {
+ rev.diffopt.detect_rename = 1;
+ rev.diffopt.rename_limit = 200;
+ rev.diffopt.break_opt = 0;
+ }
copy_pathspec(&rev.prune_data, &s->pathspec);
run_diff_index(&rev, 1);
}
diff --git a/wt-status.h b/wt-status.h
index 283a9fe..dc94f35 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -55,6 +55,7 @@ struct wt_status {
int relative_paths;
int submodule_summary;
int show_ignored_files;
+ int no_rename;
enum untracked_status_type show_untracked_files;
const char *ignore_submodule_arg;
char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
--
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
