git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] add chdir-notify API

From
Jeff King <peff@peff.net>
Date
Mar 28, 2018, 17:40 UTC
Message-ID
<20180328174041.GB16274@sigill.intra.peff.net>
In-Reply-To
<20180328173656.GA29094@sigill.intra.peff.net>

If one part of the code does a permanent chdir(), then this invalidates any relative paths that may be held by other parts of the code. For example, setup_work_tree() moves us to the top of the working tree, which may invalidate a previously stored relative gitdir.

We've hacked around this case by teaching setup_work_tree() to re-run set_git_dir() with an adjusted path, but this stomps all over the idea of module boundaries. setup_work_tree() shouldn't have to know all of the places that need to be fed an adjusted path. And indeed, there's at least one other place (the refs code) which needs adjusting.

Let's provide an API to let code that stores relative paths "subscribe" to updates to the current working directory. This means that callers of chdir() don't need to know about all subscribers ahead of time; they can simply consult a dynamically built list.

Note that our helper function to reparent relative paths uses the simple remove_leading_path(). We could in theory use the much smarter relative_path(), but that led to some problems as described in 41894ae3a3 (Use simpler relative_path when set_git_dir, 2013-10-14). Since we're aiming to replace the setup_work_tree() code here, let's follow its lead.

Signed-off-by: Jeff King <peff@peff.net>
---
 Makefile       |  1 +
 chdir-notify.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 chdir-notify.h | 64 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+)
 create mode 100644 chdir-notify.c
 create mode 100644 chdir-notify.h
diff --git a/Makefile b/Makefile
index a1d8775adb..0da98b9274 100644
--- a/Makefile
+++ b/Makefile
@@ -772,6 +772,7 @@ LIB_OBJS += branch.o
 LIB_OBJS += bulk-checkin.o
 LIB_OBJS += bundle.o
 LIB_OBJS += cache-tree.o
+LIB_OBJS += chdir-notify.o
 LIB_OBJS += checkout.o
 LIB_OBJS += color.o
 LIB_OBJS += column.o
diff --git a/chdir-notify.c b/chdir-notify.c
new file mode 100644
index 0000000000..0b88bf0e5b
--- /dev/null
+++ b/chdir-notify.c
@@ -0,0 +1,71 @@
+#include "cache.h"
+#include "chdir-notify.h"
+#include "list.h"
+#include "strbuf.h"
+
+struct chdir_notify_entry {
+	chdir_notify_callback cb;
+	void *data;
+	struct list_head list;
+};
+static LIST_HEAD(chdir_notify_entries);
+
+void chdir_notify_register(chdir_notify_callback cb, void *data)
+{
+	struct chdir_notify_entry *e = xmalloc(sizeof(*e));
+	e->cb = cb;
+	e->data = data;
+	list_add_tail(&e->list, &chdir_notify_entries);
+}
+
+static void reparent_cb(const char *old_cwd,
+			const char *new_cwd,
+			void *data)
+{
+	char **path = data;
+	char *tmp = *path;
+	*path = reparent_relative_path(old_cwd, new_cwd, tmp);
+	free(tmp);
+}
+
+void chdir_notify_reparent(char **path)
+{
+	if (!is_absolute_path(*path))
+		chdir_notify_register(reparent_cb, path);
+}
+
+int chdir_notify(const char *new_cwd)
+{
+	struct strbuf old_cwd = STRBUF_INIT;
+	struct list_head *pos;
+
+	if (strbuf_getcwd(&old_cwd) < 0)
+		return -1;
+	if (chdir(new_cwd) < 0)
+		return -1;
+
+	list_for_each(pos, &chdir_notify_entries) {
+		struct chdir_notify_entry *e =
+			list_entry(pos, struct chdir_notify_entry, list);
+		e->cb(old_cwd.buf, new_cwd, e->data);
+	}
+
+	strbuf_release(&old_cwd);
+	return 0;
+}
+
+char *reparent_relative_path(const char *old_cwd,
+			     const char *new_cwd,
+			     const char *path)
+{
+	char *ret, *full;
+
+	if (is_absolute_path(path))
+		return xstrdup(path);
+
+	full = xstrfmt("%s/%s", old_cwd, path);
+	ret = xstrdup(remove_leading_path(full, new_cwd));
+	free(full);
+
+	return ret;
+}
diff --git a/chdir-notify.h b/chdir-notify.h
new file mode 100644
index 0000000000..c3bd818a85
--- /dev/null
+++ b/chdir-notify.h
@@ -0,0 +1,64 @@
+#ifndef CHDIR_NOTIFY_H
+#define CHDIR_NOTIFY_H
+
+/*
+ * An API to let code "subscribe" to changes to the current working directory.
+ * The general idea is that some code asks to be notified when the working
+ * directory changes, and other code that calls chdir uses a special wrapper
+ * that notifies everyone.
+ */
+
+/*
+ * Callers who need to know about changes can do:
+ *
+ *   void foo(const char *old_path, const char *new_path, void *data)
+ *   {
+ *	warning("switched from %s to %s!", old_path, new_path);
+ *   }
+ *   ...
+ *   chdir_notify_register(foo, data);
+ *
+ * In practice most callers will want to move a relative path to the new root;
+ * they can use the reparent_relative_path() helper for that. If that's all
+ * you're doing, you can also use the convenience function:
+ *
+ *   chdir_notify_reparent(&my_path);
+ *
+ * Registered functions are called in the order in which they were added. Note
+ * that there's currently no way to remove a function, so make sure that the
+ * data parameter remains valid for the rest of the program.
+ */
+typedef void (*chdir_notify_callback)(const char *old_cwd,
+				      const char *new_cwd,
+				      void *data);
+void chdir_notify_register(chdir_notify_callback cb, void *data);
+void chdir_notify_reparent(char **path);
+
+/*
+ *
+ * Callers that want to chdir:
+ *
+ *   chdir_notify(new_path);
+ *
+ * to switch to the new path and notify any callbacks.
+ *
+ * Note that you don't need to chdir_notify() if you're just temporarily moving
+ * to a directory and back, as long as you don't call any subscribed code in
+ * between (but it should be safe to do so if you're unsure).
+ */
+int chdir_notify(const char *new_cwd);
+
+/*
+ * Reparent a relative path from old_root to new_root. For example:
+ *
+ *   reparent_relative_path("/a", "/a/b", "b/rel");
+ *
+ * would return the (newly allocated) string "rel". Note that we may return an
+ * absolute path in some cases (e.g., if the resulting path is not inside
+ * new_cwd).
+ */
+char *reparent_relative_path(const char *old_cwd,
+			     const char *new_cwd,
+			     const char *path);
+
+#endif /* CHDIR_NOTIFY_H */
-- 
2.17.0.rc1.515.g3cc84c0ca4
Previous: Jeff KingNext: Eric Sunshine
Message 12 of 54 in “git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.”
  1. Rafael AscensaoMar 26, 2018
  2. Ævar Arnfjörð BjarmasonMar 26, 2018
  3. Jeff KingMar 27, 2018
  4. Duy NguyenMar 27, 2018
  5. Jeff KingMar 27, 2018
  6. Duy NguyenMar 27, 2018
  7. Duy NguyenMar 27, 2018
  8. Jeff KingMar 28, 2018
  9. Duy NguyenMar 28, 2018
  10. Jeff KingMar 28, 2018
  11. 1/4 set_git_dir: die when setenv() failsJeff King, Mar 28, 2018
  12. 2/4 add chdir-notify APIJeff King, Mar 28, 2018
  13. Eric SunshineMar 28, 2018
  14. Jeff KingMar 28, 2018
  15. Duy NguyenMar 29, 2018
  16. Jeff KingMar 29, 2018
  17. Duy NguyenMar 29, 2018
  18. 3/4 set_work_tree: use chdir_notifyJeff King, Mar 28, 2018
  19. Duy NguyenMar 29, 2018
  20. Duy NguyenMar 29, 2018
  21. Jeff KingMar 29, 2018
  22. Jeff KingMar 29, 2018
  23. Duy NguyenMar 29, 2018
  24. Jeff KingMar 30, 2018
  25. 4/4 refs: use chdir_notify to update cached relative pathsJeff King, Mar 28, 2018
  26. 0/5 re-parenting relative directories after chdirJeff King, Mar 30, 2018
  27. 1/5 set_git_dir: die when setenv() failsJeff King, Mar 30, 2018
  28. 2/5 trace.c: export trace_setup_keyJeff King, Mar 30, 2018
  29. Junio C HamanoMar 30, 2018
  30. Jeff KingMar 30, 2018
  31. Junio C HamanoMar 30, 2018
  32. Jeff KingMar 30, 2018
  33. 3/5 add chdir-notify APIJeff King, Mar 30, 2018
  34. 4/5 set_work_tree: use chdir_notifyJeff King, Mar 30, 2018
  35. 5/5 refs: use chdir_notify to update cached relative pathsJeff King, Mar 30, 2018
  36. Duy NguyenMar 30, 2018
  37. Jeff KingMar 28, 2018
  38. 0/8 Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.Nguyễn Thái Ngọc Duy, Mar 28, 2018
  39. 1/8 strbuf.c: add strbuf_ensure_trailing_dr_sep()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  40. 2/8 strbuf.c: reintroduce get_pwd_cwd() (with strbuf_ prefix)Nguyễn Thái Ngọc Duy, Mar 28, 2018
  41. Stefan BellerMar 28, 2018
  42. Duy NguyenMar 28, 2018
  43. 3/8 trace.c: export trace_setup_keyNguyễn Thái Ngọc Duy, Mar 28, 2018
  44. 4/8 setup.c: introduce setup_adjust_path()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  45. 5/8 setup.c: allow other code to be notified when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  46. 6/8 environment.c: adjust env containing relpath when $CWD is movedNguyễn Thái Ngọc Duy, Mar 28, 2018
  47. Jeff KingMar 28, 2018
  48. Duy NguyenMar 28, 2018
  49. 8/8 refs: adjust main repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  50. 7/8 repository: adjust repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  51. Jeff KingMar 28, 2018
  52. Duy NguyenMar 29, 2018
  53. Jeff KingMar 30, 2018
  54. Junio C HamanoMar 28, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.