merge-ll: rename from ll-merge

A long term (but rather minor) pet-peeve of mine was the name
ll-merge.[ch].  I thought it made it harder to realize what stuff was
related to merging when I was working on the merge machinery and trying
to improve it.

Further, back in d1cbe1e6d8a ("hash-ll.h: split out of hash.h to remove
dependency on repository.h", 2023-04-22), we have split the portions of
hash.h that do not depend upon repository.h into a "hash-ll.h" (due to
the recommendation to use "ll" for "low-level" in its name[1], but which
I used as a suffix precisely because of my distaste for "ll-merge").
When we discussed adding additional "*-ll.h" files, a request was made
that we use "ll" consistently as either a prefix or a suffix.  Since it
is already in use as both a prefix and a suffix, the only way to do so
is to rename some files.

Besides my distaste for the ll-merge.[ch] name, let me also note that
the files
  ll-fsmonitor.h, ll-hash.h, ll-merge.h, ll-object-store.h, ll-read-cache.h
would have essentially nothing to do with each other and make no sense
to group.  But giving them the common "ll-" prefix would group them.  Using
"-ll" as a suffix thus seems just much more logical to me.  Rename
ll-merge.[ch] to merge-ll.[ch] to achieve this consistency, and to
ensure we get a more logical grouping of files.

[1] https://lore.kernel.org/git/kl6lsfcu1g8w.fsf@chooglen-macbookpro.roam.corp.google.com/

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt
index 487d4d83fff2a873e762a9fc57a6f392a68caad4..c2ba01828c6b01b258d4d77d46714db3fafb6e0a 100644 (file)
--- a/Documentation/technical/api-merge.txt
+++ b/Documentation/technical/api-merge.txt
@@ -28,9 +28,9 @@ and `diff.c` for examples.
 
 * `struct ll_merge_options`
 
-Check ll-merge.h for details.
+Check merge-ll.h for details.
 
 Low-level (single file) merge
 -----------------------------
 
-Check ll-merge.h for details.
+Check merge-ll.h for details.

diff --git a/Makefile b/Makefile
index e62db9460d91507cee45a53b61ed955acb8c955a..fb541dedc9fd557129d1bacaeb84357f6a86e892 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1051,7 +1051,6 @@ LIB_OBJS += linear-assignment.o
 LIB_OBJS += list-objects-filter-options.o
 LIB_OBJS += list-objects-filter.o
 LIB_OBJS += list-objects.o
-LIB_OBJS += ll-merge.o
 LIB_OBJS += lockfile.o
 LIB_OBJS += log-tree.o
 LIB_OBJS += ls-refs.o
@@ -1060,6 +1059,7 @@ LIB_OBJS += mailmap.o
 LIB_OBJS += match-trees.o
 LIB_OBJS += mem-pool.o
 LIB_OBJS += merge-blobs.o
+LIB_OBJS += merge-ll.o
 LIB_OBJS += merge-ort.o
 LIB_OBJS += merge-ort-wrappers.o
 LIB_OBJS += merge-recursive.o

diff --git a/apply.c b/apply.c
index 801f2bcc99c2b009b2f90c568bb5df865272cd2f..2f66f93fec583ddc67870c14859dd9f096776421 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -21,7 +21,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "xdiff-interface.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "lockfile.h"
 #include "name-hash.h"
 #include "object-name.h"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 716dcd4cae17fbbbd3e1b5d9be36005253a2cbcb..11e2359c5487b4069d5d9414673eff579bcbc807 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -13,7 +13,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "hook.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "lockfile.h"
 #include "mem-pool.h"
 #include "merge-recursive.h"

diff --git a/convert.c b/convert.c
index 89aeb9e72b9e483c676af97a9d7e7c632fe3a8fa..572d7123a92ee68fc1eb5766689ff929c388f543 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -15,7 +15,7 @@
 #include "sub-process.h"
 #include "trace.h"
 #include "utf8.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "wrapper.h"
 
 /*

diff --git a/diff.c b/diff.c
index 7fb9abe8915ffb9c8d4cbfef97cb676a153b3726..d02fbf507e5cd6f83e11b1b2bfc5e9df7d809474 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -26,7 +26,7 @@
 #include "submodule.h"
 #include "hashmap.h"
 #include "mem-pool.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "string-list.h"
 #include "strvec.h"
 #include "graph.h"

diff --git a/merge-blobs.c b/merge-blobs.c
index 5632ff6abb68146b3d6db6a96009a2454f4f339b..40c48e3eba62cf791578302cbb2992b6076522cd 100644 (file)
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "run-command.h"
 #include "xdiff-interface.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "blob.h"
 #include "merge-blobs.h"
 #include "object-store.h"

diff --git a/ll-merge.c b/merge-ll.c
similarity index 99%
rename from ll-merge.c
rename to merge-ll.c
index 07ec16e8e5bb59f091a1c41df123abce3cefe337..740b8c6bfdb72bd5cc9cf82285cf0c23e2476a79 100644 (file)
--- a/ll-merge.c
+++ b/merge-ll.c
@@ -10,7 +10,7 @@
 #include "attr.h"
 #include "xdiff-interface.h"
 #include "run-command.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "quote.h"
 #include "strbuf.h"
 #include "wrapper.h"

diff --git a/ll-merge.h b/merge-ll.h
similarity index 100%
rename from ll-merge.h
rename to merge-ll.h

diff --git a/merge-ort.c b/merge-ort.c
index 587eea980143e66eebf175996bfac5162f5c87b8..d88178dddf69416216f911c801f35c29d2011dc2 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -30,7 +30,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "entry.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "match-trees.h"
 #include "mem-pool.h"
 #include "object-name.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index 527dbbd010a7838074713efbb33ba535c12bb46a..35e1e7e1befd32f602f95258ee1bcc7ead6115a0 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -20,7 +20,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "lockfile.h"
 #include "match-trees.h"
 #include "name-hash.h"

diff --git a/notes-merge.c b/notes-merge.c
index 4b328d852cd31da915182939c29219de50e616a9..4be11a01550946f3efe77b2da3eab123ab95a195 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -12,7 +12,7 @@
 #include "diffcore.h"
 #include "hex.h"
 #include "xdiff-interface.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "dir.h"
 #include "notes.h"
 #include "notes-merge.h"

diff --git a/rerere.c b/rerere.c
index 35b9785d57331909704e3f8229461c339715879c..3584fecb07c59b22d6742ffb5ddb81c48e03f169 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -12,7 +12,7 @@
 #include "xdiff-interface.h"
 #include "dir.h"
 #include "resolve-undo.h"
-#include "ll-merge.h"
+#include "merge-ll.h"
 #include "attr.h"
 #include "path.h"
 #include "pathspec.h"