submodule.c: move submodule merging to merge-recursive.c
In a later patch we want to improve submodule merging by using the output() function in merge-recursive.c for submodule merges to deliver a consistent UI to users. To do so we could either make the output() function globally available so we can use it in submodule.c#merge_submodule(), or we could integrate the submodule merging into the merging code. Choose the later as we generally want to move submodules closer into the core. Therefore we move any function related to merging submodules (merge_submodule(), find_first_merges() and print_commit) to merge-recursive.c. We'll keep add_submodule_odb() in submodule.c as it is used by other submodule functions. While at it, add a TODO note that we do not really like the function add_submodule_odb(). This commit is best viewed with --color-moved. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
May 15, 2018 at 13:00 UTC
18cfc0886617e28fb6d29d579bec0ffcdb439196
3 files changed
+170
-170
merge-recursive.c
+166
@@ -23,6 +23,7 @@
23
#include "merge-recursive.h"
24
#include "dir.h"
25
#include "submodule.h"
26
+#include "revision.h"
27
28
struct path_hashmap_entry {
29
struct hashmap_entry e;
@@ -977,6 +978,171 @@ static int merge_3way(struct merge_options *o,
978
return merge_status;
979
}
980
981
+static int find_first_merges(struct object_array *result, const char *path,
982
+ struct commit *a, struct commit *b)
983
+{
984
+ int i, j;
985
+ struct object_array merges = OBJECT_ARRAY_INIT;
986
+ struct commit *commit;
987
+ int contains_another;
988
+
989
+ char merged_revision[42];
990
+ const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
991
+ "--all", merged_revision, NULL };
992
+ struct rev_info revs;
993
+ struct setup_revision_opt rev_opts;
994
+
995
+ memset(result, 0, sizeof(struct object_array));
996
+ memset(&rev_opts, 0, sizeof(rev_opts));
997
+
998
+ /* get all revisions that merge commit a */
999
+ xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
1000
+ oid_to_hex(&a->object.oid));
1001
+ init_revisions(&revs, NULL);
1002
+ rev_opts.submodule = path;
1003
+ /* FIXME: can't handle linked worktrees in submodules yet */
1004
+ revs.single_worktree = path != NULL;
1005
+ setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1006
+
1007
+ /* save all revisions from the above list that contain b */
1008
+ if (prepare_revision_walk(&revs))
1009
+ die("revision walk setup failed");
1010
+ while ((commit = get_revision(&revs)) != NULL) {
1011
+ struct object *o = &(commit->object);
1012
+ if (in_merge_bases(b, commit))
1013
+ add_object_array(o, NULL, &merges);
1014
+ }
1015
+ reset_revision_walk();
1016
+
1017
+ /* Now we've got all merges that contain a and b. Prune all
1018
+ * merges that contain another found merge and save them in
1019
+ * result.
1020
+ */
1021
+ for (i = 0; i < merges.nr; i++) {
1022
+ struct commit *m1 = (struct commit *) merges.objects[i].item;
1023
+
1024
+ contains_another = 0;
1025
+ for (j = 0; j < merges.nr; j++) {
1026
+ struct commit *m2 = (struct commit *) merges.objects[j].item;
1027
+ if (i != j && in_merge_bases(m2, m1)) {
1028
+ contains_another = 1;
1029
+ break;
1030
+ }
1031
+ }
1032
+
1033
+ if (!contains_another)
1034
+ add_object_array(merges.objects[i].item, NULL, result);
1035
+ }
1036
+
1037
+ object_array_clear(&merges);
1038
+ return result->nr;
1039
+}
1040
+
1041
+static void print_commit(struct commit *commit)
1042
+{
1043
+ struct strbuf sb = STRBUF_INIT;
1044
+ struct pretty_print_context ctx = {0};
1045
+ ctx.date_mode.type = DATE_NORMAL;
1046
+ format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1047
+ fprintf(stderr, "%s\n", sb.buf);
1048
+ strbuf_release(&sb);
1049
+}
1050
+
1051
+#define MERGE_WARNING(path, msg) \
1052
+ warning("Failed to merge submodule %s (%s)", path, msg);
1053
+
1054
+static int merge_submodule(struct object_id *result, const char *path,
1055
+ const struct object_id *base, const struct object_id *a,
1056
+ const struct object_id *b, int search)
1057
+{
1058
+ struct commit *commit_base, *commit_a, *commit_b;
1059
+ int parent_count;
1060
+ struct object_array merges;
1061
+
1062
+ int i;
1063
+
1064
+ /* store a in result in case we fail */
1065
+ oidcpy(result, a);
1066
+
1067
+ /* we can not handle deletion conflicts */
1068
+ if (is_null_oid(base))
1069
+ return 0;
1070
+ if (is_null_oid(a))
1071
+ return 0;
1072
+ if (is_null_oid(b))
1073
+ return 0;
1074
+
1075
+ if (add_submodule_odb(path)) {
1076
+ MERGE_WARNING(path, "not checked out");
1077
+ return 0;
1078
+ }
1079
+
1080
+ if (!(commit_base = lookup_commit_reference(base)) ||
1081
+ !(commit_a = lookup_commit_reference(a)) ||
1082
+ !(commit_b = lookup_commit_reference(b))) {
1083
+ MERGE_WARNING(path, "commits not present");
1084
+ return 0;
1085
+ }
1086
+
1087
+ /* check whether both changes are forward */
1088
+ if (!in_merge_bases(commit_base, commit_a) ||
1089
+ !in_merge_bases(commit_base, commit_b)) {
1090
+ MERGE_WARNING(path, "commits don't follow merge-base");
1091
+ return 0;
1092
+ }
1093
+
1094
+ /* Case #1: a is contained in b or vice versa */
1095
+ if (in_merge_bases(commit_a, commit_b)) {
1096
+ oidcpy(result, b);
1097
+ return 1;
1098
+ }
1099
+ if (in_merge_bases(commit_b, commit_a)) {
1100
+ oidcpy(result, a);
1101
+ return 1;
1102
+ }
1103
+
1104
+ /*
1105
+ * Case #2: There are one or more merges that contain a and b in
1106
+ * the submodule. If there is only one, then present it as a
1107
+ * suggestion to the user, but leave it marked unmerged so the
1108
+ * user needs to confirm the resolution.
1109
+ */
1110
+
1111
+ /* Skip the search if makes no sense to the calling context. */
1112
+ if (!search)
1113
+ return 0;
1114
+
1115
+ /* find commit which merges them */
1116
+ parent_count = find_first_merges(&merges, path, commit_a, commit_b);
1117
+ switch (parent_count) {
1118
+ case 0:
1119
+ MERGE_WARNING(path, "merge following commits not found");
1120
+ break;
1121
+
1122
+ case 1:
1123
+ MERGE_WARNING(path, "not fast-forward");
1124
+ fprintf(stderr, "Found a possible merge resolution "
1125
+ "for the submodule:\n");
1126
+ print_commit((struct commit *) merges.objects[0].item);
1127
+ fprintf(stderr,
1128
+ "If this is correct simply add it to the index "
1129
+ "for example\n"
1130
+ "by using:\n\n"
1131
+ " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1132
+ "which will accept this suggestion.\n",
1133
+ oid_to_hex(&merges.objects[0].item->oid), path);
1134
+ break;
1135
+
1136
+ default:
1137
+ MERGE_WARNING(path, "multiple merges found");
1138
+ for (i = 0; i < merges.nr; i++)
1139
+ print_commit((struct commit *) merges.objects[i].item);
1140
+ }
1141
+
1142
+ object_array_clear(&merges);
1143
+ return 0;
1144
+}
1145
+
1146
static int merge_file_1(struct merge_options *o,
1147
const struct diff_filespec *one,
1148
const struct diff_filespec *a,
submodule.c
+2
-166
@@ -153,7 +153,8 @@ void stage_updated_gitmodules(struct index_state *istate)
153
die(_("staging updated .gitmodules failed"));
154
}
155
156
-static int add_submodule_odb(const char *path)
156
+/* TODO: remove this function, use repo_submodule_init instead. */
157
+int add_submodule_odb(const char *path)
158
{
159
struct strbuf objects_directory = STRBUF_INIT;
160
int ret = 0;
@@ -1701,171 +1702,6 @@ out:
1702
return ret;
1703
}
1704
1704
-static int find_first_merges(struct object_array *result, const char *path,
1705
- struct commit *a, struct commit *b)
1706
-{
1707
- int i, j;
1708
- struct object_array merges = OBJECT_ARRAY_INIT;
1709
- struct commit *commit;
1710
- int contains_another;
1711
-
1712
- char merged_revision[42];
1713
- const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
1714
- "--all", merged_revision, NULL };
1715
- struct rev_info revs;
1716
- struct setup_revision_opt rev_opts;
1717
-
1718
- memset(result, 0, sizeof(struct object_array));
1719
- memset(&rev_opts, 0, sizeof(rev_opts));
1720
-
1721
- /* get all revisions that merge commit a */
1722
- xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
1723
- oid_to_hex(&a->object.oid));
1724
- init_revisions(&revs, NULL);
1725
- rev_opts.submodule = path;
1726
- /* FIXME: can't handle linked worktrees in submodules yet */
1727
- revs.single_worktree = path != NULL;
1728
- setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1729
-
1730
- /* save all revisions from the above list that contain b */
1731
- if (prepare_revision_walk(&revs))
1732
- die("revision walk setup failed");
1733
- while ((commit = get_revision(&revs)) != NULL) {
1734
- struct object *o = &(commit->object);
1735
- if (in_merge_bases(b, commit))
1736
- add_object_array(o, NULL, &merges);
1737
- }
1738
- reset_revision_walk();
1739
-
1740
- /* Now we've got all merges that contain a and b. Prune all
1741
- * merges that contain another found merge and save them in
1742
- * result.
1743
- */
1744
- for (i = 0; i < merges.nr; i++) {
1745
- struct commit *m1 = (struct commit *) merges.objects[i].item;
1746
-
1747
- contains_another = 0;
1748
- for (j = 0; j < merges.nr; j++) {
1749
- struct commit *m2 = (struct commit *) merges.objects[j].item;
1750
- if (i != j && in_merge_bases(m2, m1)) {
1751
- contains_another = 1;
1752
- break;
1753
- }
1754
- }
1755
-
1756
- if (!contains_another)
1757
- add_object_array(merges.objects[i].item, NULL, result);
1758
- }
1759
-
1760
- object_array_clear(&merges);
1761
- return result->nr;
1762
-}
1763
-
1764
-static void print_commit(struct commit *commit)
1765
-{
1766
- struct strbuf sb = STRBUF_INIT;
1767
- struct pretty_print_context ctx = {0};
1768
- ctx.date_mode.type = DATE_NORMAL;
1769
- format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1770
- fprintf(stderr, "%s\n", sb.buf);
1771
- strbuf_release(&sb);
1772
-}
1773
-
1774
-#define MERGE_WARNING(path, msg) \
1775
- warning("Failed to merge submodule %s (%s)", path, msg);
1776
-
1777
-int merge_submodule(struct object_id *result, const char *path,
1778
- const struct object_id *base, const struct object_id *a,
1779
- const struct object_id *b, int search)
1780
-{
1781
- struct commit *commit_base, *commit_a, *commit_b;
1782
- int parent_count;
1783
- struct object_array merges;
1784
-
1785
- int i;
1786
-
1787
- /* store a in result in case we fail */
1788
- oidcpy(result, a);
1789
-
1790
- /* we can not handle deletion conflicts */
1791
- if (is_null_oid(base))
1792
- return 0;
1793
- if (is_null_oid(a))
1794
- return 0;
1795
- if (is_null_oid(b))
1796
- return 0;
1797
-
1798
- if (add_submodule_odb(path)) {
1799
- MERGE_WARNING(path, "not checked out");
1800
- return 0;
1801
- }
1802
-
1803
- if (!(commit_base = lookup_commit_reference(base)) ||
1804
- !(commit_a = lookup_commit_reference(a)) ||
1805
- !(commit_b = lookup_commit_reference(b))) {
1806
- MERGE_WARNING(path, "commits not present");
1807
- return 0;
1808
- }
1809
-
1810
- /* check whether both changes are forward */
1811
- if (!in_merge_bases(commit_base, commit_a) ||
1812
- !in_merge_bases(commit_base, commit_b)) {
1813
- MERGE_WARNING(path, "commits don't follow merge-base");
1814
- return 0;
1815
- }
1816
-
1817
- /* Case #1: a is contained in b or vice versa */
1818
- if (in_merge_bases(commit_a, commit_b)) {
1819
- oidcpy(result, b);
1820
- return 1;
1821
- }
1822
- if (in_merge_bases(commit_b, commit_a)) {
1823
- oidcpy(result, a);
1824
- return 1;
1825
- }
1826
-
1827
- /*
1828
- * Case #2: There are one or more merges that contain a and b in
1829
- * the submodule. If there is only one, then present it as a
1830
- * suggestion to the user, but leave it marked unmerged so the
1831
- * user needs to confirm the resolution.
1832
- */
1833
-
1834
- /* Skip the search if makes no sense to the calling context. */
1835
- if (!search)
1836
- return 0;
1837
-
1838
- /* find commit which merges them */
1839
- parent_count = find_first_merges(&merges, path, commit_a, commit_b);
1840
- switch (parent_count) {
1841
- case 0:
1842
- MERGE_WARNING(path, "merge following commits not found");
1843
- break;
1844
-
1845
- case 1:
1846
- MERGE_WARNING(path, "not fast-forward");
1847
- fprintf(stderr, "Found a possible merge resolution "
1848
- "for the submodule:\n");
1849
- print_commit((struct commit *) merges.objects[0].item);
1850
- fprintf(stderr,
1851
- "If this is correct simply add it to the index "
1852
- "for example\n"
1853
- "by using:\n\n"
1854
- " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1855
- "which will accept this suggestion.\n",
1856
- oid_to_hex(&merges.objects[0].item->oid), path);
1857
- break;
1858
-
1859
- default:
1860
- MERGE_WARNING(path, "multiple merges found");
1861
- for (i = 0; i < merges.nr; i++)
1862
- print_commit((struct commit *) merges.objects[i].item);
1863
- }
1864
-
1865
- object_array_clear(&merges);
1866
- return 0;
1867
-}
1868
-
1705
/*
1706
* Embeds a single submodules git directory into the superprojects git dir,
1707
* non recursively.
submodule.h
+2
-4
@@ -89,10 +89,8 @@ extern int submodule_uses_gitfile(const char *path);
89
#define SUBMODULE_REMOVAL_IGNORE_UNTRACKED (1<<1)
90
#define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2)
91
extern int bad_to_remove_submodule(const char *path, unsigned flags);
92
-extern int merge_submodule(struct object_id *result, const char *path,
93
- const struct object_id *base,
94
- const struct object_id *a,
95
- const struct object_id *b, int search);
92
+
93
+int add_submodule_odb(const char *path);
94
95
/* Checks if there are submodule changes in a..b. */
96
extern int submodule_touches_in_range(struct object_id *a,