parse-opt: migrate builtin-merge-file.
Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Pierre Habouzit committed
Oct 2, 2008 at 14:59 UTC
d249610792c6a42a7d51c2f5790025569f6cb5fd
1 file changed
+37
-31
builtin-merge-file.c
+37
-31
@@ -2,21 +2,44 @@
2
#include "cache.h"
3
#include "xdiff/xdiff.h"
4
#include "xdiff-interface.h"
5
+#include "parse-options.h"
6
6
-static const char merge_file_usage[] =
7
-"git merge-file [-p | --stdout] [--diff3] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
7
+static const char *const merge_file_usage[] = {
8
+ "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2",
9
+ NULL
10
+};
11
+
12
+static int label_cb(const struct option *opt, const char *arg, int unset)
13
+{
14
+ static int label_count = 0;
15
+ const char **names = (const char **)opt->value;
16
+
17
+ if (label_count >= 3)
18
+ return error("too many labels on the command line");
19
+ names[label_count++] = arg;
20
+ return 0;
21
+}
22
23
int cmd_merge_file(int argc, const char **argv, const char *prefix)
24
{
11
- const char *names[3];
25
+ const char *names[3] = { NULL, NULL, NULL };
26
mmfile_t mmfs[3];
27
mmbuffer_t result = {NULL, 0};
28
xpparam_t xpp = {XDF_NEED_MINIMAL};
29
int ret = 0, i = 0, to_stdout = 0;
30
int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
17
- int merge_style = 0;
31
+ int merge_style = 0, quiet = 0;
32
int nongit;
33
34
+ struct option options[] = {
35
+ OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
36
+ OPT_SET_INT(0, "diff3", &merge_style, "use a diff3 based merge", XDL_MERGE_DIFF3),
37
+ OPT__QUIET(&quiet),
38
+ OPT_CALLBACK('L', NULL, names, "name",
39
+ "set labels for file1/orig_file/file2", &label_cb),
40
+ OPT_END(),
41
+ };
42
+
43
prefix = setup_git_directory_gently(&nongit);
44
if (!nongit) {
45
/* Read the configuration file */
@@ -25,37 +48,20 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
48
merge_style = git_xmerge_style;
49
}
50
28
- while (argc > 4) {
29
- if (!strcmp(argv[1], "-L") && i < 3) {
30
- names[i++] = argv[2];
31
- argc--;
32
- argv++;
33
- } else if (!strcmp(argv[1], "-p") ||
34
- !strcmp(argv[1], "--stdout"))
35
- to_stdout = 1;
36
- else if (!strcmp(argv[1], "-q") ||
37
- !strcmp(argv[1], "--quiet"))
38
- freopen("/dev/null", "w", stderr);
39
- else if (!strcmp(argv[1], "--diff3"))
40
- merge_style = XDL_MERGE_DIFF3;
41
- else
42
- usage(merge_file_usage);
43
- argc--;
44
- argv++;
45
- }
46
-
47
- if (argc != 4)
48
- usage(merge_file_usage);
49
-
50
- for (; i < 3; i++)
51
- names[i] = argv[i + 1];
51
+ argc = parse_options(argc, argv, options, merge_file_usage, 0);
52
+ if (argc != 3)
53
+ usage_with_options(merge_file_usage, options);
54
+ if (quiet)
55
+ freopen("/dev/null", "w", stderr);
56
57
for (i = 0; i < 3; i++) {
54
- if (read_mmfile(mmfs + i, argv[i + 1]))
58
+ if (!names[i])
59
+ names[i] = argv[i];
60
+ if (read_mmfile(mmfs + i, argv[i]))
61
return -1;
62
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
63
return error("Cannot merge binary files: %s\n",
58
- argv[i + 1]);
64
+ argv[i]);
65
}
66
67
ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
@@ -65,7 +71,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
71
free(mmfs[i].ptr);
72
73
if (ret >= 0) {
68
- const char *filename = argv[1];
74
+ const char *filename = argv[0];
75
FILE *f = to_stdout ? stdout : fopen(filename, "wb");
76
77
if (!f)