mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-files: convert overlay_tree_on_cache to take an index

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-06-12 15:13:58 -07:00
committed by Junio C Hamano
parent 85ab50f938
commit 312c984a02
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/commit.c
View File

@ -253,7 +253,8 @@ static int list_paths(struct string_list *list, const char *with_tree,
if (with_tree) { if (with_tree) {
char *max_prefix = common_prefix(pattern); char *max_prefix = common_prefix(pattern);
overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); overlay_tree_on_index(&the_index, with_tree,
max_prefix ? max_prefix : prefix);
free(max_prefix); free(max_prefix);
} }

15
builtin/ls-files.c
View File

@ -431,7 +431,8 @@ static int get_common_prefix_len(const char *common_prefix)
* that were given from the command line. We are not * that were given from the command line. We are not
* going to write this index out. * going to write this index out.
*/ */
void overlay_tree_on_cache(const char *tree_name, const char *prefix) void overlay_tree_on_index(struct index_state *istate,
const char *tree_name, const char *prefix)
{ {
struct tree *tree; struct tree *tree;
struct object_id oid; struct object_id oid;
@ -446,8 +447,8 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
die("bad tree-ish %s", tree_name); die("bad tree-ish %s", tree_name);
/* Hoist the unmerged entries up to stage #3 to make room */ /* Hoist the unmerged entries up to stage #3 to make room */
for (i = 0; i < active_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = istate->cache[i];
if (!ce_stage(ce)) if (!ce_stage(ce))
continue; continue;
ce->ce_flags |= CE_STAGEMASK; ce->ce_flags |= CE_STAGEMASK;
@ -460,11 +461,11 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
PATHSPEC_PREFER_CWD, prefix, matchbuf); PATHSPEC_PREFER_CWD, prefix, matchbuf);
} else } else
memset(&pathspec, 0, sizeof(pathspec)); memset(&pathspec, 0, sizeof(pathspec));
if (read_tree(tree, 1, &pathspec, &the_index)) if (read_tree(tree, 1, &pathspec, istate))
die("unable to read tree entries %s", tree_name); die("unable to read tree entries %s", tree_name);
for (i = 0; i < active_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = istate->cache[i];
switch (ce_stage(ce)) { switch (ce_stage(ce)) {
case 0: case 0:
last_stage0 = ce; last_stage0 = ce;
@ -679,7 +680,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
*/ */
if (show_stage || show_unmerged) if (show_stage || show_unmerged)
die("ls-files --with-tree is incompatible with -s or -u"); die("ls-files --with-tree is incompatible with -s or -u");
overlay_tree_on_cache(with_tree, max_prefix); overlay_tree_on_index(&the_index, with_tree, max_prefix);
} }
show_files(&dir); show_files(&dir);
if (show_resolve_undo) if (show_resolve_undo)

3
cache.h
View File

@ -2186,7 +2186,8 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
#define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK) #define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK)
/* ls-files */ /* ls-files */
void overlay_tree_on_cache(const char *tree_name, const char *prefix); void overlay_tree_on_index(struct index_state *istate,
const char *tree_name, const char *prefix);
char *alias_lookup(const char *alias); char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv); int split_cmdline(char *cmdline, const char ***argv);