This changes the argument of diff_setup() from an integer that
says if we are feeding reversed diff to a bitmask, so that later
global options can be added more easily.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int match_nonexisting = 0;
static int detect_rename = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int match_nonexisting = 0;
static int detect_rename = 0;
-static int reverse_diff = 0;
+static int diff_setup_opt = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
continue;
}
if (!strcmp(arg, "-R")) {
continue;
}
if (!strcmp(arg, "-R")) {
+ diff_setup_opt |= DIFF_SETUP_REVERSE;
continue;
}
if (!strcmp(arg, "-S")) {
continue;
}
if (!strcmp(arg, "-S")) {
usage(diff_cache_usage);
/* The rest is for paths restriction. */
usage(diff_cache_usage);
/* The rest is for paths restriction. */
- diff_setup(reverse_diff);
+ diff_setup(diff_setup_opt);
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
-static int reverse_diff = 0;
+static int diff_setup_opt = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int silent = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int silent = 0;
else if (!strcmp(argv[1], "-z"))
diff_output_format = DIFF_FORMAT_MACHINE;
else if (!strcmp(argv[1], "-R"))
else if (!strcmp(argv[1], "-z"))
diff_output_format = DIFF_FORMAT_MACHINE;
else if (!strcmp(argv[1], "-R"))
+ diff_setup_opt |= DIFF_SETUP_REVERSE;
else if (!strcmp(argv[1], "-S"))
pickaxe = argv[1] + 2;
else if (!strncmp(argv[1], "-M", 2)) {
else if (!strcmp(argv[1], "-S"))
pickaxe = argv[1] + 2;
else if (!strncmp(argv[1], "-M", 2)) {
- diff_setup(reverse_diff);
+ diff_setup(diff_setup_opt);
for (i = 0; i < entries; i++) {
struct stat st;
for (i = 0; i < entries; i++) {
struct stat st;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
-static int reverse_diff = 0;
+static int diff_setup_opt = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static const char *header = NULL;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static const char *header = NULL;
static void call_diff_setup(void)
{
static void call_diff_setup(void)
{
- diff_setup(reverse_diff);
+ diff_setup(diff_setup_opt);
}
static int call_diff_flush(void)
}
static int call_diff_flush(void)
continue;
}
if (!strcmp(arg, "-R")) {
continue;
}
if (!strcmp(arg, "-R")) {
+ diff_setup_opt |= DIFF_SETUP_REVERSE;
continue;
}
if (!strcmp(arg, "-p")) {
continue;
}
if (!strcmp(arg, "-p")) {
run_external_diff(pgm, name, other, one, two, xfrm_msg);
}
run_external_diff(pgm, name, other, one, two, xfrm_msg);
}
-void diff_setup(int reverse_diff_)
+void diff_setup(int flags)
- reverse_diff = reverse_diff_;
+ if (flags & DIFF_SETUP_REVERSE)
+ reverse_diff = 1;
}
struct diff_queue_struct diff_queued_diff;
}
struct diff_queue_struct diff_queued_diff;
extern int diff_scoreopt_parse(const char *opt);
extern int diff_scoreopt_parse(const char *opt);
-#define DIFF_FORMAT_HUMAN 0
-#define DIFF_FORMAT_MACHINE 1
-#define DIFF_FORMAT_PATCH 2
-#define DIFF_FORMAT_NO_OUTPUT 3
-extern void diff_setup(int reverse);
+#define DIFF_SETUP_REVERSE 1
+extern void diff_setup(int flags);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
extern int diff_queue_is_empty(void);
extern int diff_queue_is_empty(void);
+#define DIFF_FORMAT_HUMAN 0
+#define DIFF_FORMAT_MACHINE 1
+#define DIFF_FORMAT_PATCH 2
+#define DIFF_FORMAT_NO_OUTPUT 3
+
extern void diff_flush(int output_style, int resolve_rename_copy);
#endif /* DIFF_H */
extern void diff_flush(int output_style, int resolve_rename_copy);
#endif /* DIFF_H */