2015-10-02 11:55:31 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "strbuf.h"
|
|
|
|
#include "worktree.h"
|
2016-04-22 13:01:28 +00:00
|
|
|
#include "dir.h"
|
2016-04-22 13:01:33 +00:00
|
|
|
#include "wt-status.h"
|
2015-10-02 11:55:31 +00:00
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
void free_worktrees(struct worktree **worktrees)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
for (i = 0; worktrees[i]; i++) {
|
|
|
|
free(worktrees[i]->path);
|
2016-04-22 13:01:26 +00:00
|
|
|
free(worktrees[i]->id);
|
2015-10-08 17:01:04 +00:00
|
|
|
free(worktrees[i]->head_ref);
|
2016-06-13 12:18:23 +00:00
|
|
|
free(worktrees[i]->lock_reason);
|
2015-10-08 17:01:03 +00:00
|
|
|
free(worktrees[i]);
|
|
|
|
}
|
|
|
|
free (worktrees);
|
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:02 +00:00
|
|
|
/*
|
|
|
|
* read 'path_to_ref' into 'ref'. Also if is_detached is not NULL,
|
2016-05-06 12:36:46 +00:00
|
|
|
* set is_detached to 1 (0) if the ref is detached (is not detached).
|
2015-10-08 17:01:02 +00:00
|
|
|
*
|
|
|
|
* $GIT_COMMON_DIR/$symref (e.g. HEAD) is practically outside $GIT_DIR so
|
|
|
|
* for linked worktrees, `resolve_ref_unsafe()` won't work (it uses
|
|
|
|
* git_path). Parse the ref ourselves.
|
|
|
|
*
|
|
|
|
* return -1 if the ref is not a proper ref, 0 otherwise (success)
|
|
|
|
*/
|
|
|
|
static int parse_ref(char *path_to_ref, struct strbuf *ref, int *is_detached)
|
|
|
|
{
|
|
|
|
if (is_detached)
|
|
|
|
*is_detached = 0;
|
|
|
|
if (!strbuf_readlink(ref, path_to_ref, 0)) {
|
|
|
|
/* HEAD is symbolic link */
|
|
|
|
if (!starts_with(ref->buf, "refs/") ||
|
|
|
|
check_refname_format(ref->buf, 0))
|
|
|
|
return -1;
|
|
|
|
} else if (strbuf_read_file(ref, path_to_ref, 0) >= 0) {
|
|
|
|
/* textual symref or detached */
|
|
|
|
if (!starts_with(ref->buf, "ref:")) {
|
|
|
|
if (is_detached)
|
|
|
|
*is_detached = 1;
|
|
|
|
} else {
|
|
|
|
strbuf_remove(ref, 0, strlen("ref:"));
|
|
|
|
strbuf_trim(ref);
|
|
|
|
if (check_refname_format(ref->buf, 0))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:04 +00:00
|
|
|
/**
|
|
|
|
* Add the head_sha1 and head_ref (if not detached) to the given worktree
|
|
|
|
*/
|
|
|
|
static void add_head_info(struct strbuf *head_ref, struct worktree *worktree)
|
|
|
|
{
|
|
|
|
if (head_ref->len) {
|
|
|
|
if (worktree->is_detached) {
|
|
|
|
get_sha1_hex(head_ref->buf, worktree->head_sha1);
|
|
|
|
} else {
|
|
|
|
resolve_ref_unsafe(head_ref->buf, 0, worktree->head_sha1, NULL);
|
|
|
|
worktree->head_ref = strbuf_detach(head_ref, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
/**
|
|
|
|
* get the main worktree
|
|
|
|
*/
|
|
|
|
static struct worktree *get_main_worktree(void)
|
2015-10-08 17:01:02 +00:00
|
|
|
{
|
2015-10-08 17:01:03 +00:00
|
|
|
struct worktree *worktree = NULL;
|
2015-10-08 17:01:02 +00:00
|
|
|
struct strbuf path = STRBUF_INIT;
|
2015-10-08 17:01:03 +00:00
|
|
|
struct strbuf worktree_path = STRBUF_INIT;
|
|
|
|
struct strbuf head_ref = STRBUF_INIT;
|
2015-10-08 17:01:04 +00:00
|
|
|
int is_bare = 0;
|
|
|
|
int is_detached = 0;
|
2015-10-08 17:01:02 +00:00
|
|
|
|
2016-07-09 15:43:59 +00:00
|
|
|
strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
|
2015-10-08 17:01:04 +00:00
|
|
|
is_bare = !strbuf_strip_suffix(&worktree_path, "/.git");
|
|
|
|
if (is_bare)
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_strip_suffix(&worktree_path, "/.");
|
|
|
|
|
|
|
|
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
|
|
|
|
|
2015-10-08 17:01:04 +00:00
|
|
|
if (parse_ref(path.buf, &head_ref, &is_detached) < 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
worktree = xmalloc(sizeof(struct worktree));
|
|
|
|
worktree->path = strbuf_detach(&worktree_path, NULL);
|
2016-04-22 13:01:26 +00:00
|
|
|
worktree->id = NULL;
|
2015-10-08 17:01:04 +00:00
|
|
|
worktree->is_bare = is_bare;
|
|
|
|
worktree->head_ref = NULL;
|
|
|
|
worktree->is_detached = is_detached;
|
2016-04-22 13:01:28 +00:00
|
|
|
worktree->is_current = 0;
|
2015-10-08 17:01:04 +00:00
|
|
|
add_head_info(&head_ref, worktree);
|
2016-06-13 12:18:23 +00:00
|
|
|
worktree->lock_reason = NULL;
|
|
|
|
worktree->lock_reason_valid = 0;
|
2015-10-08 17:01:04 +00:00
|
|
|
|
|
|
|
done:
|
2015-10-08 17:01:02 +00:00
|
|
|
strbuf_release(&path);
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_release(&worktree_path);
|
|
|
|
strbuf_release(&head_ref);
|
|
|
|
return worktree;
|
2015-10-08 17:01:02 +00:00
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
static struct worktree *get_linked_worktree(const char *id)
|
2015-10-02 11:55:31 +00:00
|
|
|
{
|
2015-10-08 17:01:03 +00:00
|
|
|
struct worktree *worktree = NULL;
|
2015-10-02 11:55:31 +00:00
|
|
|
struct strbuf path = STRBUF_INIT;
|
2015-10-08 17:01:03 +00:00
|
|
|
struct strbuf worktree_path = STRBUF_INIT;
|
|
|
|
struct strbuf head_ref = STRBUF_INIT;
|
2015-10-08 17:01:04 +00:00
|
|
|
int is_detached = 0;
|
2015-10-02 11:55:31 +00:00
|
|
|
|
2015-10-08 17:01:02 +00:00
|
|
|
if (!id)
|
|
|
|
die("Missing linked worktree name");
|
2015-10-02 11:55:31 +00:00
|
|
|
|
2016-04-22 13:01:26 +00:00
|
|
|
strbuf_git_common_path(&path, "worktrees/%s/gitdir", id);
|
2015-10-08 17:01:03 +00:00
|
|
|
if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0)
|
|
|
|
/* invalid gitdir file */
|
2015-10-02 11:55:31 +00:00
|
|
|
goto done;
|
2015-10-08 17:01:03 +00:00
|
|
|
|
|
|
|
strbuf_rtrim(&worktree_path);
|
|
|
|
if (!strbuf_strip_suffix(&worktree_path, "/.git")) {
|
|
|
|
strbuf_reset(&worktree_path);
|
2016-07-09 15:43:59 +00:00
|
|
|
strbuf_add_absolute_path(&worktree_path, ".");
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_strip_suffix(&worktree_path, "/.");
|
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:02 +00:00
|
|
|
strbuf_reset(&path);
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
|
|
|
|
|
2015-10-08 17:01:04 +00:00
|
|
|
if (parse_ref(path.buf, &head_ref, &is_detached) < 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
worktree = xmalloc(sizeof(struct worktree));
|
|
|
|
worktree->path = strbuf_detach(&worktree_path, NULL);
|
2016-04-22 13:01:26 +00:00
|
|
|
worktree->id = xstrdup(id);
|
2015-10-08 17:01:04 +00:00
|
|
|
worktree->is_bare = 0;
|
|
|
|
worktree->head_ref = NULL;
|
|
|
|
worktree->is_detached = is_detached;
|
2016-04-22 13:01:28 +00:00
|
|
|
worktree->is_current = 0;
|
2015-10-08 17:01:04 +00:00
|
|
|
add_head_info(&head_ref, worktree);
|
2016-06-13 12:18:23 +00:00
|
|
|
worktree->lock_reason = NULL;
|
|
|
|
worktree->lock_reason_valid = 0;
|
2015-10-02 11:55:31 +00:00
|
|
|
|
|
|
|
done:
|
|
|
|
strbuf_release(&path);
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_release(&worktree_path);
|
|
|
|
strbuf_release(&head_ref);
|
|
|
|
return worktree;
|
2015-10-02 11:55:31 +00:00
|
|
|
}
|
|
|
|
|
2016-04-22 13:01:28 +00:00
|
|
|
static void mark_current_worktree(struct worktree **worktrees)
|
|
|
|
{
|
2016-05-22 09:33:52 +00:00
|
|
|
char *git_dir = xstrdup(absolute_path(get_git_dir()));
|
2016-04-22 13:01:28 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; worktrees[i]; i++) {
|
|
|
|
struct worktree *wt = worktrees[i];
|
2016-05-22 09:33:52 +00:00
|
|
|
const char *wt_git_dir = get_worktree_git_dir(wt);
|
|
|
|
|
|
|
|
if (!fspathcmp(git_dir, absolute_path(wt_git_dir))) {
|
|
|
|
wt->is_current = 1;
|
2016-04-22 13:01:28 +00:00
|
|
|
break;
|
2016-05-22 09:33:52 +00:00
|
|
|
}
|
2016-04-22 13:01:28 +00:00
|
|
|
}
|
2016-05-22 09:33:52 +00:00
|
|
|
free(git_dir);
|
2016-04-22 13:01:28 +00:00
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
struct worktree **get_worktrees(void)
|
2015-10-02 11:55:31 +00:00
|
|
|
{
|
2015-10-08 17:01:03 +00:00
|
|
|
struct worktree **list = NULL;
|
2015-10-02 11:55:31 +00:00
|
|
|
struct strbuf path = STRBUF_INIT;
|
|
|
|
DIR *dir;
|
|
|
|
struct dirent *d;
|
2015-10-08 17:01:03 +00:00
|
|
|
int counter = 0, alloc = 2;
|
|
|
|
|
|
|
|
list = xmalloc(alloc * sizeof(struct worktree *));
|
2015-10-02 11:55:31 +00:00
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
if ((list[counter] = get_main_worktree()))
|
|
|
|
counter++;
|
2015-10-02 11:55:31 +00:00
|
|
|
|
|
|
|
strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
|
|
|
|
dir = opendir(path.buf);
|
|
|
|
strbuf_release(&path);
|
2015-10-08 17:01:03 +00:00
|
|
|
if (dir) {
|
|
|
|
while ((d = readdir(dir)) != NULL) {
|
|
|
|
struct worktree *linked = NULL;
|
2016-05-22 09:33:54 +00:00
|
|
|
if (is_dot_or_dotdot(d->d_name))
|
2015-10-08 17:01:03 +00:00
|
|
|
continue;
|
2015-10-02 11:55:31 +00:00
|
|
|
|
2016-01-18 11:21:29 +00:00
|
|
|
if ((linked = get_linked_worktree(d->d_name))) {
|
|
|
|
ALLOC_GROW(list, counter + 1, alloc);
|
|
|
|
list[counter++] = linked;
|
|
|
|
}
|
2015-10-08 17:01:03 +00:00
|
|
|
}
|
|
|
|
closedir(dir);
|
|
|
|
}
|
|
|
|
ALLOC_GROW(list, counter + 1, alloc);
|
|
|
|
list[counter] = NULL;
|
2016-04-22 13:01:28 +00:00
|
|
|
|
|
|
|
mark_current_worktree(list);
|
2015-10-08 17:01:03 +00:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2016-04-22 13:01:26 +00:00
|
|
|
const char *get_worktree_git_dir(const struct worktree *wt)
|
|
|
|
{
|
|
|
|
if (!wt)
|
|
|
|
return get_git_dir();
|
|
|
|
else if (!wt->id)
|
|
|
|
return get_git_common_dir();
|
|
|
|
else
|
|
|
|
return git_common_path("worktrees/%s", wt->id);
|
|
|
|
}
|
|
|
|
|
2016-06-13 12:18:26 +00:00
|
|
|
static struct worktree *find_worktree_by_suffix(struct worktree **list,
|
|
|
|
const char *suffix)
|
|
|
|
{
|
|
|
|
struct worktree *found = NULL;
|
|
|
|
int nr_found = 0, suffixlen;
|
|
|
|
|
|
|
|
suffixlen = strlen(suffix);
|
|
|
|
if (!suffixlen)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (; *list && nr_found < 2; list++) {
|
|
|
|
const char *path = (*list)->path;
|
|
|
|
int pathlen = strlen(path);
|
|
|
|
int start = pathlen - suffixlen;
|
|
|
|
|
|
|
|
/* suffix must start at directory boundary */
|
|
|
|
if ((!start || (start > 0 && is_dir_sep(path[start - 1]))) &&
|
|
|
|
!fspathcmp(suffix, path + start)) {
|
|
|
|
found = *list;
|
|
|
|
nr_found++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nr_found == 1 ? found : NULL;
|
|
|
|
}
|
|
|
|
|
2016-06-03 12:19:39 +00:00
|
|
|
struct worktree *find_worktree(struct worktree **list,
|
|
|
|
const char *prefix,
|
|
|
|
const char *arg)
|
|
|
|
{
|
2016-06-13 12:18:26 +00:00
|
|
|
struct worktree *wt;
|
2016-06-03 12:19:39 +00:00
|
|
|
char *path;
|
|
|
|
|
2016-06-13 12:18:26 +00:00
|
|
|
if ((wt = find_worktree_by_suffix(list, arg)))
|
|
|
|
return wt;
|
|
|
|
|
2016-06-03 12:19:39 +00:00
|
|
|
arg = prefix_filename(prefix, strlen(prefix), arg);
|
2016-12-12 18:16:55 +00:00
|
|
|
path = real_pathdup(arg);
|
2016-06-03 12:19:39 +00:00
|
|
|
for (; *list; list++)
|
|
|
|
if (!fspathcmp(path, real_path((*list)->path)))
|
|
|
|
break;
|
|
|
|
free(path);
|
|
|
|
return *list;
|
|
|
|
}
|
|
|
|
|
2016-06-03 12:19:40 +00:00
|
|
|
int is_main_worktree(const struct worktree *wt)
|
|
|
|
{
|
|
|
|
return !wt->id;
|
|
|
|
}
|
|
|
|
|
2016-06-13 12:18:23 +00:00
|
|
|
const char *is_worktree_locked(struct worktree *wt)
|
|
|
|
{
|
|
|
|
assert(!is_main_worktree(wt));
|
|
|
|
|
|
|
|
if (!wt->lock_reason_valid) {
|
|
|
|
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;
|
|
|
|
wt->lock_reason_valid = 1;
|
|
|
|
strbuf_release(&path);
|
|
|
|
}
|
|
|
|
|
|
|
|
return wt->lock_reason;
|
|
|
|
}
|
|
|
|
|
2016-04-22 13:01:36 +00:00
|
|
|
int is_worktree_being_rebased(const struct worktree *wt,
|
|
|
|
const char *target)
|
2016-04-22 13:01:33 +00:00
|
|
|
{
|
|
|
|
struct wt_status_state state;
|
|
|
|
int found_rebase;
|
|
|
|
|
|
|
|
memset(&state, 0, sizeof(state));
|
|
|
|
found_rebase = wt_status_check_rebase(wt, &state) &&
|
|
|
|
((state.rebase_in_progress ||
|
|
|
|
state.rebase_interactive_in_progress) &&
|
|
|
|
state.branch &&
|
|
|
|
starts_with(target, "refs/heads/") &&
|
|
|
|
!strcmp(state.branch, target + strlen("refs/heads/")));
|
|
|
|
free(state.branch);
|
|
|
|
free(state.onto);
|
|
|
|
return found_rebase;
|
|
|
|
}
|
|
|
|
|
2016-04-22 13:01:36 +00:00
|
|
|
int is_worktree_being_bisected(const struct worktree *wt,
|
|
|
|
const char *target)
|
2015-10-08 17:01:03 +00:00
|
|
|
{
|
2016-04-22 13:01:35 +00:00
|
|
|
struct wt_status_state state;
|
|
|
|
int found_rebase;
|
|
|
|
|
|
|
|
memset(&state, 0, sizeof(state));
|
|
|
|
found_rebase = wt_status_check_bisect(wt, &state) &&
|
|
|
|
state.branch &&
|
|
|
|
starts_with(target, "refs/heads/") &&
|
|
|
|
!strcmp(state.branch, target + strlen("refs/heads/"));
|
|
|
|
free(state.branch);
|
|
|
|
return found_rebase;
|
|
|
|
}
|
|
|
|
|
2016-04-22 13:01:33 +00:00
|
|
|
/*
|
|
|
|
* note: this function should be able to detect shared symref even if
|
|
|
|
* HEAD is temporarily detached (e.g. in the middle of rebase or
|
|
|
|
* bisect). New commands that do similar things should update this
|
|
|
|
* function as well.
|
|
|
|
*/
|
2016-04-22 13:01:27 +00:00
|
|
|
const struct worktree *find_shared_symref(const char *symref,
|
|
|
|
const char *target)
|
2015-10-08 17:01:03 +00:00
|
|
|
{
|
2016-04-22 13:01:27 +00:00
|
|
|
const struct worktree *existing = NULL;
|
2015-10-08 17:01:03 +00:00
|
|
|
struct strbuf path = STRBUF_INIT;
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2016-04-22 13:01:27 +00:00
|
|
|
static struct worktree **worktrees;
|
2015-10-08 17:01:03 +00:00
|
|
|
int i = 0;
|
|
|
|
|
2016-04-22 13:01:27 +00:00
|
|
|
if (worktrees)
|
|
|
|
free_worktrees(worktrees);
|
|
|
|
worktrees = get_worktrees();
|
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
for (i = 0; worktrees[i]; i++) {
|
2016-04-22 13:01:32 +00:00
|
|
|
struct worktree *wt = worktrees[i];
|
2016-10-12 16:41:07 +00:00
|
|
|
if (wt->is_bare)
|
|
|
|
continue;
|
2016-04-22 13:01:32 +00:00
|
|
|
|
2016-04-22 13:01:33 +00:00
|
|
|
if (wt->is_detached && !strcmp(symref, "HEAD")) {
|
|
|
|
if (is_worktree_being_rebased(wt, target)) {
|
|
|
|
existing = wt;
|
|
|
|
break;
|
|
|
|
}
|
2016-04-22 13:01:35 +00:00
|
|
|
if (is_worktree_being_bisected(wt, target)) {
|
|
|
|
existing = wt;
|
|
|
|
break;
|
|
|
|
}
|
2016-04-22 13:01:33 +00:00
|
|
|
}
|
|
|
|
|
2015-10-08 17:01:03 +00:00
|
|
|
strbuf_reset(&path);
|
|
|
|
strbuf_reset(&sb);
|
2016-04-22 13:01:26 +00:00
|
|
|
strbuf_addf(&path, "%s/%s",
|
2016-04-22 13:01:32 +00:00
|
|
|
get_worktree_git_dir(wt),
|
2016-04-22 13:01:26 +00:00
|
|
|
symref);
|
2015-10-08 17:01:03 +00:00
|
|
|
|
|
|
|
if (parse_ref(path.buf, &sb, NULL)) {
|
2015-10-02 11:55:31 +00:00
|
|
|
continue;
|
2015-10-08 17:01:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(sb.buf, target)) {
|
2016-04-22 13:01:32 +00:00
|
|
|
existing = wt;
|
2015-10-08 17:01:03 +00:00
|
|
|
break;
|
|
|
|
}
|
2015-10-02 11:55:31 +00:00
|
|
|
}
|
2015-10-08 17:01:03 +00:00
|
|
|
|
|
|
|
strbuf_release(&path);
|
|
|
|
strbuf_release(&sb);
|
2015-10-02 11:55:31 +00:00
|
|
|
|
|
|
|
return existing;
|
|
|
|
}
|