We need this later to avoid double locking a worktree, or unlocking one when it's not even locked.
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> --- worktree.c | 26 ++++++++++++++++++++++++++ worktree.h | 7 +++++++ 2 files changed, 33 insertions(+) diff --git a/worktree.c b/worktree.c index eb3aaaa..ee592a4 100644 --- a/worktree.c +++ b/worktree.c @@ -5,6 +5,8 @@ #include "dir.h" #include "wt-status.h" +static const char *lock_field_uninitialized = "value is not important"; + void free_worktrees(struct worktree **worktrees) { int i = 0; @@ -13,6 +15,8 @@ void free_worktrees(struct worktree **worktrees) free(worktrees[i]->path); free(worktrees[i]->id); free(worktrees[i]->head_ref); + if (worktrees[i]->lock_reason != lock_field_uninitialized) + free(worktrees[i]->lock_reason); free(worktrees[i]); } free (worktrees); @@ -98,6 +102,7 @@ static struct worktree *get_main_worktree(void) worktree->is_detached = is_detached; worktree->is_current = 0; add_head_info(&head_ref, worktree); + worktree->lock_reason = (char *)lock_field_uninitialized; done: strbuf_release(&path); @@ -143,6 +148,7 @@ static struct worktree *get_linked_worktree(const char *id) worktree->is_detached = is_detached; worktree->is_current = 0; add_head_info(&head_ref, worktree); + worktree->lock_reason = (char *)lock_field_uninitialized; done: strbuf_release(&path); @@ -234,6 +240,26 @@ int is_main_worktree(const struct worktree *wt) return !wt->id; } +const char *is_worktree_locked(struct worktree *wt) +{ + if (wt->lock_reason == lock_field_uninitialized) { + struct strbuf path = STRBUF_INIT; + + strbuf_addstr(&path, worktree_git_path(wt, "locked")); + if (file_exists(path.buf)) { + struct strbuf lock_reason = STRBUF_INIT; + if (strbuf_read_file(&lock_reason, path.buf, 0) < 0) + die_errno(_("failed to read '%s'"), path.buf); + strbuf_trim(&lock_reason); + wt->lock_reason = strbuf_detach(&lock_reason, NULL); + } else + wt->lock_reason = NULL; + strbuf_release(&path); + } + + return wt->lock_reason; +} + int is_worktree_being_rebased(const struct worktree *wt, const char *target) { diff --git a/worktree.h b/worktree.h index e1c4715..263b61d 100644 --- a/worktree.h +++ b/worktree.h @@ -5,6 +5,7 @@ struct worktree { char *path; char *id; char *head_ref; + char *lock_reason; /* internal use */ unsigned char head_sha1[20]; int is_detached; int is_bare; @@ -42,6 +43,12 @@ extern struct worktree *find_worktree(struct worktree **list, */ extern int is_main_worktree(const struct worktree *wt); +/* + * Return the reason string if the given worktree is locked or NULL + * otherwise. + */ +extern const char *is_worktree_locked(struct worktree *wt); + /* * Free up the memory for worktree(s) */ -- 2.8.2.524.g6ff3d78 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
