Commit 3da1ad20a3f19fcb4e0eea3f4a08509e5811aca7
2018-04-24T17:09:34
worktree: add functions to get name and path
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 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
diff --git a/include/git2/worktree.h b/include/git2/worktree.h
index a2a5d44..8ba5dce 100644
--- a/include/git2/worktree.h
+++ b/include/git2/worktree.h
@@ -149,6 +149,24 @@ GIT_EXTERN(int) git_worktree_unlock(git_worktree *wt);
GIT_EXTERN(int) git_worktree_is_locked(git_buf *reason, const git_worktree *wt);
/**
+ * Retrieve the name of the worktree
+ *
+ * @param wt Worktree to get the name for
+ * @return The worktree's name. The pointer returned is valid for the
+ * lifetime of the git_worktree
+ */
+GIT_EXTERN(const char *) git_worktree_name(const git_worktree *wt);
+
+/**
+ * Retrieve the filesystem path for the worktree
+ *
+ * @param wt Worktree to get the path for
+ * @return The worktree's filesystem path. The pointer returned
+ * is valid for the lifetime of the git_worktree.
+ */
+GIT_EXTERN(const char *) git_worktree_path(const git_worktree *wt);
+
+/**
* Flags which can be passed to git_worktree_prune to alter its
* behavior.
*/
diff --git a/src/worktree.c b/src/worktree.c
index 4b18db7..898c234 100644
--- a/src/worktree.c
+++ b/src/worktree.c
@@ -139,7 +139,8 @@ static int open_worktree_dir(git_worktree **out, const char *parent, const char
if ((wt->name = git__strdup(name)) == NULL
|| (wt->commondir_path = git_worktree__read_link(dir, "commondir")) == NULL
|| (wt->gitlink_path = git_worktree__read_link(dir, "gitdir")) == NULL
- || (wt->parent_path = git__strdup(parent)) == NULL) {
+ || (wt->parent_path = git__strdup(parent)) == NULL
+ || (wt->worktree_path = git_path_dirname(wt->gitlink_path)) == NULL) {
error = -1;
goto out;
}
@@ -223,6 +224,7 @@ void git_worktree_free(git_worktree *wt)
return;
git__free(wt->commondir_path);
+ git__free(wt->worktree_path);
git__free(wt->gitlink_path);
git__free(wt->gitdir_path);
git__free(wt->parent_path);
@@ -455,6 +457,18 @@ out:
return ret;
}
+const char *git_worktree_name(const git_worktree *wt)
+{
+ assert(wt);
+ return wt->name;
+}
+
+const char *git_worktree_path(const git_worktree *wt)
+{
+ assert(wt);
+ return wt->worktree_path;
+}
+
int git_worktree_prune_init_options(
git_worktree_prune_options *opts,
unsigned int version)
diff --git a/src/worktree.h b/src/worktree.h
index 52d13cc..1d40c3a 100644
--- a/src/worktree.h
+++ b/src/worktree.h
@@ -18,6 +18,8 @@ struct git_worktree {
* directory. */
char *name;
+ /* Path to the where the worktree lives in the filesystem */
+ char *worktree_path;
/* Path to the .git file in the working tree's repository */
char *gitlink_path;
/* Path to the .git directory inside the parent's
diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c
index 4ac3b8b..abec1ec 100644
--- a/tests/worktree/worktree.c
+++ b/tests/worktree/worktree.c
@@ -355,6 +355,29 @@ void test_worktree_worktree__validate(void)
git_worktree_free(wt);
}
+void test_worktree_worktree__name(void)
+{
+ git_worktree *wt;
+
+ cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
+ cl_assert_equal_s(git_worktree_name(wt), "testrepo-worktree");
+
+ git_worktree_free(wt);
+}
+
+void test_worktree_worktree__path(void)
+{
+ git_worktree *wt;
+ git_buf expected_path = GIT_BUF_INIT;
+
+ cl_git_pass(git_buf_joinpath(&expected_path, clar_sandbox_path(), "testrepo-worktree"));
+ cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
+ cl_assert_equal_s(git_worktree_path(wt), expected_path.ptr);
+
+ git_buf_free(&expected_path);
+ git_worktree_free(wt);
+}
+
void test_worktree_worktree__validate_invalid_commondir(void)
{
git_worktree *wt;