git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 1/2] worktrees: add find_shared_symref
@ 2015-07-31 22:11 David Turner
  2015-07-31 22:11 ` [PATCH v4 2/2] notes: handle multiple worktrees David Turner
  2015-07-31 22:20 ` [PATCH v4 1/2] worktrees: add find_shared_symref Eric Sunshine
  0 siblings, 2 replies; 5+ messages in thread
From: David Turner @ 2015-07-31 22:11 UTC (permalink / raw)
  To: git, sunshine, johan; +Cc: David Turner

Add a new function, find_shared_symref, which contains the heart of
die_if_checked_out, but works for all symrefs.  Refactor
die_if_checked_out to use the same infrastructure as
find_shared_symref.

Soon, we will use find_shared_symref to protect notes merges in
worktrees.

Signed-off-by: David Turner <dturner@twopensource.com>
---

This version includes Junio's suggested comment fix, and Eric's
suggestions for error message improvements.

---
 branch.c | 39 ++++++++++++++++++++++++++++-----------
 branch.h |  8 ++++++++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/branch.c b/branch.c
index c85be07..9b5e3b3 100644
--- a/branch.c
+++ b/branch.c
@@ -311,21 +311,22 @@ void remove_branch_state(void)
 	unlink(git_path("SQUASH_MSG"));
 }
 
-static void check_linked_checkout(const char *branch, const char *id)
+static char *find_linked_symref(const char *symref, const char *branch,
+				const char *id)
 {
 	struct strbuf sb = STRBUF_INIT;
 	struct strbuf path = STRBUF_INIT;
 	struct strbuf gitdir = STRBUF_INIT;
 
 	/*
-	 * $GIT_COMMON_DIR/HEAD is practically outside
-	 * $GIT_DIR so resolve_ref_unsafe() won't work (it
-	 * uses git_path). Parse the ref ourselves.
+	 * $GIT_COMMON_DIR/$symref (e.g. HEAD) is practically outside
+	 * $GIT_DIR so resolve_ref_unsafe() won't work (it uses
+	 * git_path). Parse the ref ourselves.
 	 */
 	if (id)
-		strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
+		strbuf_addf(&path, "%s/worktrees/%s/%s", get_git_common_dir(), id, symref);
 	else
-		strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
+		strbuf_addf(&path, "%s/%s", get_git_common_dir(), symref);
 
 	if (!strbuf_readlink(&sb, path.buf, 0)) {
 		if (!starts_with(sb.buf, "refs/") ||
@@ -349,31 +350,47 @@ static void check_linked_checkout(const char *branch, const char *id)
 		strbuf_addstr(&gitdir, get_git_common_dir());
 	skip_prefix(branch, "refs/heads/", &branch);
 	strbuf_strip_suffix(&gitdir, ".git");
-	die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf);
+	return strbuf_detach(&gitdir, NULL);
 done:
 	strbuf_release(&path);
 	strbuf_release(&sb);
 	strbuf_release(&gitdir);
+
+	return NULL;
 }
 
-void die_if_checked_out(const char *branch)
+char *find_shared_symref(const char *symref, const char *target)
 {
 	struct strbuf path = STRBUF_INIT;
 	DIR *dir;
 	struct dirent *d;
+	char *existing;
 
-	check_linked_checkout(branch, NULL);
+	if ((existing = find_linked_symref(symref, target, NULL)))
+		return existing;
 
 	strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
 	dir = opendir(path.buf);
 	strbuf_release(&path);
 	if (!dir)
-		return;
+		return NULL;
 
 	while ((d = readdir(dir)) != NULL) {
 		if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
 			continue;
-		check_linked_checkout(branch, d->d_name);
+		if ((existing = find_linked_symref(symref, target, d->d_name)))
+			return existing;
 	}
 	closedir(dir);
+
+	return NULL;
+}
+
+void die_if_checked_out(const char *branch)
+{
+	char *existing;
+
+	existing = find_shared_symref("HEAD", branch);
+	if (existing)
+		die(_("'%s' is already checked out at '%s'"), branch, existing);
 }
diff --git a/branch.h b/branch.h
index 58aa45f..0f466c7 100644
--- a/branch.h
+++ b/branch.h
@@ -59,4 +59,12 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name);
  */
 extern void die_if_checked_out(const char *branch);
 
+/*
+ * Check if a per-worktree symref points to a ref in the main worktree
+ * or any linked worktree, and return the path to the exising worktree
+ * if it is.  Returns NULL if there is no existing ref.  The caller is
+ * responsible for freeing the returned path.
+ */
+extern char *find_shared_symref(const char *symref, const char *branch);
+
 #endif
-- 
2.0.4.315.gad8727a-twtrsrc

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-03 18:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-31 22:11 [PATCH v4 1/2] worktrees: add find_shared_symref David Turner
2015-07-31 22:11 ` [PATCH v4 2/2] notes: handle multiple worktrees David Turner
2015-08-01 13:51   ` Johan Herland
2015-08-03 18:46     ` David Turner
2015-07-31 22:20 ` [PATCH v4 1/2] worktrees: add find_shared_symref Eric Sunshine

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).