[PATCH] diff: Fix docs and add -O to diff-helper.
This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>maint
parent
355e76a4a3
commit
ce24067549
|
@ -57,7 +57,8 @@ OPTIONS
|
||||||
<orderfile>, which has one shell glob pattern per line.
|
<orderfile>, which has one shell glob pattern per line.
|
||||||
|
|
||||||
-R::
|
-R::
|
||||||
Output diff in reverse.
|
Swap two inputs; that is, show differences from cache or
|
||||||
|
on-disk file to tree contents.
|
||||||
|
|
||||||
--cached::
|
--cached::
|
||||||
do not consider the on-disk file at all
|
do not consider the on-disk file at all
|
||||||
|
|
|
@ -27,7 +27,8 @@ OPTIONS
|
||||||
Remain silent even on nonexisting files
|
Remain silent even on nonexisting files
|
||||||
|
|
||||||
-R::
|
-R::
|
||||||
Output diff in reverse.
|
Swap two inputs; that is, show differences from on-disk files
|
||||||
|
to cache contents.
|
||||||
|
|
||||||
-B::
|
-B::
|
||||||
Break complete rewrite changes into pairs of delete and create.
|
Break complete rewrite changes into pairs of delete and create.
|
||||||
|
|
|
@ -9,7 +9,7 @@ git-diff-helper - Generates patch format output for git-diff-*
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-diff-helper' [-z] [-S<string>]
|
'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -24,6 +24,9 @@ OPTIONS
|
||||||
-S<string>::
|
-S<string>::
|
||||||
Look for differences that contains the change in <string>.
|
Look for differences that contains the change in <string>.
|
||||||
|
|
||||||
|
-O<orderfile>::
|
||||||
|
Output the patch in the order specified in the
|
||||||
|
<orderfile>, which has one shell glob pattern per line.
|
||||||
|
|
||||||
See Also
|
See Also
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -43,7 +43,7 @@ OPTIONS
|
||||||
Detect copies as well as renames.
|
Detect copies as well as renames.
|
||||||
|
|
||||||
-R::
|
-R::
|
||||||
Output diff in reverse.
|
Swap two input trees.
|
||||||
|
|
||||||
-S<string>::
|
-S<string>::
|
||||||
Look for differences that contains the change in <string>.
|
Look for differences that contains the change in <string>.
|
||||||
|
|
|
@ -157,7 +157,7 @@ static void mark_merge_entries(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *diff_cache_usage =
|
static char *diff_cache_usage =
|
||||||
"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
|
"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]";
|
||||||
|
|
||||||
int main(int argc, const char **argv)
|
int main(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "diff.h"
|
#include "diff.h"
|
||||||
|
|
||||||
static const char *diff_files_usage =
|
static const char *diff_files_usage =
|
||||||
"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
|
"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [paths...]";
|
||||||
|
|
||||||
static int diff_output_format = DIFF_FORMAT_HUMAN;
|
static int diff_output_format = DIFF_FORMAT_HUMAN;
|
||||||
static int detect_rename = 0;
|
static int detect_rename = 0;
|
||||||
|
|
|
@ -7,11 +7,22 @@
|
||||||
|
|
||||||
static const char *pickaxe = NULL;
|
static const char *pickaxe = NULL;
|
||||||
static int pickaxe_opts = 0;
|
static int pickaxe_opts = 0;
|
||||||
|
static const char *orderfile = NULL;
|
||||||
static int line_termination = '\n';
|
static int line_termination = '\n';
|
||||||
static int inter_name_termination = '\t';
|
static int inter_name_termination = '\t';
|
||||||
|
|
||||||
|
static void flush_them(int ac, const char **av)
|
||||||
|
{
|
||||||
|
diffcore_std(av + 1,
|
||||||
|
0, 0, /* no renames */
|
||||||
|
pickaxe, pickaxe_opts,
|
||||||
|
-1, /* no breaks */
|
||||||
|
orderfile);
|
||||||
|
diff_flush(DIFF_FORMAT_PATCH, 0);
|
||||||
|
}
|
||||||
|
|
||||||
static const char *diff_helper_usage =
|
static const char *diff_helper_usage =
|
||||||
"git-diff-helper [-z] [-S<string>] paths...";
|
"git-diff-helper [-z] [-S<string>] [-O<orderfile>] paths...";
|
||||||
|
|
||||||
int main(int ac, const char **av) {
|
int main(int ac, const char **av) {
|
||||||
struct strbuf sb;
|
struct strbuf sb;
|
||||||
|
@ -131,17 +142,9 @@ int main(int ac, const char **av) {
|
||||||
new_path);
|
new_path);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (1 < ac)
|
flush_them(ac, av);
|
||||||
diffcore_pathspec(av + 1);
|
|
||||||
if (pickaxe)
|
|
||||||
diffcore_pickaxe(pickaxe, pickaxe_opts);
|
|
||||||
diff_flush(DIFF_FORMAT_PATCH, 0);
|
|
||||||
printf(garbage_flush_format, sb.buf);
|
printf(garbage_flush_format, sb.buf);
|
||||||
}
|
}
|
||||||
if (1 < ac)
|
flush_them(ac, av);
|
||||||
diffcore_pathspec(av + 1);
|
|
||||||
if (pickaxe)
|
|
||||||
diffcore_pickaxe(pickaxe, pickaxe_opts);
|
|
||||||
diff_flush(DIFF_FORMAT_PATCH, 0);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -397,7 +397,7 @@ static int diff_tree_stdin(char *line)
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *diff_tree_usage =
|
static char *diff_tree_usage =
|
||||||
"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
|
"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
|
||||||
|
|
||||||
int main(int argc, const char **argv)
|
int main(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
|
|
10
diff.h
10
diff.h
|
@ -35,21 +35,13 @@ extern int diff_scoreopt_parse(const char *opt);
|
||||||
#define DIFF_SETUP_REVERSE 1
|
#define DIFF_SETUP_REVERSE 1
|
||||||
#define DIFF_SETUP_USE_CACHE 2
|
#define DIFF_SETUP_USE_CACHE 2
|
||||||
#define DIFF_SETUP_USE_SIZE_CACHE 4
|
#define DIFF_SETUP_USE_SIZE_CACHE 4
|
||||||
|
|
||||||
extern void diff_setup(int flags);
|
extern void diff_setup(int flags);
|
||||||
|
|
||||||
#define DIFF_DETECT_RENAME 1
|
#define DIFF_DETECT_RENAME 1
|
||||||
#define DIFF_DETECT_COPY 2
|
#define DIFF_DETECT_COPY 2
|
||||||
|
|
||||||
extern void diffcore_rename(int rename_copy, int minimum_score);
|
|
||||||
|
|
||||||
#define DIFF_PICKAXE_ALL 1
|
#define DIFF_PICKAXE_ALL 1
|
||||||
extern void diffcore_pickaxe(const char *needle, int opts);
|
|
||||||
|
|
||||||
extern void diffcore_pathspec(const char **pathspec);
|
|
||||||
|
|
||||||
extern void diffcore_order(const char *orderfile);
|
|
||||||
|
|
||||||
extern void diffcore_break(int max_score);
|
|
||||||
|
|
||||||
extern void diffcore_std(const char **paths,
|
extern void diffcore_std(const char **paths,
|
||||||
int detect_rename, int rename_score,
|
int detect_rename, int rename_score,
|
||||||
|
|
|
@ -73,6 +73,12 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
|
||||||
struct diff_filespec *);
|
struct diff_filespec *);
|
||||||
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
|
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
|
||||||
|
|
||||||
|
extern void diffcore_pathspec(const char **pathspec);
|
||||||
|
extern void diffcore_break(int);
|
||||||
|
extern void diffcore_rename(int rename_copy, int);
|
||||||
|
extern void diffcore_pickaxe(const char *needle, int opts);
|
||||||
|
extern void diffcore_order(const char *orderfile);
|
||||||
|
|
||||||
#define DIFF_DEBUG 0
|
#define DIFF_DEBUG 0
|
||||||
#if DIFF_DEBUG
|
#if DIFF_DEBUG
|
||||||
void diff_debug_filespec(struct diff_filespec *, int, const char *);
|
void diff_debug_filespec(struct diff_filespec *, int, const char *);
|
||||||
|
|
Loading…
Reference in New Issue