Revert "Convert output messages in merge-recursive to past tense."
During a conflicting merge, you would typically see: Auto-merged foo.txt CONFLICT (content): Merge conflict in foo.txt Recorded preimage for 'foo.txt' Automatic merge failed; fix conflicts and then commit the result. and left wondering what happened to "foo.txt". Did it succeed, and then conflicted, and then what? This is because historically there was a progress bar displayed before the auto-merge is mentioned, and it was expected to take long time, before we can say "Auto-merged foo.txt". It turns out it was not the case, and the original wording "Auto-merging foo.txt" we used to have before 89f40be (Convert output messages in merge-recursive to past tense., 2007-01-14) is better. Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan del Strother committed
Aug 22, 2008 at 18:18 UTC
a19a424010970a076a51afb4b378c9edcd908ff9
1 file changed
+18
-18
builtin-merge-recursive.c
+18
-18
@@ -729,13 +729,13 @@ static void conflict_rename_rename(struct rename *ren1,
729
const char *dst_name2 = ren2_dst;
730
if (string_list_has_string(¤t_directory_set, ren1_dst)) {
731
dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
732
- output(1, "%s is a directory in %s added as %s instead",
732
+ output(1, "%s is a directory in %s adding as %s instead",
733
ren1_dst, branch2, dst_name1);
734
remove_file(0, ren1_dst, 0);
735
}
736
if (string_list_has_string(¤t_directory_set, ren2_dst)) {
737
dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
738
- output(1, "%s is a directory in %s added as %s instead",
738
+ output(1, "%s is a directory in %s adding as %s instead",
739
ren2_dst, branch1, dst_name2);
740
remove_file(0, ren2_dst, 0);
741
}
@@ -760,7 +760,7 @@ static void conflict_rename_dir(struct rename *ren1,
760
const char *branch1)
761
{
762
char *new_path = unique_path(ren1->pair->two->path, branch1);
763
- output(1, "Renamed %s to %s instead", ren1->pair->one->path, new_path);
763
+ output(1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
764
remove_file(0, ren1->pair->two->path, 0);
765
update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
766
free(new_path);
@@ -773,7 +773,7 @@ static void conflict_rename_rename_2(struct rename *ren1,
773
{
774
char *new_path1 = unique_path(ren1->pair->two->path, branch1);
775
char *new_path2 = unique_path(ren2->pair->two->path, branch2);
776
- output(1, "Renamed %s to %s and %s to %s instead",
776
+ output(1, "Renaming %s to %s and %s to %s instead",
777
ren1->pair->one->path, new_path1,
778
ren2->pair->one->path, new_path2);
779
remove_file(0, ren1->pair->two->path, 0);
@@ -887,10 +887,10 @@ static int process_renames(struct string_list *a_renames,
887
branch1,
888
branch2);
889
if (mfi.merge || !mfi.clean)
890
- output(1, "Renamed %s->%s", src, ren1_dst);
890
+ output(1, "Renaming %s->%s", src, ren1_dst);
891
892
if (mfi.merge)
893
- output(2, "Auto-merged %s", ren1_dst);
893
+ output(2, "Auto-merging %s", ren1_dst);
894
895
if (!mfi.clean) {
896
output(1, "CONFLICT (content): merge conflict in %s",
@@ -924,14 +924,14 @@ static int process_renames(struct string_list *a_renames,
924
925
if (string_list_has_string(¤t_directory_set, ren1_dst)) {
926
clean_merge = 0;
927
- output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s "
927
+ output(1, "CONFLICT (rename/directory): Rename %s->%s in %s "
928
" directory %s added in %s",
929
ren1_src, ren1_dst, branch1,
930
ren1_dst, branch2);
931
conflict_rename_dir(ren1, branch1);
932
} else if (sha_eq(src_other.sha1, null_sha1)) {
933
clean_merge = 0;
934
- output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s "
934
+ output(1, "CONFLICT (rename/delete): Rename %s->%s in %s "
935
"and deleted in %s",
936
ren1_src, ren1_dst, branch1,
937
branch2);
@@ -940,19 +940,19 @@ static int process_renames(struct string_list *a_renames,
940
const char *new_path;
941
clean_merge = 0;
942
try_merge = 1;
943
- output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. "
943
+ output(1, "CONFLICT (rename/add): Rename %s->%s in %s. "
944
"%s added in %s",
945
ren1_src, ren1_dst, branch1,
946
ren1_dst, branch2);
947
new_path = unique_path(ren1_dst, branch2);
948
- output(1, "Added as %s instead", new_path);
948
+ output(1, "Adding as %s instead", new_path);
949
update_file(0, dst_other.sha1, dst_other.mode, new_path);
950
} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
951
ren2 = item->util;
952
clean_merge = 0;
953
ren2->processed = 1;
954
- output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. "
955
- "Renamed %s->%s in %s",
954
+ output(1, "CONFLICT (rename/rename): Rename %s->%s in %s. "
955
+ "Rename %s->%s in %s",
956
ren1_src, ren1_dst, branch1,
957
ren2->pair->one->path, ren2->pair->two->path, branch2);
958
conflict_rename_rename_2(ren1, branch1, ren2, branch2);
@@ -986,9 +986,9 @@ static int process_renames(struct string_list *a_renames,
986
output(3, "Skipped %s (merged same as existing)", ren1_dst);
987
else {
988
if (mfi.merge || !mfi.clean)
989
- output(1, "Renamed %s => %s", ren1_src, ren1_dst);
989
+ output(1, "Renaming %s => %s", ren1_src, ren1_dst);
990
if (mfi.merge)
991
- output(2, "Auto-merged %s", ren1_dst);
991
+ output(2, "Auto-merging %s", ren1_dst);
992
if (!mfi.clean) {
993
output(1, "CONFLICT (rename/modify): Merge conflict in %s",
994
ren1_dst);
@@ -1039,7 +1039,7 @@ static int process_entry(const char *path, struct stage_data *entry,
1039
/* Deleted in both or deleted in one and
1040
* unchanged in the other */
1041
if (a_sha)
1042
- output(2, "Removed %s", path);
1042
+ output(2, "Removing %s", path);
1043
/* do not touch working file if it did not exist */
1044
remove_file(1, path, !a_sha);
1045
} else {
@@ -1086,12 +1086,12 @@ static int process_entry(const char *path, struct stage_data *entry,
1086
const char *new_path = unique_path(path, add_branch);
1087
clean_merge = 0;
1088
output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
1089
- "Added %s as %s",
1089
+ "Adding %s as %s",
1090
conf, path, other_branch, path, new_path);
1091
remove_file(0, path, 0);
1092
update_file(0, sha, mode, new_path);
1093
} else {
1094
- output(2, "Added %s", path);
1094
+ output(2, "Adding %s", path);
1095
update_file(1, sha, mode, path);
1096
}
1097
} else if (a_sha && b_sha) {
@@ -1105,7 +1105,7 @@ static int process_entry(const char *path, struct stage_data *entry,
1105
reason = "add/add";
1106
o_sha = (unsigned char *)null_sha1;
1107
}
1108
- output(2, "Auto-merged %s", path);
1108
+ output(2, "Auto-merging %s", path);
1109
o.path = a.path = b.path = (char *)path;
1110
hashcpy(o.sha1, o_sha);
1111
o.mode = o_mode;