Commit e3baa3ccf3b606517b3819913228c030854b8d77
2011-10-29T17:45:01
status: Fix a sorting issue in the treewalker This ensures that entries from the working directory are retrieved according to the following rules: - The file "subdir" should appear before the file "subdir.txt" - The folder "subdir" should appear after the file "subdir.txt"
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/src/status.c b/src/status.c
index a3d6ee8..d50199d 100644
--- a/src/status.c
+++ b/src/status.c
@@ -291,7 +291,7 @@ static int path_type_from(char *full_path, int is_dir)
if (!is_dir)
return GIT_STATUS_PATH_FILE;
- if (!git__suffixcmp(full_path, "/" DOT_GIT))
+ if (!git__suffixcmp(full_path, "/" DOT_GIT "/"))
return GIT_STATUS_PATH_IGNORE;
return GIT_STATUS_PATH_FOLDER;
@@ -360,7 +360,13 @@ static int dirent_cb(void *state, char *a)
if (m != NULL) {
st->head_tree_relative_path[st->head_tree_relative_path_len] = '\0';
- git_path_join(st->head_tree_relative_path, st->head_tree_relative_path, m->filename);
+
+ /* When the tree entry is a folder, append a forward slash to its name */
+ if (git_tree_entry_type(m) == GIT_OBJ_TREE)
+ git_path_join_n(st->head_tree_relative_path, 3, st->head_tree_relative_path, m->filename, "");
+ else
+ git_path_join(st->head_tree_relative_path, st->head_tree_relative_path, m->filename);
+
m_name = st->head_tree_relative_path;
} else
m_name = NULL;
@@ -378,7 +384,7 @@ static int dirent_cb(void *state, char *a)
if((error = determine_status(st, pm != NULL, pi != NULL, pa != NULL, m, entry, a, status_path(pm, pi, pa), path_type)) < GIT_SUCCESS)
return git__rethrow(error, "An error occured while determining the status of '%s'", a);
- if (pa != NULL)
+ if ((pa != NULL) || (path_type == GIT_STATUS_PATH_FOLDER))
return GIT_SUCCESS;
}
}
@@ -571,19 +577,32 @@ struct alphasorted_dirent_info {
static struct alphasorted_dirent_info *alphasorted_dirent_info_new(const char *path)
{
- int is_dir;
+ int is_dir, size;
struct alphasorted_dirent_info *di;
is_dir = git_futils_isdir(path) == GIT_SUCCESS ? 1 : 0;
+ size = sizeof(*di) + (is_dir ? GIT_PATH_MAX : strlen(path)) + 2;
- di = git__malloc(sizeof(*di) + (is_dir ? GIT_PATH_MAX : strlen(path)) + 1);
+ di = git__malloc(size);
if (di == NULL)
return NULL;
- memset(di, 0x0, sizeof(*di));
+ memset(di, 0x0, size);
strcpy(di->path, path);
- di->is_dir = is_dir;
+
+ if (is_dir) {
+ di->is_dir = 1;
+
+ /*
+ * Append a forward slash to the name to force folders
+ * to be ordered in a similar way than in a tree
+ *
+ * The file "subdir" should appear before the file "subdir.txt"
+ * The folder "subdir" should appear after the file "subdir.txt"
+ */
+ di->path[strlen(path)] = '/';
+ }
return di;
}