8 static const char *fmt_merge_msg_usage
=
9 "git fmt-merge-msg [--log] [--no-log] [--file <file>]";
13 static int fmt_merge_msg_config(const char *key
, const char *value
, void *cb
)
15 if (!strcmp("merge.log", key
))
16 merge_log
= git_config_bool(key
, value
);
26 static void append_to_list(struct list
*list
, char *value
, void *payload
)
28 if (list
->nr
== list
->alloc
) {
30 list
->list
= xrealloc(list
->list
, sizeof(char *) * list
->alloc
);
31 list
->payload
= xrealloc(list
->payload
,
32 sizeof(char *) * list
->alloc
);
34 list
->payload
[list
->nr
] = payload
;
35 list
->list
[list
->nr
++] = value
;
38 static int find_in_list(struct list
*list
, char *value
)
42 for (i
= 0; i
< list
->nr
; i
++)
43 if (!strcmp(list
->list
[i
], value
))
49 static void free_list(struct list
*list
)
56 for (i
= 0; i
< list
->nr
; i
++) {
58 free(list
->payload
[i
]);
62 list
->nr
= list
->alloc
= 0;
66 struct list branch
, tag
, r_branch
, generic
;
70 static struct list srcs
= { NULL
, NULL
, 0, 0};
71 static struct list origins
= { NULL
, NULL
, 0, 0};
73 static int handle_line(char *line
)
75 int i
, len
= strlen(line
);
78 struct src_data
*src_data
;
81 if (len
< 43 || line
[40] != '\t')
84 if (!prefixcmp(line
+ 41, "not-for-merge"))
92 i
= get_sha1(line
, sha1
);
97 if (line
[len
- 1] == '\n')
101 src
= strstr(line
, " of ");
111 i
= find_in_list(&srcs
, src
);
114 append_to_list(&srcs
, xstrdup(src
),
115 xcalloc(1, sizeof(struct src_data
)));
117 src_data
= srcs
.payload
[i
];
120 origin
= xstrdup(src
);
121 src_data
->head_status
|= 1;
122 } else if (!prefixcmp(line
, "branch ")) {
123 origin
= xstrdup(line
+ 7);
124 append_to_list(&src_data
->branch
, origin
, NULL
);
125 src_data
->head_status
|= 2;
126 } else if (!prefixcmp(line
, "tag ")) {
128 append_to_list(&src_data
->tag
, xstrdup(origin
+ 4), NULL
);
129 src_data
->head_status
|= 2;
130 } else if (!prefixcmp(line
, "remote branch ")) {
131 origin
= xstrdup(line
+ 14);
132 append_to_list(&src_data
->r_branch
, origin
, NULL
);
133 src_data
->head_status
|= 2;
135 origin
= xstrdup(src
);
136 append_to_list(&src_data
->generic
, xstrdup(line
), NULL
);
137 src_data
->head_status
|= 2;
140 if (!strcmp(".", src
) || !strcmp(src
, origin
)) {
141 int len
= strlen(origin
);
142 if (origin
[0] == '\'' && origin
[len
- 1] == '\'') {
143 origin
= xmemdupz(origin
+ 1, len
- 2);
145 origin
= xstrdup(origin
);
148 char *new_origin
= xmalloc(strlen(origin
) + strlen(src
) + 5);
149 sprintf(new_origin
, "%s of %s", origin
, src
);
152 append_to_list(&origins
, origin
, sha1
);
156 static void print_joined(const char *singular
, const char *plural
,
157 struct list
*list
, struct strbuf
*out
)
162 strbuf_addf(out
, "%s%s", singular
, list
->list
[0]);
165 strbuf_addstr(out
, plural
);
166 for (i
= 0; i
< list
->nr
- 1; i
++)
167 strbuf_addf(out
, "%s%s", i
> 0 ? ", " : "", list
->list
[i
]);
168 strbuf_addf(out
, " and %s", list
->list
[list
->nr
- 1]);
172 static void shortlog(const char *name
, unsigned char *sha1
,
173 struct commit
*head
, struct rev_info
*rev
, int limit
,
177 struct commit
*commit
;
178 struct object
*branch
;
179 struct list subjects
= { NULL
, NULL
, 0, 0 };
180 int flags
= UNINTERESTING
| TREESAME
| SEEN
| SHOWN
| ADDED
;
182 branch
= deref_tag(parse_object(sha1
), sha1_to_hex(sha1
), 40);
183 if (!branch
|| branch
->type
!= OBJ_COMMIT
)
186 setup_revisions(0, NULL
, rev
, NULL
);
187 rev
->ignore_merges
= 1;
188 add_pending_object(rev
, branch
, name
);
189 add_pending_object(rev
, &head
->object
, "^HEAD");
190 head
->object
.flags
|= UNINTERESTING
;
191 if (prepare_revision_walk(rev
))
192 die("revision walk setup failed");
193 while ((commit
= get_revision(rev
)) != NULL
) {
194 char *oneline
, *bol
, *eol
;
197 if (commit
->parents
&& commit
->parents
->next
)
201 if (subjects
.nr
> limit
)
204 bol
= strstr(commit
->buffer
, "\n\n");
209 } while (isspace(c
));
215 append_to_list(&subjects
, xstrdup(sha1_to_hex(
216 commit
->object
.sha1
)),
221 eol
= strchr(bol
, '\n');
223 oneline
= xmemdupz(bol
, eol
- bol
);
225 oneline
= xstrdup(bol
);
227 append_to_list(&subjects
, oneline
, NULL
);
231 strbuf_addf(out
, "\n* %s: (%d commits)\n", name
, count
);
233 strbuf_addf(out
, "\n* %s:\n", name
);
235 for (i
= 0; i
< subjects
.nr
; i
++)
237 strbuf_addf(out
, " ...\n");
239 strbuf_addf(out
, " %s\n", subjects
.list
[i
]);
241 clear_commit_marks((struct commit
*)branch
, flags
);
242 clear_commit_marks(head
, flags
);
243 free_commit_list(rev
->commits
);
247 free_list(&subjects
);
250 int fmt_merge_msg(int merge_log
, struct strbuf
*in
, struct strbuf
*out
) {
251 int limit
= 20, i
= 0, pos
= 0;
253 char *p
= line
, *sep
= "";
254 unsigned char head_sha1
[20];
255 const char *current_branch
;
257 /* get current branch */
258 current_branch
= resolve_ref("HEAD", head_sha1
, 1, NULL
);
260 die("No current branch");
261 if (!prefixcmp(current_branch
, "refs/heads/"))
262 current_branch
+= 11;
265 while (pos
< in
->len
) {
270 newline
= strchr(p
, '\n');
271 len
= newline
? newline
- p
: strlen(p
);
272 pos
+= len
+ !!newline
;
276 die ("Error in line %d: %.*s", i
, len
, p
);
279 strbuf_addstr(out
, "Merge ");
280 for (i
= 0; i
< srcs
.nr
; i
++) {
281 struct src_data
*src_data
= srcs
.payload
[i
];
282 const char *subsep
= "";
284 strbuf_addstr(out
, sep
);
287 if (src_data
->head_status
== 1) {
288 strbuf_addstr(out
, srcs
.list
[i
]);
291 if (src_data
->head_status
== 3) {
293 strbuf_addstr(out
, "HEAD");
295 if (src_data
->branch
.nr
) {
296 strbuf_addstr(out
, subsep
);
298 print_joined("branch ", "branches ", &src_data
->branch
,
301 if (src_data
->r_branch
.nr
) {
302 strbuf_addstr(out
, subsep
);
304 print_joined("remote branch ", "remote branches ",
305 &src_data
->r_branch
, out
);
307 if (src_data
->tag
.nr
) {
308 strbuf_addstr(out
, subsep
);
310 print_joined("tag ", "tags ", &src_data
->tag
, out
);
312 if (src_data
->generic
.nr
) {
313 strbuf_addstr(out
, subsep
);
314 print_joined("commit ", "commits ", &src_data
->generic
,
317 if (strcmp(".", srcs
.list
[i
]))
318 strbuf_addf(out
, " of %s", srcs
.list
[i
]);
321 if (!strcmp("master", current_branch
))
322 strbuf_addch(out
, '\n');
324 strbuf_addf(out
, " into %s\n", current_branch
);
330 head
= lookup_commit(head_sha1
);
331 init_revisions(&rev
, NULL
);
332 rev
.commit_format
= CMIT_FMT_ONELINE
;
333 rev
.ignore_merges
= 1;
336 for (i
= 0; i
< origins
.nr
; i
++)
337 shortlog(origins
.list
[i
], origins
.payload
[i
],
338 head
, &rev
, limit
, out
);
343 int cmd_fmt_merge_msg(int argc
, const char **argv
, const char *prefix
)
346 struct strbuf input
, output
;
349 git_config(fmt_merge_msg_config
, NULL
);
352 if (!strcmp(argv
[1], "--log"))
354 else if (!strcmp(argv
[1], "--no-log"))
356 else if (!strcmp(argv
[1], "-F") || !strcmp(argv
[1], "--file")) {
359 if (!strcmp(argv
[2], "-"))
363 in
= fopen(argv
[2], "r");
365 die("cannot open %s", argv
[2]);
374 usage(fmt_merge_msg_usage
);
376 strbuf_init(&input
, 0);
377 if (strbuf_read(&input
, fileno(in
), 0) < 0)
378 die("could not read input file %s", strerror(errno
));
379 strbuf_init(&output
, 0);
381 ret
= fmt_merge_msg(merge_log
, &input
, &output
);
384 printf("%s", output
.buf
);