mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
It does not make much sense to build git whose behaviour is different depending on the brokenness of diff implementation of the platform because the brokenness of the patch that is applied with the tool depends on brokenness of the diff the person who generates the patch uses. So we do not use NO_ACCURATE_DIFF anymore, but help people to apply patches that do not record incomplete lines correctly with a runtime flag. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
d2543b8ee3
commit
3eaa38da94
|
@ -125,6 +125,7 @@ struct patch {
|
||||||
unsigned long deflate_origlen;
|
unsigned long deflate_origlen;
|
||||||
int lines_added, lines_deleted;
|
int lines_added, lines_deleted;
|
||||||
int score;
|
int score;
|
||||||
|
int inaccurate_eof:1;
|
||||||
struct fragment *fragments;
|
struct fragment *fragments;
|
||||||
char *result;
|
char *result;
|
||||||
unsigned long resultsize;
|
unsigned long resultsize;
|
||||||
|
@ -1333,7 +1334,8 @@ static int apply_line(char *output, const char *patch, int plen)
|
||||||
return plen;
|
return plen;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
|
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag,
|
||||||
|
int inaccurate_eof)
|
||||||
{
|
{
|
||||||
int match_beginning, match_end;
|
int match_beginning, match_end;
|
||||||
char *buf = desc->buffer;
|
char *buf = desc->buffer;
|
||||||
|
@ -1386,13 +1388,11 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
|
||||||
size -= len;
|
size -= len;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef NO_ACCURATE_DIFF
|
if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
|
||||||
if (oldsize > 0 && old[oldsize - 1] == '\n' &&
|
|
||||||
newsize > 0 && new[newsize - 1] == '\n') {
|
newsize > 0 && new[newsize - 1] == '\n') {
|
||||||
oldsize--;
|
oldsize--;
|
||||||
newsize--;
|
newsize--;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
oldlines = old;
|
oldlines = old;
|
||||||
newlines = new;
|
newlines = new;
|
||||||
|
@ -1614,7 +1614,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
|
||||||
return apply_binary(desc, patch);
|
return apply_binary(desc, patch);
|
||||||
|
|
||||||
while (frag) {
|
while (frag) {
|
||||||
if (apply_one_fragment(desc, frag) < 0)
|
if (apply_one_fragment(desc, frag, patch->inaccurate_eof) < 0)
|
||||||
return error("patch failed: %s:%ld",
|
return error("patch failed: %s:%ld",
|
||||||
name, frag->oldpos);
|
name, frag->oldpos);
|
||||||
frag = frag->next;
|
frag = frag->next;
|
||||||
|
@ -2097,7 +2097,7 @@ static int use_patch(struct patch *p)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apply_patch(int fd, const char *filename)
|
static int apply_patch(int fd, const char *filename, int inaccurate_eof)
|
||||||
{
|
{
|
||||||
unsigned long offset, size;
|
unsigned long offset, size;
|
||||||
char *buffer = read_patch_file(fd, &size);
|
char *buffer = read_patch_file(fd, &size);
|
||||||
|
@ -2113,6 +2113,7 @@ static int apply_patch(int fd, const char *filename)
|
||||||
int nr;
|
int nr;
|
||||||
|
|
||||||
patch = xcalloc(1, sizeof(*patch));
|
patch = xcalloc(1, sizeof(*patch));
|
||||||
|
patch->inaccurate_eof = inaccurate_eof;
|
||||||
nr = parse_chunk(buffer + offset, size, patch);
|
nr = parse_chunk(buffer + offset, size, patch);
|
||||||
if (nr < 0)
|
if (nr < 0)
|
||||||
break;
|
break;
|
||||||
|
@ -2180,6 +2181,8 @@ int cmd_apply(int argc, const char **argv, char **envp)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int read_stdin = 1;
|
int read_stdin = 1;
|
||||||
|
int inaccurate_eof = 0;
|
||||||
|
|
||||||
const char *whitespace_option = NULL;
|
const char *whitespace_option = NULL;
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
|
@ -2188,7 +2191,7 @@ int cmd_apply(int argc, const char **argv, char **envp)
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
if (!strcmp(arg, "-")) {
|
if (!strcmp(arg, "-")) {
|
||||||
apply_patch(0, "<stdin>");
|
apply_patch(0, "<stdin>", inaccurate_eof);
|
||||||
read_stdin = 0;
|
read_stdin = 0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -2265,6 +2268,10 @@ int cmd_apply(int argc, const char **argv, char **envp)
|
||||||
parse_whitespace_option(arg + 13);
|
parse_whitespace_option(arg + 13);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (!strcmp(arg, "--inaccurate-eof")) {
|
||||||
|
inaccurate_eof = 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (check_index && prefix_length < 0) {
|
if (check_index && prefix_length < 0) {
|
||||||
prefix = setup_git_directory();
|
prefix = setup_git_directory();
|
||||||
|
@ -2281,12 +2288,12 @@ int cmd_apply(int argc, const char **argv, char **envp)
|
||||||
usage(apply_usage);
|
usage(apply_usage);
|
||||||
read_stdin = 0;
|
read_stdin = 0;
|
||||||
set_default_whitespace_mode(whitespace_option);
|
set_default_whitespace_mode(whitespace_option);
|
||||||
apply_patch(fd, arg);
|
apply_patch(fd, arg, inaccurate_eof);
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
set_default_whitespace_mode(whitespace_option);
|
set_default_whitespace_mode(whitespace_option);
|
||||||
if (read_stdin)
|
if (read_stdin)
|
||||||
apply_patch(0, "<stdin>");
|
apply_patch(0, "<stdin>", inaccurate_eof);
|
||||||
if (whitespace_error) {
|
if (whitespace_error) {
|
||||||
if (squelch_whitespace_errors &&
|
if (squelch_whitespace_errors &&
|
||||||
squelch_whitespace_errors < whitespace_error) {
|
squelch_whitespace_errors < whitespace_error) {
|
||||||
|
|
Loading…
Reference in a new issue