make 'got blame' function in a work tree
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
diff --git a/got/got.1 b/got/got.1
index 16f922d..f755ddb 100644
--- a/got/got.1
+++ b/got/got.1
@@ -193,6 +193,9 @@ to a commit object.
Use the repository at the specified path.
If not specified, assume the repository is located at or above the current
working directory.
+If this directory is a
+.Nm
+work tree, use the repository path associated with this work tree.
.El
.It Cm tree [ Fl c Ar commit ] [ Fl r Ar repository-path ] [ Fl i ] [ Fl R] [ Ar path ]
Display a listing of files and directories at the specified
diff --git a/got/got.c b/got/got.c
index 2d73aec..bd465c5 100644
--- a/got/got.c
+++ b/got/got.c
@@ -1069,6 +1069,7 @@ cmd_blame(int argc, char *argv[])
{
const struct got_error *error;
struct got_repository *repo = NULL;
+ struct got_worktree *worktree = NULL;
char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
struct got_object_id *commit_id = NULL;
char *commit_id_str = NULL;
@@ -1110,10 +1111,24 @@ cmd_blame(int argc, char *argv[])
goto done;
}
if (repo_path == NULL) {
- repo_path = strdup(cwd);
- if (repo_path == NULL) {
- error = got_error_from_errno();
+ error = got_worktree_open(&worktree, cwd);
+ if (error && error->code != GOT_ERR_NOT_WORKTREE)
goto done;
+ else
+ error = NULL;
+ if (worktree) {
+ repo_path =
+ strdup(got_worktree_get_repo_path(worktree));
+ if (repo_path == NULL)
+ error = got_error_from_errno();
+ if (error)
+ goto done;
+ } else {
+ repo_path = strdup(cwd);
+ if (repo_path == NULL) {
+ error = got_error_from_errno();
+ goto done;
+ }
}
}
@@ -1125,8 +1140,21 @@ cmd_blame(int argc, char *argv[])
if (error != NULL)
goto done;
- error = got_repo_map_path(&in_repo_path, repo, path, 1);
- if (error != NULL)
+ if (worktree) {
+ char *p, *worktree_subdir = cwd +
+ strlen(got_worktree_get_root_path(worktree));
+ if (asprintf(&p, "%s/%s/%s",
+ got_worktree_get_path_prefix(worktree),
+ worktree_subdir, path) == -1) {
+ error = got_error_from_errno();
+ goto done;
+ }
+ error = got_repo_map_path(&in_repo_path, repo, p, 1);
+ free(p);
+ } else {
+ error = got_repo_map_path(&in_repo_path, repo, path, 1);
+ }
+ if (error)
goto done;
if (commit_id_str == NULL) {
@@ -1151,6 +1179,8 @@ done:
free(repo_path);
free(cwd);
free(commit_id);
+ if (worktree)
+ got_worktree_close(worktree);
if (repo) {
const struct got_error *repo_error;
repo_error = got_repo_close(repo);