[PATCH v2 15/17] ls: sort output and remove duplicates
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 23:00:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
When you mix different file types, with ls-files you may get separate listing. For example, "ls-files -cm" will show file "abc" twice: one as part of cached list, one of modified list. With "ls" (and this patch) they will be in a single sorted list (easier for the eye). Duplicate entries are also removed. Note that display content is compared, so if you have "-t" on, or you color file types differently, you will get duplicate textual entries. This is good imo. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/ls-files.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 392d273..709d8b1 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c@@ -57,6 +57,13 @@ static const char *tag_modified = ""; static const char *tag_skip_worktree = ""; static const char *tag_resolve_undo = ""; +static int compare_output(const void *a_, const void *b_) +{ + const struct string_list_item *a = a_; + const struct string_list_item *b = b_; + return strcmp(a->util, b->util); +} + static void write_name(struct strbuf *sb, const char *name) { /*
@@ -72,10 +79,12 @@ static void write_name(struct strbuf *sb, const char *name) quote_path_relative(name, real_prefix, sb); } -static void strbuf_fputs(struct strbuf *sb, FILE *fp) +static void strbuf_fputs(struct strbuf *sb, const char *full_name, FILE *fp) { - if (column_active(colopts)) { - string_list_append(&output, strbuf_detach(sb, NULL)); + if (column_active(colopts) || porcelain) { + struct string_list_item *it; + it = string_list_append(&output, strbuf_detach(sb, NULL)); + it->util = (void*)full_name; return; } fwrite(sb->buf, sb->len, 1, fp);
@@ -110,7 +119,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent) strbuf_reset(&sb); strbuf_addstr(&sb, tag); write_dir_entry(&sb, ent); - strbuf_fputs(&sb, stdout); + strbuf_fputs(&sb, ent->name, stdout); } static void show_other_files(struct dir_struct *dir)
@@ -227,7 +236,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce) ce_stage(ce)); } write_ce_name(&sb, ce); - strbuf_fputs(&sb, stdout); + strbuf_fputs(&sb, ce->name, stdout); if (debug_mode) { const struct stat_data *sd = &ce->ce_stat_data;
@@ -535,7 +544,7 @@ static int ls_files(const char **argv, const char *prefix) if (debug_mode) die(_("--column and --debug are incompatible")); } - if (column_active(colopts)) + if (column_active(colopts) || porcelain) line_terminator = 0; if (require_work_tree && !is_inside_work_tree())
@@ -601,10 +610,13 @@ static int ls_files(const char **argv, const char *prefix) if (show_resolve_undo) show_ru_info(); - if (column_active(colopts)) { - print_columns(&output, colopts, NULL); - string_list_clear(&output, 0); + if (porcelain) { + qsort(output.items, output.nr, sizeof(*output.items), + compare_output); + string_list_remove_duplicates(&output, 0); } + print_columns(&output, colopts, NULL); + string_list_clear(&output, 0); if (ps_matched) { int bad;
--
1.9.1.345.ga1a145c