2005-05-23 17:52:17 +00:00
|
|
|
/*
|
|
|
|
* apply.c
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*
|
|
|
|
* This applies patches on top of some (arbitrary) version of the SCM.
|
|
|
|
*
|
|
|
|
*/
|
2005-07-22 16:56:57 +00:00
|
|
|
#include <fnmatch.h>
|
2005-05-23 17:52:17 +00:00
|
|
|
#include "cache.h"
|
2005-10-15 04:54:52 +00:00
|
|
|
#include "quote.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "blob.h"
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
// --check turns on checking that the working tree matches the
|
|
|
|
// files that are being modified, but doesn't apply the patch
|
|
|
|
// --stat does just a diffstat, and doesn't actually apply
|
2005-10-28 09:43:31 +00:00
|
|
|
// --numstat does numeric diffstat, and doesn't actually apply
|
2005-10-15 04:54:52 +00:00
|
|
|
// --index-info shows the old and new index info for paths if available.
|
2005-05-26 22:10:02 +00:00
|
|
|
//
|
2005-11-26 07:14:15 +00:00
|
|
|
static const char *prefix;
|
|
|
|
static int prefix_length = -1;
|
2006-05-09 08:08:23 +00:00
|
|
|
static int newfd = -1;
|
2005-11-26 07:14:15 +00:00
|
|
|
|
2006-01-31 05:36:24 +00:00
|
|
|
static int p_value = 1;
|
2005-11-15 01:37:05 +00:00
|
|
|
static int allow_binary_replacement = 0;
|
2005-06-05 18:03:13 +00:00
|
|
|
static int check_index = 0;
|
2005-06-05 21:05:43 +00:00
|
|
|
static int write_index = 0;
|
2005-05-26 19:25:52 +00:00
|
|
|
static int diffstat = 0;
|
2005-10-28 09:43:31 +00:00
|
|
|
static int numstat = 0;
|
2005-06-22 09:29:46 +00:00
|
|
|
static int summary = 0;
|
2005-05-26 22:10:02 +00:00
|
|
|
static int check = 0;
|
|
|
|
static int apply = 1;
|
2005-11-10 04:38:33 +00:00
|
|
|
static int no_add = 0;
|
2005-10-07 10:42:00 +00:00
|
|
|
static int show_index_info = 0;
|
2005-10-15 04:54:52 +00:00
|
|
|
static int line_termination = '\n';
|
2006-04-10 09:33:06 +00:00
|
|
|
static unsigned long p_context = -1;
|
2005-07-14 03:28:55 +00:00
|
|
|
static const char apply_usage[] =
|
2006-04-10 09:33:06 +00:00
|
|
|
"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
|
2005-05-23 17:52:17 +00:00
|
|
|
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
static enum whitespace_eol {
|
2006-02-27 22:47:45 +00:00
|
|
|
nowarn_whitespace,
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
warn_on_whitespace,
|
2006-02-27 02:13:25 +00:00
|
|
|
error_on_whitespace,
|
2006-02-27 22:47:45 +00:00
|
|
|
strip_whitespace,
|
2006-02-28 01:07:16 +00:00
|
|
|
} new_whitespace = warn_on_whitespace;
|
2006-02-27 02:13:25 +00:00
|
|
|
static int whitespace_error = 0;
|
2006-02-27 22:16:30 +00:00
|
|
|
static int squelch_whitespace_errors = 5;
|
|
|
|
static int applied_after_stripping = 0;
|
2006-02-27 02:13:25 +00:00
|
|
|
static const char *patch_input_file = NULL;
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
|
2006-02-27 22:47:45 +00:00
|
|
|
static void parse_whitespace_option(const char *option)
|
|
|
|
{
|
|
|
|
if (!option) {
|
2006-02-28 01:07:16 +00:00
|
|
|
new_whitespace = warn_on_whitespace;
|
2006-02-27 22:47:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!strcmp(option, "warn")) {
|
|
|
|
new_whitespace = warn_on_whitespace;
|
|
|
|
return;
|
|
|
|
}
|
2006-02-28 01:07:16 +00:00
|
|
|
if (!strcmp(option, "nowarn")) {
|
|
|
|
new_whitespace = nowarn_whitespace;
|
|
|
|
return;
|
|
|
|
}
|
2006-02-27 22:47:45 +00:00
|
|
|
if (!strcmp(option, "error")) {
|
|
|
|
new_whitespace = error_on_whitespace;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!strcmp(option, "error-all")) {
|
|
|
|
new_whitespace = error_on_whitespace;
|
|
|
|
squelch_whitespace_errors = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!strcmp(option, "strip")) {
|
|
|
|
new_whitespace = strip_whitespace;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
die("unrecognized whitespace option '%s'", option);
|
|
|
|
}
|
|
|
|
|
2006-02-28 09:12:52 +00:00
|
|
|
static void set_default_whitespace_mode(const char *whitespace_option)
|
|
|
|
{
|
|
|
|
if (!whitespace_option && !apply_default_whitespace) {
|
|
|
|
new_whitespace = (apply
|
|
|
|
? warn_on_whitespace
|
|
|
|
: nowarn_whitespace);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-26 18:40:43 +00:00
|
|
|
/*
|
|
|
|
* For "diff-stat" like behaviour, we keep track of the biggest change
|
|
|
|
* we've seen, and the longest filename. That allows us to do simple
|
|
|
|
* scaling.
|
|
|
|
*/
|
|
|
|
static int max_change, max_len;
|
|
|
|
|
2005-05-23 23:09:09 +00:00
|
|
|
/*
|
|
|
|
* Various "current state", notably line numbers and what
|
|
|
|
* file (and how) we're patching right now.. The "is_xxxx"
|
|
|
|
* things are flags, where -1 means "don't know yet".
|
|
|
|
*/
|
2005-05-23 21:38:49 +00:00
|
|
|
static int linenr = 1;
|
2005-05-26 17:23:51 +00:00
|
|
|
|
|
|
|
struct fragment {
|
2006-04-10 09:33:06 +00:00
|
|
|
unsigned long leading, trailing;
|
2005-05-26 17:23:51 +00:00
|
|
|
unsigned long oldpos, oldlines;
|
|
|
|
unsigned long newpos, newlines;
|
|
|
|
const char *patch;
|
|
|
|
int size;
|
|
|
|
struct fragment *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct patch {
|
2005-05-26 20:11:24 +00:00
|
|
|
char *new_name, *old_name, *def_name;
|
2005-05-26 17:23:51 +00:00
|
|
|
unsigned int old_mode, new_mode;
|
2005-11-09 22:59:23 +00:00
|
|
|
int is_rename, is_copy, is_new, is_delete, is_binary;
|
2005-05-26 18:40:43 +00:00
|
|
|
int lines_added, lines_deleted;
|
2005-06-22 09:29:46 +00:00
|
|
|
int score;
|
2005-05-26 17:23:51 +00:00
|
|
|
struct fragment *fragments;
|
2005-06-05 21:05:43 +00:00
|
|
|
char *result;
|
2005-06-05 18:03:13 +00:00
|
|
|
unsigned long resultsize;
|
2005-10-07 10:42:00 +00:00
|
|
|
char old_sha1_prefix[41];
|
|
|
|
char new_sha1_prefix[41];
|
2005-05-26 17:23:51 +00:00
|
|
|
struct patch *next;
|
|
|
|
};
|
2005-05-23 21:38:49 +00:00
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
#define CHUNKSIZE (8192)
|
2005-05-23 23:09:09 +00:00
|
|
|
#define SLOP (16)
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
static void *read_patch_file(int fd, unsigned long *sizep)
|
|
|
|
{
|
|
|
|
unsigned long size = 0, alloc = CHUNKSIZE;
|
|
|
|
void *buffer = xmalloc(alloc);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
int nr = alloc - size;
|
|
|
|
if (nr < 1024) {
|
|
|
|
alloc += CHUNKSIZE;
|
|
|
|
buffer = xrealloc(buffer, alloc);
|
|
|
|
nr = alloc - size;
|
|
|
|
}
|
2005-12-20 00:18:28 +00:00
|
|
|
nr = xread(fd, buffer + size, nr);
|
2005-05-23 17:52:17 +00:00
|
|
|
if (!nr)
|
|
|
|
break;
|
2005-12-20 00:18:28 +00:00
|
|
|
if (nr < 0)
|
2005-05-23 17:52:17 +00:00
|
|
|
die("git-apply: read returned %s", strerror(errno));
|
|
|
|
size += nr;
|
|
|
|
}
|
|
|
|
*sizep = size;
|
2005-05-23 23:09:09 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure that we have some slop in the buffer
|
|
|
|
* so that we can do speculative "memcmp" etc, and
|
|
|
|
* see to it that it is NUL-filled.
|
|
|
|
*/
|
|
|
|
if (alloc < size + SLOP)
|
|
|
|
buffer = xrealloc(buffer, size + SLOP);
|
|
|
|
memset(buffer + size, 0, SLOP);
|
2005-05-23 17:52:17 +00:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
static unsigned long linelen(const char *buffer, unsigned long size)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
|
|
|
unsigned long len = 0;
|
|
|
|
while (size--) {
|
|
|
|
len++;
|
|
|
|
if (*buffer++ == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2005-05-23 23:09:09 +00:00
|
|
|
static int is_dev_null(const char *str)
|
|
|
|
{
|
|
|
|
return !memcmp("/dev/null", str, 9) && isspace(str[9]);
|
|
|
|
}
|
|
|
|
|
2005-05-31 22:05:59 +00:00
|
|
|
#define TERM_SPACE 1
|
|
|
|
#define TERM_TAB 2
|
2005-05-24 02:13:55 +00:00
|
|
|
|
|
|
|
static int name_terminate(const char *name, int namelen, int c, int terminate)
|
|
|
|
{
|
|
|
|
if (c == ' ' && !(terminate & TERM_SPACE))
|
|
|
|
return 0;
|
|
|
|
if (c == '\t' && !(terminate & TERM_TAB))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char * find_name(const char *line, char *def, int p_value, int terminate)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
2005-05-23 23:09:09 +00:00
|
|
|
int len;
|
|
|
|
const char *start = line;
|
|
|
|
char *name;
|
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
if (*line == '"') {
|
|
|
|
/* Proposed "new-style" GNU patch/diff format; see
|
|
|
|
* http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
|
|
|
|
*/
|
|
|
|
name = unquote_c_style(line, NULL);
|
|
|
|
if (name) {
|
|
|
|
char *cp = name;
|
|
|
|
while (p_value) {
|
|
|
|
cp = strchr(name, '/');
|
|
|
|
if (!cp)
|
|
|
|
break;
|
|
|
|
cp++;
|
|
|
|
p_value--;
|
|
|
|
}
|
|
|
|
if (cp) {
|
|
|
|
/* name can later be freed, so we need
|
|
|
|
* to memmove, not just return cp
|
|
|
|
*/
|
|
|
|
memmove(name, cp, strlen(cp) + 1);
|
|
|
|
free(def);
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
free(name);
|
|
|
|
name = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
for (;;) {
|
2005-05-23 23:09:09 +00:00
|
|
|
char c = *line;
|
2005-05-24 02:13:55 +00:00
|
|
|
|
|
|
|
if (isspace(c)) {
|
|
|
|
if (c == '\n')
|
|
|
|
break;
|
|
|
|
if (name_terminate(start, line-start, c, terminate))
|
|
|
|
break;
|
|
|
|
}
|
2005-05-23 23:09:09 +00:00
|
|
|
line++;
|
|
|
|
if (c == '/' && !--p_value)
|
|
|
|
start = line;
|
|
|
|
}
|
|
|
|
if (!start)
|
|
|
|
return def;
|
|
|
|
len = line - start;
|
|
|
|
if (!len)
|
|
|
|
return def;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generally we prefer the shorter name, especially
|
|
|
|
* if the other one is just a variation of that with
|
|
|
|
* something else tacked on to the end (ie "file.orig"
|
|
|
|
* or "file~").
|
|
|
|
*/
|
|
|
|
if (def) {
|
|
|
|
int deflen = strlen(def);
|
|
|
|
if (deflen < len && !strncmp(start, def, deflen))
|
|
|
|
return def;
|
2005-05-23 17:52:17 +00:00
|
|
|
}
|
2005-05-23 23:09:09 +00:00
|
|
|
|
|
|
|
name = xmalloc(len + 1);
|
|
|
|
memcpy(name, start, len);
|
|
|
|
name[len] = 0;
|
|
|
|
free(def);
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the name etc info from the --/+++ lines of a traditional patch header
|
|
|
|
*
|
|
|
|
* NOTE! This hardcodes "-p1" behaviour in filename detection.
|
2005-05-24 02:13:55 +00:00
|
|
|
*
|
|
|
|
* FIXME! The end-of-filename heuristics are kind of screwy. For existing
|
|
|
|
* files, we can happily check the index for a match, but for creating a
|
|
|
|
* new file we should try to match whatever "patch" does. I have no idea.
|
2005-05-23 23:09:09 +00:00
|
|
|
*/
|
2005-05-26 17:23:51 +00:00
|
|
|
static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
first += 4; // skip "--- "
|
|
|
|
second += 4; // skip "+++ "
|
|
|
|
if (is_dev_null(first)) {
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_new = 1;
|
|
|
|
patch->is_delete = 0;
|
2005-05-26 20:11:24 +00:00
|
|
|
name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->new_name = name;
|
2005-05-23 23:09:09 +00:00
|
|
|
} else if (is_dev_null(second)) {
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_new = 0;
|
|
|
|
patch->is_delete = 1;
|
2005-05-31 22:05:59 +00:00
|
|
|
name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->old_name = name;
|
2005-05-23 23:09:09 +00:00
|
|
|
} else {
|
2005-05-31 22:05:59 +00:00
|
|
|
name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
|
|
|
|
name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->old_name = patch->new_name = name;
|
2005-05-23 23:09:09 +00:00
|
|
|
}
|
|
|
|
if (!name)
|
|
|
|
die("unable to find filename in patch at line %d", linenr);
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_hdrend(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-24 02:54:55 +00:00
|
|
|
/*
|
|
|
|
* We're anal about diff header consistency, to make
|
|
|
|
* sure that we don't end up having strange ambiguous
|
|
|
|
* patches floating around.
|
|
|
|
*
|
|
|
|
* As a result, gitdiff_{old|new}name() will check
|
|
|
|
* their names against any previous information, just
|
|
|
|
* to make sure..
|
|
|
|
*/
|
|
|
|
static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
|
|
|
|
{
|
|
|
|
if (!orig_name && !isnull)
|
|
|
|
return find_name(line, NULL, 1, 0);
|
|
|
|
|
|
|
|
if (orig_name) {
|
2005-10-15 04:54:52 +00:00
|
|
|
int len;
|
|
|
|
const char *name;
|
|
|
|
char *another;
|
2005-05-24 02:54:55 +00:00
|
|
|
name = orig_name;
|
|
|
|
len = strlen(name);
|
|
|
|
if (isnull)
|
|
|
|
die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
|
2005-10-15 04:54:52 +00:00
|
|
|
another = find_name(line, NULL, 1, 0);
|
|
|
|
if (!another || memcmp(another, name, len))
|
|
|
|
die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
|
|
|
|
free(another);
|
2005-05-24 02:54:55 +00:00
|
|
|
return orig_name;
|
|
|
|
}
|
2005-10-15 04:54:52 +00:00
|
|
|
else {
|
|
|
|
/* expect "/dev/null" */
|
|
|
|
if (memcmp("/dev/null", line, 9) || line[9] != '\n')
|
|
|
|
die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-05-24 02:54:55 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_oldname(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_newname(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_oldmode(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->old_mode = strtoul(line, NULL, 8);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_newmode(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->new_mode = strtoul(line, NULL, 8);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_delete(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_delete = 1;
|
2005-05-26 20:11:24 +00:00
|
|
|
patch->old_name = patch->def_name;
|
2005-05-26 17:23:51 +00:00
|
|
|
return gitdiff_oldmode(line, patch);
|
2005-05-23 23:09:09 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_newfile(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_new = 1;
|
2005-05-26 20:11:24 +00:00
|
|
|
patch->new_name = patch->def_name;
|
2005-05-26 17:23:51 +00:00
|
|
|
return gitdiff_newmode(line, patch);
|
2005-05-23 23:09:09 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_copysrc(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_copy = 1;
|
|
|
|
patch->old_name = find_name(line, NULL, 0, 0);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_copydst(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_copy = 1;
|
|
|
|
patch->new_name = find_name(line, NULL, 0, 0);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_renamesrc(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_rename = 1;
|
|
|
|
patch->old_name = find_name(line, NULL, 0, 0);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_renamedst(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_rename = 1;
|
|
|
|
patch->new_name = find_name(line, NULL, 0, 0);
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_similarity(const char *line, struct patch *patch)
|
2005-05-23 23:09:09 +00:00
|
|
|
{
|
2005-06-22 09:29:46 +00:00
|
|
|
if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
|
|
|
|
patch->score = 0;
|
2005-05-23 23:09:09 +00:00
|
|
|
return 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
}
|
|
|
|
|
2005-05-30 23:40:16 +00:00
|
|
|
static int gitdiff_dissimilarity(const char *line, struct patch *patch)
|
|
|
|
{
|
2005-06-22 09:29:46 +00:00
|
|
|
if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
|
|
|
|
patch->score = 0;
|
2005-05-30 23:40:16 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-10-07 10:42:00 +00:00
|
|
|
static int gitdiff_index(const char *line, struct patch *patch)
|
|
|
|
{
|
|
|
|
/* index line is N hexadecimal, "..", N hexadecimal,
|
|
|
|
* and optional space with octal mode.
|
|
|
|
*/
|
|
|
|
const char *ptr, *eol;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
ptr = strchr(line, '.');
|
2005-11-15 01:15:07 +00:00
|
|
|
if (!ptr || ptr[1] != '.' || 40 < ptr - line)
|
2005-10-07 10:42:00 +00:00
|
|
|
return 0;
|
|
|
|
len = ptr - line;
|
|
|
|
memcpy(patch->old_sha1_prefix, line, len);
|
|
|
|
patch->old_sha1_prefix[len] = 0;
|
|
|
|
|
|
|
|
line = ptr + 2;
|
|
|
|
ptr = strchr(line, ' ');
|
|
|
|
eol = strchr(line, '\n');
|
|
|
|
|
|
|
|
if (!ptr || eol < ptr)
|
|
|
|
ptr = eol;
|
|
|
|
len = ptr - line;
|
|
|
|
|
2005-11-15 01:15:07 +00:00
|
|
|
if (40 < len)
|
2005-10-07 10:42:00 +00:00
|
|
|
return 0;
|
|
|
|
memcpy(patch->new_sha1_prefix, line, len);
|
|
|
|
patch->new_sha1_prefix[len] = 0;
|
|
|
|
if (*ptr == ' ')
|
|
|
|
patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-24 02:13:55 +00:00
|
|
|
/*
|
|
|
|
* This is normal for a diff that doesn't change anything: we'll fall through
|
|
|
|
* into the next diff. Tell the parser to break out.
|
|
|
|
*/
|
2005-05-26 17:23:51 +00:00
|
|
|
static int gitdiff_unrecognized(const char *line, struct patch *patch)
|
2005-05-24 02:13:55 +00:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
static const char *stop_at_slash(const char *line, int llen)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < llen; i++) {
|
|
|
|
int ch = line[i];
|
|
|
|
if (ch == '/')
|
|
|
|
return line + i;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is to extract the same name that appears on "diff --git"
|
|
|
|
* line. We do not find and return anything if it is a rename
|
|
|
|
* patch, and it is OK because we will find the name elsewhere.
|
|
|
|
* We need to reliably find name only when it is mode-change only,
|
|
|
|
* creation or deletion of an empty file. In any of these cases,
|
|
|
|
* both sides are the same name under a/ and b/ respectively.
|
|
|
|
*/
|
|
|
|
static char *git_header_name(char *line, int llen)
|
2005-05-26 20:11:24 +00:00
|
|
|
{
|
|
|
|
int len;
|
2005-10-15 04:54:52 +00:00
|
|
|
const char *name;
|
|
|
|
const char *second = NULL;
|
2005-05-26 20:11:24 +00:00
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
line += strlen("diff --git ");
|
|
|
|
llen -= strlen("diff --git ");
|
|
|
|
|
|
|
|
if (*line == '"') {
|
|
|
|
const char *cp;
|
|
|
|
char *first = unquote_c_style(line, &second);
|
|
|
|
if (!first)
|
2005-05-26 20:11:24 +00:00
|
|
|
return NULL;
|
2005-10-15 04:54:52 +00:00
|
|
|
|
|
|
|
/* advance to the first slash */
|
|
|
|
cp = stop_at_slash(first, strlen(first));
|
|
|
|
if (!cp || cp == first) {
|
|
|
|
/* we do not accept absolute paths */
|
|
|
|
free_first_and_fail:
|
|
|
|
free(first);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
len = strlen(cp+1);
|
|
|
|
memmove(first, cp+1, len+1); /* including NUL */
|
|
|
|
|
|
|
|
/* second points at one past closing dq of name.
|
|
|
|
* find the second name.
|
|
|
|
*/
|
|
|
|
while ((second < line + llen) && isspace(*second))
|
|
|
|
second++;
|
|
|
|
|
|
|
|
if (line + llen <= second)
|
|
|
|
goto free_first_and_fail;
|
|
|
|
if (*second == '"') {
|
|
|
|
char *sp = unquote_c_style(second, NULL);
|
|
|
|
if (!sp)
|
|
|
|
goto free_first_and_fail;
|
|
|
|
cp = stop_at_slash(sp, strlen(sp));
|
|
|
|
if (!cp || cp == sp) {
|
|
|
|
free_both_and_fail:
|
|
|
|
free(sp);
|
|
|
|
goto free_first_and_fail;
|
|
|
|
}
|
|
|
|
/* They must match, otherwise ignore */
|
|
|
|
if (strcmp(cp+1, first))
|
|
|
|
goto free_both_and_fail;
|
|
|
|
free(sp);
|
|
|
|
return first;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* unquoted second */
|
|
|
|
cp = stop_at_slash(second, line + llen - second);
|
|
|
|
if (!cp || cp == second)
|
|
|
|
goto free_first_and_fail;
|
|
|
|
cp++;
|
|
|
|
if (line + llen - cp != len + 1 ||
|
|
|
|
memcmp(first, cp, len))
|
|
|
|
goto free_first_and_fail;
|
|
|
|
return first;
|
2005-05-26 20:11:24 +00:00
|
|
|
}
|
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
/* unquoted first name */
|
|
|
|
name = stop_at_slash(line, llen);
|
|
|
|
if (!name || name == line)
|
2005-05-26 20:11:24 +00:00
|
|
|
return NULL;
|
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
name++;
|
|
|
|
|
|
|
|
/* since the first name is unquoted, a dq if exists must be
|
|
|
|
* the beginning of the second name.
|
|
|
|
*/
|
|
|
|
for (second = name; second < line + llen; second++) {
|
|
|
|
if (*second == '"') {
|
|
|
|
const char *cp = second;
|
|
|
|
const char *np;
|
|
|
|
char *sp = unquote_c_style(second, NULL);
|
|
|
|
|
|
|
|
if (!sp)
|
|
|
|
return NULL;
|
|
|
|
np = stop_at_slash(sp, strlen(sp));
|
|
|
|
if (!np || np == sp) {
|
|
|
|
free_second_and_fail:
|
|
|
|
free(sp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
np++;
|
|
|
|
len = strlen(np);
|
|
|
|
if (len < cp - name &&
|
|
|
|
!strncmp(np, name, len) &&
|
|
|
|
isspace(name[len])) {
|
|
|
|
/* Good */
|
|
|
|
memmove(sp, np, len + 1);
|
|
|
|
return sp;
|
|
|
|
}
|
|
|
|
goto free_second_and_fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-26 20:11:24 +00:00
|
|
|
/*
|
|
|
|
* Accept a name only if it shows up twice, exactly the same
|
|
|
|
* form.
|
|
|
|
*/
|
|
|
|
for (len = 0 ; ; len++) {
|
|
|
|
char c = name[len];
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
case '\n':
|
2005-08-28 15:24:27 +00:00
|
|
|
return NULL;
|
2005-05-26 20:11:24 +00:00
|
|
|
case '\t': case ' ':
|
|
|
|
second = name+len;
|
|
|
|
for (;;) {
|
|
|
|
char c = *second++;
|
|
|
|
if (c == '\n')
|
|
|
|
return NULL;
|
|
|
|
if (c == '/')
|
|
|
|
break;
|
|
|
|
}
|
2005-05-26 20:28:42 +00:00
|
|
|
if (second[len] == '\n' && !memcmp(name, second, len)) {
|
2005-05-26 20:11:24 +00:00
|
|
|
char *ret = xmalloc(len + 1);
|
|
|
|
memcpy(ret, name, len);
|
|
|
|
ret[len] = 0;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
/* Verify that we recognize the lines following a git header */
|
2005-05-26 17:23:51 +00:00
|
|
|
static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
2005-05-23 23:09:09 +00:00
|
|
|
unsigned long offset;
|
|
|
|
|
|
|
|
/* A git diff has explicit new/delete information, so we don't guess */
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_new = 0;
|
|
|
|
patch->is_delete = 0;
|
2005-05-23 23:09:09 +00:00
|
|
|
|
2005-05-26 20:11:24 +00:00
|
|
|
/*
|
|
|
|
* Some things may not have the old name in the
|
|
|
|
* rest of the headers anywhere (pure mode changes,
|
|
|
|
* or removing or adding empty files), so we get
|
|
|
|
* the default name from the header.
|
|
|
|
*/
|
2005-10-15 04:54:52 +00:00
|
|
|
patch->def_name = git_header_name(line, len);
|
2005-05-26 20:11:24 +00:00
|
|
|
|
2005-05-23 23:09:09 +00:00
|
|
|
line += len;
|
|
|
|
size -= len;
|
|
|
|
linenr++;
|
|
|
|
for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
|
|
|
|
static const struct opentry {
|
|
|
|
const char *str;
|
2005-05-26 17:23:51 +00:00
|
|
|
int (*fn)(const char *, struct patch *);
|
2005-05-23 23:09:09 +00:00
|
|
|
} optable[] = {
|
|
|
|
{ "@@ -", gitdiff_hdrend },
|
|
|
|
{ "--- ", gitdiff_oldname },
|
|
|
|
{ "+++ ", gitdiff_newname },
|
|
|
|
{ "old mode ", gitdiff_oldmode },
|
|
|
|
{ "new mode ", gitdiff_newmode },
|
|
|
|
{ "deleted file mode ", gitdiff_delete },
|
|
|
|
{ "new file mode ", gitdiff_newfile },
|
|
|
|
{ "copy from ", gitdiff_copysrc },
|
|
|
|
{ "copy to ", gitdiff_copydst },
|
2005-06-05 21:26:50 +00:00
|
|
|
{ "rename old ", gitdiff_renamesrc },
|
|
|
|
{ "rename new ", gitdiff_renamedst },
|
2005-06-05 22:31:52 +00:00
|
|
|
{ "rename from ", gitdiff_renamesrc },
|
|
|
|
{ "rename to ", gitdiff_renamedst },
|
2005-05-23 23:09:09 +00:00
|
|
|
{ "similarity index ", gitdiff_similarity },
|
2005-05-30 23:40:16 +00:00
|
|
|
{ "dissimilarity index ", gitdiff_dissimilarity },
|
2005-10-07 10:42:00 +00:00
|
|
|
{ "index ", gitdiff_index },
|
2005-05-24 02:13:55 +00:00
|
|
|
{ "", gitdiff_unrecognized },
|
2005-05-23 23:09:09 +00:00
|
|
|
};
|
|
|
|
int i;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
len = linelen(line, size);
|
2005-05-23 23:09:09 +00:00
|
|
|
if (!len || line[len-1] != '\n')
|
2005-05-23 17:52:17 +00:00
|
|
|
break;
|
2006-03-09 19:58:05 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(optable); i++) {
|
2005-05-23 23:09:09 +00:00
|
|
|
const struct opentry *p = optable + i;
|
|
|
|
int oplen = strlen(p->str);
|
|
|
|
if (len < oplen || memcmp(p->str, line, oplen))
|
|
|
|
continue;
|
2005-05-26 17:23:51 +00:00
|
|
|
if (p->fn(line + oplen, patch) < 0)
|
2005-05-23 23:09:09 +00:00
|
|
|
return offset;
|
2005-05-24 02:13:55 +00:00
|
|
|
break;
|
2005-05-23 23:09:09 +00:00
|
|
|
}
|
2005-05-23 17:52:17 +00:00
|
|
|
}
|
|
|
|
|
2005-05-23 23:09:09 +00:00
|
|
|
return offset;
|
2005-05-23 17:52:17 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 19:25:52 +00:00
|
|
|
static int parse_num(const char *line, unsigned long *p)
|
2005-05-23 21:38:49 +00:00
|
|
|
{
|
|
|
|
char *ptr;
|
2005-05-26 19:25:52 +00:00
|
|
|
|
|
|
|
if (!isdigit(*line))
|
|
|
|
return 0;
|
|
|
|
*p = strtoul(line, &ptr, 10);
|
|
|
|
return ptr - line;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_range(const char *line, int len, int offset, const char *expect,
|
|
|
|
unsigned long *p1, unsigned long *p2)
|
|
|
|
{
|
2005-05-23 21:38:49 +00:00
|
|
|
int digits, ex;
|
|
|
|
|
|
|
|
if (offset < 0 || offset >= len)
|
|
|
|
return -1;
|
|
|
|
line += offset;
|
|
|
|
len -= offset;
|
|
|
|
|
2005-05-26 19:25:52 +00:00
|
|
|
digits = parse_num(line, p1);
|
|
|
|
if (!digits)
|
2005-05-23 21:38:49 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
offset += digits;
|
|
|
|
line += digits;
|
|
|
|
len -= digits;
|
|
|
|
|
2006-03-25 21:28:28 +00:00
|
|
|
*p2 = 1;
|
2005-05-26 19:25:52 +00:00
|
|
|
if (*line == ',') {
|
|
|
|
digits = parse_num(line+1, p2);
|
|
|
|
if (!digits)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
offset += digits+1;
|
|
|
|
line += digits+1;
|
|
|
|
len -= digits+1;
|
|
|
|
}
|
|
|
|
|
2005-05-23 21:38:49 +00:00
|
|
|
ex = strlen(expect);
|
|
|
|
if (ex > len)
|
|
|
|
return -1;
|
|
|
|
if (memcmp(line, expect, ex))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return offset + ex;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a unified diff fragment header of the
|
|
|
|
* form "@@ -a,b +c,d @@"
|
|
|
|
*/
|
2005-05-26 17:23:51 +00:00
|
|
|
static int parse_fragment_header(char *line, int len, struct fragment *fragment)
|
2005-05-23 21:38:49 +00:00
|
|
|
{
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
if (!len || line[len-1] != '\n')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Figure out the number of lines in a fragment */
|
2005-05-26 19:25:52 +00:00
|
|
|
offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
|
|
|
|
offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
|
2005-05-23 21:38:49 +00:00
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
|
|
|
unsigned long offset, len;
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
patch->is_rename = patch->is_copy = 0;
|
|
|
|
patch->is_new = patch->is_delete = -1;
|
|
|
|
patch->old_mode = patch->new_mode = 0;
|
|
|
|
patch->old_name = patch->new_name = NULL;
|
2005-05-23 21:38:49 +00:00
|
|
|
for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
|
2005-05-23 17:52:17 +00:00
|
|
|
unsigned long nextlen;
|
|
|
|
|
|
|
|
len = linelen(line, size);
|
|
|
|
if (!len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Testing this early allows us to take a few shortcuts.. */
|
|
|
|
if (len < 6)
|
|
|
|
continue;
|
2005-05-23 21:38:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure we don't find any unconnected patch fragmants.
|
|
|
|
* That's a sign that we didn't find a header, and that a
|
|
|
|
* patch has become corrupted/broken up.
|
|
|
|
*/
|
|
|
|
if (!memcmp("@@ -", line, 4)) {
|
2005-05-26 17:23:51 +00:00
|
|
|
struct fragment dummy;
|
|
|
|
if (parse_fragment_header(line, len, &dummy) < 0)
|
2005-05-23 21:38:49 +00:00
|
|
|
continue;
|
2005-08-09 15:30:22 +00:00
|
|
|
error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
|
2005-05-23 21:38:49 +00:00
|
|
|
}
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
if (size < len + 6)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Git patch? It might not have a real patch, just a rename
|
|
|
|
* or mode change, so we handle that specially
|
|
|
|
*/
|
|
|
|
if (!memcmp("diff --git ", line, 11)) {
|
2005-05-26 17:23:51 +00:00
|
|
|
int git_hdr_len = parse_git_header(line, len, size, patch);
|
2005-06-12 16:37:49 +00:00
|
|
|
if (git_hdr_len <= len)
|
2005-05-23 17:52:17 +00:00
|
|
|
continue;
|
2005-06-17 22:23:40 +00:00
|
|
|
if (!patch->old_name && !patch->new_name) {
|
|
|
|
if (!patch->def_name)
|
|
|
|
die("git diff header lacks filename information (line %d)", linenr);
|
|
|
|
patch->old_name = patch->new_name = patch->def_name;
|
|
|
|
}
|
2005-05-23 23:09:09 +00:00
|
|
|
*hdrsize = git_hdr_len;
|
2005-05-23 17:52:17 +00:00
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** --- followed by +++ ? */
|
|
|
|
if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We only accept unified patches, so we want it to
|
|
|
|
* at least have "@@ -a,b +c,d @@\n", which is 14 chars
|
|
|
|
* minimum
|
|
|
|
*/
|
|
|
|
nextlen = linelen(line + len, size - len);
|
|
|
|
if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Ok, we'll consider it a patch */
|
2005-05-26 17:23:51 +00:00
|
|
|
parse_traditional_patch(line, line+len, patch);
|
2005-05-23 17:52:17 +00:00
|
|
|
*hdrsize = len + nextlen;
|
2005-05-23 21:38:49 +00:00
|
|
|
linenr += 2;
|
2005-05-23 17:52:17 +00:00
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a unified diff. Note that this really needs
|
|
|
|
* to parse each fragment separately, since the only
|
|
|
|
* way to know the difference between a "---" that is
|
|
|
|
* part of a patch, and a "---" that starts the next
|
|
|
|
* patch is to look at the line counts..
|
|
|
|
*/
|
2005-05-26 17:23:51 +00:00
|
|
|
static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
2005-05-26 18:40:43 +00:00
|
|
|
int added, deleted;
|
2005-05-23 17:52:17 +00:00
|
|
|
int len = linelen(line, size), offset;
|
2005-06-05 19:43:56 +00:00
|
|
|
unsigned long oldlines, newlines;
|
2006-04-10 09:33:06 +00:00
|
|
|
unsigned long leading, trailing;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
offset = parse_fragment_header(line, len, fragment);
|
2005-05-23 17:52:17 +00:00
|
|
|
if (offset < 0)
|
|
|
|
return -1;
|
2005-05-26 17:23:51 +00:00
|
|
|
oldlines = fragment->oldlines;
|
|
|
|
newlines = fragment->newlines;
|
2006-04-10 09:33:06 +00:00
|
|
|
leading = 0;
|
|
|
|
trailing = 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2005-06-05 19:43:56 +00:00
|
|
|
if (patch->is_new < 0) {
|
|
|
|
patch->is_new = !oldlines;
|
|
|
|
if (!oldlines)
|
|
|
|
patch->old_name = NULL;
|
|
|
|
}
|
|
|
|
if (patch->is_delete < 0) {
|
|
|
|
patch->is_delete = !newlines;
|
|
|
|
if (!newlines)
|
|
|
|
patch->new_name = NULL;
|
|
|
|
}
|
|
|
|
|
2006-03-22 08:21:07 +00:00
|
|
|
if (patch->is_new && oldlines)
|
2005-06-05 19:43:56 +00:00
|
|
|
return error("new file depends on old contents");
|
2005-06-08 15:11:47 +00:00
|
|
|
if (patch->is_delete != !newlines) {
|
|
|
|
if (newlines)
|
|
|
|
return error("deleted file still has contents");
|
|
|
|
fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
|
|
|
|
}
|
2005-05-23 23:09:09 +00:00
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
/* Parse the thing.. */
|
|
|
|
line += len;
|
|
|
|
size -= len;
|
2005-05-23 21:38:49 +00:00
|
|
|
linenr++;
|
2005-05-26 18:40:43 +00:00
|
|
|
added = deleted = 0;
|
2005-05-23 21:38:49 +00:00
|
|
|
for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
|
2005-05-23 17:52:17 +00:00
|
|
|
if (!oldlines && !newlines)
|
|
|
|
break;
|
|
|
|
len = linelen(line, size);
|
|
|
|
if (!len || line[len-1] != '\n')
|
|
|
|
return -1;
|
|
|
|
switch (*line) {
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
case ' ':
|
|
|
|
oldlines--;
|
|
|
|
newlines--;
|
2006-04-10 09:33:06 +00:00
|
|
|
if (!deleted && !added)
|
|
|
|
leading++;
|
|
|
|
trailing++;
|
2005-05-23 17:52:17 +00:00
|
|
|
break;
|
|
|
|
case '-':
|
2005-05-26 18:40:43 +00:00
|
|
|
deleted++;
|
2005-05-23 17:52:17 +00:00
|
|
|
oldlines--;
|
2006-04-10 09:33:06 +00:00
|
|
|
trailing = 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
break;
|
|
|
|
case '+':
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
/*
|
|
|
|
* We know len is at least two, since we have a '+' and
|
2006-02-27 02:13:25 +00:00
|
|
|
* we checked that the last character was a '\n' above.
|
|
|
|
* That is, an addition of an empty line would check
|
|
|
|
* the '+' here. Sneaky...
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
*/
|
2006-02-27 22:47:45 +00:00
|
|
|
if ((new_whitespace != nowarn_whitespace) &&
|
2006-02-27 02:13:25 +00:00
|
|
|
isspace(line[len-2])) {
|
2006-02-27 22:16:30 +00:00
|
|
|
whitespace_error++;
|
|
|
|
if (squelch_whitespace_errors &&
|
|
|
|
squelch_whitespace_errors <
|
|
|
|
whitespace_error)
|
|
|
|
;
|
|
|
|
else {
|
|
|
|
fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
|
|
|
|
patch_input_file,
|
|
|
|
linenr, len-2, line+1);
|
|
|
|
}
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
}
|
2005-05-26 18:40:43 +00:00
|
|
|
added++;
|
2005-05-23 17:52:17 +00:00
|
|
|
newlines--;
|
2006-04-10 09:33:06 +00:00
|
|
|
trailing = 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
break;
|
2005-09-04 17:29:02 +00:00
|
|
|
|
|
|
|
/* We allow "\ No newline at end of file". Depending
|
|
|
|
* on locale settings when the patch was produced we
|
|
|
|
* don't know what this line looks like. The only
|
2005-10-03 20:16:39 +00:00
|
|
|
* thing we do know is that it begins with "\ ".
|
|
|
|
* Checking for 12 is just for sanity check -- any
|
|
|
|
* l10n of "\ No newline..." is at least that long.
|
|
|
|
*/
|
2005-05-26 19:25:52 +00:00
|
|
|
case '\\':
|
2005-09-04 17:29:02 +00:00
|
|
|
if (len < 12 || memcmp(line, "\\ ", 2))
|
2005-06-05 18:03:13 +00:00
|
|
|
return -1;
|
2005-05-26 19:25:52 +00:00
|
|
|
break;
|
2005-05-23 17:52:17 +00:00
|
|
|
}
|
|
|
|
}
|
2006-03-25 21:28:28 +00:00
|
|
|
if (oldlines || newlines)
|
|
|
|
return -1;
|
2006-04-10 09:33:06 +00:00
|
|
|
fragment->leading = leading;
|
|
|
|
fragment->trailing = trailing;
|
|
|
|
|
2005-07-22 16:56:39 +00:00
|
|
|
/* If a fragment ends with an incomplete line, we failed to include
|
|
|
|
* it in the above loop because we hit oldlines == newlines == 0
|
|
|
|
* before seeing it.
|
|
|
|
*/
|
2005-09-04 17:29:02 +00:00
|
|
|
if (12 < size && !memcmp(line, "\\ ", 2))
|
2005-07-22 16:56:39 +00:00
|
|
|
offset += linelen(line, size);
|
|
|
|
|
2005-05-26 18:40:43 +00:00
|
|
|
patch->lines_added += added;
|
|
|
|
patch->lines_deleted += deleted;
|
2005-05-23 17:52:17 +00:00
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
|
|
|
unsigned long offset = 0;
|
2005-05-26 17:23:51 +00:00
|
|
|
struct fragment **fragp = &patch->fragments;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
while (size > 4 && !memcmp(line, "@@ -", 4)) {
|
2005-05-26 17:23:51 +00:00
|
|
|
struct fragment *fragment;
|
|
|
|
int len;
|
|
|
|
|
2006-04-03 18:30:46 +00:00
|
|
|
fragment = xcalloc(1, sizeof(*fragment));
|
2005-05-26 17:23:51 +00:00
|
|
|
len = parse_fragment(line, size, patch, fragment);
|
2005-05-23 17:52:17 +00:00
|
|
|
if (len <= 0)
|
2005-05-23 21:38:49 +00:00
|
|
|
die("corrupt patch at line %d", linenr);
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
fragment->patch = line;
|
|
|
|
fragment->size = len;
|
|
|
|
|
|
|
|
*fragp = fragment;
|
|
|
|
fragp = &fragment->next;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
offset += len;
|
|
|
|
line += len;
|
|
|
|
size -= len;
|
|
|
|
}
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-10-01 06:25:23 +00:00
|
|
|
static inline int metadata_changes(struct patch *patch)
|
|
|
|
{
|
|
|
|
return patch->is_rename > 0 ||
|
|
|
|
patch->is_copy > 0 ||
|
|
|
|
patch->is_new > 0 ||
|
|
|
|
patch->is_delete ||
|
|
|
|
(patch->old_mode && patch->new_mode &&
|
|
|
|
patch->old_mode != patch->new_mode);
|
|
|
|
}
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
|
|
|
int hdrsize, patchsize;
|
2005-05-26 17:23:51 +00:00
|
|
|
int offset = find_header(buffer, size, &hdrsize, patch);
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
if (offset < 0)
|
|
|
|
return offset;
|
|
|
|
|
2005-05-26 17:23:51 +00:00
|
|
|
patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2005-11-16 22:12:56 +00:00
|
|
|
if (!patchsize) {
|
2005-11-18 04:46:29 +00:00
|
|
|
static const char *binhdr[] = {
|
|
|
|
"Binary files ",
|
|
|
|
"Files ",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
int i;
|
|
|
|
int hd = hdrsize + offset;
|
|
|
|
unsigned long llen = linelen(buffer + hd, size - hd);
|
|
|
|
|
|
|
|
if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
|
|
|
|
for (i = 0; binhdr[i]; i++) {
|
|
|
|
int len = strlen(binhdr[i]);
|
|
|
|
if (len < size - hd &&
|
|
|
|
!memcmp(binhdr[i], buffer + hd, len)) {
|
|
|
|
patch->is_binary = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2005-11-09 22:59:23 +00:00
|
|
|
|
2005-11-16 22:12:56 +00:00
|
|
|
/* Empty patch cannot be applied if:
|
2005-11-15 01:37:05 +00:00
|
|
|
* - it is a binary patch and we do not do binary_replace, or
|
|
|
|
* - text patch without metadata change
|
2005-11-16 22:12:56 +00:00
|
|
|
*/
|
|
|
|
if ((apply || check) &&
|
2005-11-15 01:37:05 +00:00
|
|
|
(patch->is_binary
|
|
|
|
? !allow_binary_replacement
|
|
|
|
: !metadata_changes(patch)))
|
2005-11-09 22:59:23 +00:00
|
|
|
die("patch with only garbage at line %d", linenr);
|
|
|
|
}
|
2005-10-01 06:25:23 +00:00
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
return offset + hdrsize + patchsize;
|
|
|
|
}
|
|
|
|
|
2005-07-03 17:10:45 +00:00
|
|
|
static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
|
|
|
|
static const char minuses[]= "----------------------------------------------------------------------";
|
2005-05-26 18:40:43 +00:00
|
|
|
|
|
|
|
static void show_stats(struct patch *patch)
|
|
|
|
{
|
2005-07-29 03:37:23 +00:00
|
|
|
const char *prefix = "";
|
2005-06-22 09:29:16 +00:00
|
|
|
char *name = patch->new_name;
|
2005-10-15 04:54:52 +00:00
|
|
|
char *qname = NULL;
|
2005-06-01 03:50:49 +00:00
|
|
|
int len, max, add, del, total;
|
2005-05-26 18:40:43 +00:00
|
|
|
|
2005-05-26 20:11:24 +00:00
|
|
|
if (!name)
|
2005-06-22 09:29:16 +00:00
|
|
|
name = patch->old_name;
|
2005-05-26 18:40:43 +00:00
|
|
|
|
2005-10-15 04:54:52 +00:00
|
|
|
if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
|
|
|
|
qname = xmalloc(len + 1);
|
|
|
|
quote_c_style(name, qname, NULL, 0);
|
|
|
|
name = qname;
|
|
|
|
}
|
|
|
|
|
2005-05-26 18:40:43 +00:00
|
|
|
/*
|
|
|
|
* "scale" the filename
|
|
|
|
*/
|
|
|
|
len = strlen(name);
|
|
|
|
max = max_len;
|
|
|
|
if (max > 50)
|
|
|
|
max = 50;
|
2005-07-29 03:37:23 +00:00
|
|
|
if (len > max) {
|
|
|
|
char *slash;
|
|
|
|
prefix = "...";
|
|
|
|
max -= 3;
|
2005-05-26 18:40:43 +00:00
|
|
|
name += len - max;
|
2005-07-29 03:37:23 +00:00
|
|
|
slash = strchr(name, '/');
|
|
|
|
if (slash)
|
|
|
|
name = slash;
|
|
|
|
}
|
2005-05-26 18:40:43 +00:00
|
|
|
len = max;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* scale the add/delete
|
|
|
|
*/
|
|
|
|
max = max_change;
|
|
|
|
if (max + len > 70)
|
|
|
|
max = 70 - len;
|
2005-06-01 03:50:49 +00:00
|
|
|
|
|
|
|
add = patch->lines_added;
|
|
|
|
del = patch->lines_deleted;
|
|
|
|
total = add + del;
|
|
|
|
|
2005-06-21 15:14:30 +00:00
|
|
|
if (max_change > 0) {
|
|
|
|
total = (total * max + max_change / 2) / max_change;
|
|
|
|
add = (add * max + max_change / 2) / max_change;
|
|
|
|
del = total - add;
|
|
|
|
}
|
2005-11-09 22:59:23 +00:00
|
|
|
if (patch->is_binary)
|
|
|
|
printf(" %s%-*s | Bin\n", prefix, len, name);
|
|
|
|
else
|
|
|
|
printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
|
|
|
|
len, name, patch->lines_added + patch->lines_deleted,
|
|
|
|
add, pluses, del, minuses);
|
2005-10-15 04:54:52 +00:00
|
|
|
if (qname)
|
|
|
|
free(qname);
|
2005-05-26 18:40:43 +00:00
|
|
|
}
|
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
unsigned long got;
|
|
|
|
|
|
|
|
switch (st->st_mode & S_IFMT) {
|
|
|
|
case S_IFLNK:
|
|
|
|
return readlink(path, buf, size);
|
|
|
|
case S_IFREG:
|
|
|
|
fd = open(path, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
return error("unable to open %s", path);
|
|
|
|
got = 0;
|
|
|
|
for (;;) {
|
2005-12-20 00:18:28 +00:00
|
|
|
int ret = xread(fd, buf + got, size - got);
|
|
|
|
if (ret <= 0)
|
2005-06-05 18:03:13 +00:00
|
|
|
break;
|
|
|
|
got += ret;
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
return got;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-10 09:33:06 +00:00
|
|
|
static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
|
2005-06-05 18:03:13 +00:00
|
|
|
{
|
2005-06-05 19:16:32 +00:00
|
|
|
int i;
|
|
|
|
unsigned long start, backwards, forwards;
|
2005-06-05 18:03:13 +00:00
|
|
|
|
|
|
|
if (fragsize > size)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
start = 0;
|
|
|
|
if (line > 1) {
|
|
|
|
unsigned long offset = 0;
|
2005-06-05 19:16:32 +00:00
|
|
|
i = line-1;
|
|
|
|
while (offset + fragsize <= size) {
|
2005-06-05 18:03:13 +00:00
|
|
|
if (buf[offset++] == '\n') {
|
|
|
|
start = offset;
|
2005-06-05 19:16:32 +00:00
|
|
|
if (!--i)
|
2005-06-05 18:03:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Exact line number? */
|
|
|
|
if (!memcmp(buf + start, fragment, fragsize))
|
|
|
|
return start;
|
|
|
|
|
2005-06-05 19:16:32 +00:00
|
|
|
/*
|
|
|
|
* There's probably some smart way to do this, but I'll leave
|
|
|
|
* that to the smart and beautiful people. I'm simple and stupid.
|
|
|
|
*/
|
|
|
|
backwards = start;
|
|
|
|
forwards = start;
|
|
|
|
for (i = 0; ; i++) {
|
|
|
|
unsigned long try;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
/* "backward" */
|
|
|
|
if (i & 1) {
|
|
|
|
if (!backwards) {
|
|
|
|
if (forwards + fragsize > size)
|
|
|
|
break;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
do {
|
|
|
|
--backwards;
|
|
|
|
} while (backwards && buf[backwards-1] != '\n');
|
|
|
|
try = backwards;
|
|
|
|
} else {
|
|
|
|
while (forwards + fragsize <= size) {
|
|
|
|
if (buf[forwards++] == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
try = forwards;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (try + fragsize > size)
|
|
|
|
continue;
|
|
|
|
if (memcmp(buf + try, fragment, fragsize))
|
|
|
|
continue;
|
|
|
|
n = (i >> 1)+1;
|
|
|
|
if (i & 1)
|
|
|
|
n = -n;
|
2006-04-10 09:33:06 +00:00
|
|
|
*lines = n;
|
2005-06-05 19:16:32 +00:00
|
|
|
return try;
|
|
|
|
}
|
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
/*
|
|
|
|
* We should start searching forward and backward.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-04-10 09:33:06 +00:00
|
|
|
static void remove_first_line(const char **rbuf, int *rsize)
|
|
|
|
{
|
|
|
|
const char *buf = *rbuf;
|
|
|
|
int size = *rsize;
|
|
|
|
unsigned long offset;
|
|
|
|
offset = 0;
|
|
|
|
while (offset <= size) {
|
|
|
|
if (buf[offset++] == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*rsize = size - offset;
|
|
|
|
*rbuf = buf + offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void remove_last_line(const char **rbuf, int *rsize)
|
|
|
|
{
|
|
|
|
const char *buf = *rbuf;
|
|
|
|
int size = *rsize;
|
|
|
|
unsigned long offset;
|
|
|
|
offset = size - 1;
|
|
|
|
while (offset > 0) {
|
|
|
|
if (buf[--offset] == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*rsize = offset + 1;
|
|
|
|
}
|
|
|
|
|
2005-06-05 19:16:32 +00:00
|
|
|
struct buffer_desc {
|
|
|
|
char *buffer;
|
|
|
|
unsigned long size;
|
|
|
|
unsigned long alloc;
|
|
|
|
};
|
|
|
|
|
2006-02-27 02:13:25 +00:00
|
|
|
static int apply_line(char *output, const char *patch, int plen)
|
|
|
|
{
|
|
|
|
/* plen is number of bytes to be copied from patch,
|
|
|
|
* starting at patch+1 (patch[0] is '+'). Typically
|
|
|
|
* patch[plen] is '\n'.
|
|
|
|
*/
|
|
|
|
int add_nl_to_tail = 0;
|
2006-02-27 22:47:45 +00:00
|
|
|
if ((new_whitespace == strip_whitespace) &&
|
2006-02-27 02:13:25 +00:00
|
|
|
1 < plen && isspace(patch[plen-1])) {
|
|
|
|
if (patch[plen] == '\n')
|
|
|
|
add_nl_to_tail = 1;
|
|
|
|
plen--;
|
|
|
|
while (0 < plen && isspace(patch[plen]))
|
|
|
|
plen--;
|
2006-02-27 22:16:30 +00:00
|
|
|
applied_after_stripping++;
|
2006-02-27 02:13:25 +00:00
|
|
|
}
|
|
|
|
memcpy(output, patch + 1, plen);
|
|
|
|
if (add_nl_to_tail)
|
|
|
|
output[plen++] = '\n';
|
|
|
|
return plen;
|
|
|
|
}
|
|
|
|
|
2005-06-05 19:16:32 +00:00
|
|
|
static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
|
2005-06-05 18:03:13 +00:00
|
|
|
{
|
2005-06-05 19:16:32 +00:00
|
|
|
char *buf = desc->buffer;
|
2005-06-05 18:03:13 +00:00
|
|
|
const char *patch = frag->patch;
|
|
|
|
int offset, size = frag->size;
|
|
|
|
char *old = xmalloc(size);
|
|
|
|
char *new = xmalloc(size);
|
2006-04-10 09:33:06 +00:00
|
|
|
const char *oldlines, *newlines;
|
2005-06-05 18:03:13 +00:00
|
|
|
int oldsize = 0, newsize = 0;
|
2006-04-10 09:33:06 +00:00
|
|
|
unsigned long leading, trailing;
|
|
|
|
int pos, lines;
|
2005-06-05 18:03:13 +00:00
|
|
|
|
|
|
|
while (size > 0) {
|
|
|
|
int len = linelen(patch, size);
|
|
|
|
int plen;
|
|
|
|
|
|
|
|
if (!len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "plen" is how much of the line we should use for
|
|
|
|
* the actual patch data. Normally we just remove the
|
|
|
|
* first character on the line, but if the line is
|
|
|
|
* followed by "\ No newline", then we also remove the
|
|
|
|
* last one (which is the newline, of course).
|
|
|
|
*/
|
|
|
|
plen = len-1;
|
2005-07-22 16:56:39 +00:00
|
|
|
if (len < size && patch[len] == '\\')
|
2005-06-05 18:03:13 +00:00
|
|
|
plen--;
|
|
|
|
switch (*patch) {
|
|
|
|
case ' ':
|
|
|
|
case '-':
|
|
|
|
memcpy(old + oldsize, patch + 1, plen);
|
|
|
|
oldsize += plen;
|
|
|
|
if (*patch == '-')
|
|
|
|
break;
|
|
|
|
/* Fall-through for ' ' */
|
|
|
|
case '+':
|
2006-02-27 02:13:25 +00:00
|
|
|
if (*patch != '+' || !no_add)
|
|
|
|
newsize += apply_line(new + newsize, patch,
|
|
|
|
plen);
|
2005-06-05 18:03:13 +00:00
|
|
|
break;
|
|
|
|
case '@': case '\\':
|
|
|
|
/* Ignore it, we already handled it */
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
patch += len;
|
|
|
|
size -= len;
|
|
|
|
}
|
|
|
|
|
2006-02-17 14:23:16 +00:00
|
|
|
#ifdef NO_ACCURATE_DIFF
|
|
|
|
if (oldsize > 0 && old[oldsize - 1] == '\n' &&
|
|
|
|
newsize > 0 && new[newsize - 1] == '\n') {
|
|
|
|
oldsize--;
|
|
|
|
newsize--;
|
|
|
|
}
|
|
|
|
#endif
|
2006-04-10 09:33:06 +00:00
|
|
|
|
|
|
|
oldlines = old;
|
|
|
|
newlines = new;
|
|
|
|
leading = frag->leading;
|
|
|
|
trailing = frag->trailing;
|
|
|
|
lines = 0;
|
|
|
|
pos = frag->newpos;
|
|
|
|
for (;;) {
|
|
|
|
offset = find_offset(buf, desc->size, oldlines, oldsize, pos, &lines);
|
|
|
|
if (offset >= 0) {
|
|
|
|
int diff = newsize - oldsize;
|
|
|
|
unsigned long size = desc->size + diff;
|
|
|
|
unsigned long alloc = desc->alloc;
|
|
|
|
|
|
|
|
/* Warn if it was necessary to reduce the number
|
|
|
|
* of context lines.
|
|
|
|
*/
|
|
|
|
if ((leading != frag->leading) || (trailing != frag->trailing))
|
|
|
|
fprintf(stderr, "Context reduced to (%ld/%ld) to apply fragment at %d\n",
|
|
|
|
leading, trailing, pos + lines);
|
|
|
|
|
|
|
|
if (size > alloc) {
|
|
|
|
alloc = size + 8192;
|
|
|
|
desc->alloc = alloc;
|
|
|
|
buf = xrealloc(buf, alloc);
|
|
|
|
desc->buffer = buf;
|
|
|
|
}
|
|
|
|
desc->size = size;
|
|
|
|
memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
|
|
|
|
memcpy(buf + offset, newlines, newsize);
|
|
|
|
offset = 0;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Am I at my context limits? */
|
|
|
|
if ((leading <= p_context) && (trailing <= p_context))
|
|
|
|
break;
|
|
|
|
/* Reduce the number of context lines
|
|
|
|
* Reduce both leading and trailing if they are equal
|
|
|
|
* otherwise just reduce the larger context.
|
|
|
|
*/
|
|
|
|
if (leading >= trailing) {
|
|
|
|
remove_first_line(&oldlines, &oldsize);
|
|
|
|
remove_first_line(&newlines, &newsize);
|
|
|
|
pos--;
|
|
|
|
leading--;
|
|
|
|
}
|
|
|
|
if (trailing > leading) {
|
|
|
|
remove_last_line(&oldlines, &oldsize);
|
|
|
|
remove_last_line(&newlines, &newsize);
|
|
|
|
trailing--;
|
2005-06-05 19:16:32 +00:00
|
|
|
}
|
2005-06-05 18:03:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free(old);
|
|
|
|
free(new);
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2005-06-05 19:16:32 +00:00
|
|
|
static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
|
2005-06-05 18:03:13 +00:00
|
|
|
{
|
|
|
|
struct fragment *frag = patch->fragments;
|
2005-11-15 01:37:05 +00:00
|
|
|
const char *name = patch->old_name ? patch->old_name : patch->new_name;
|
|
|
|
|
|
|
|
if (patch->is_binary) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
if (!allow_binary_replacement)
|
|
|
|
return error("cannot apply binary patch to '%s' "
|
|
|
|
"without --allow-binary-replacement",
|
|
|
|
name);
|
|
|
|
|
|
|
|
/* For safety, we require patch index line to contain
|
|
|
|
* full 40-byte textual SHA1 for old and new, at least for now.
|
|
|
|
*/
|
|
|
|
if (strlen(patch->old_sha1_prefix) != 40 ||
|
|
|
|
strlen(patch->new_sha1_prefix) != 40 ||
|
|
|
|
get_sha1_hex(patch->old_sha1_prefix, sha1) ||
|
|
|
|
get_sha1_hex(patch->new_sha1_prefix, sha1))
|
|
|
|
return error("cannot apply binary patch to '%s' "
|
|
|
|
"without full index line", name);
|
|
|
|
|
|
|
|
if (patch->old_name) {
|
|
|
|
unsigned char hdr[50];
|
|
|
|
int hdrlen;
|
|
|
|
|
|
|
|
/* See if the old one matches what the patch
|
|
|
|
* applies to.
|
|
|
|
*/
|
|
|
|
write_sha1_file_prepare(desc->buffer, desc->size,
|
2006-04-02 12:44:09 +00:00
|
|
|
blob_type, sha1, hdr, &hdrlen);
|
2005-11-15 01:37:05 +00:00
|
|
|
if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
|
|
|
|
return error("the patch applies to '%s' (%s), "
|
|
|
|
"which does not match the "
|
|
|
|
"current contents.",
|
|
|
|
name, sha1_to_hex(sha1));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Otherwise, the old one must be empty. */
|
|
|
|
if (desc->size)
|
|
|
|
return error("the patch applies to an empty "
|
|
|
|
"'%s' but it is not empty", name);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For now, we do not record post-image data in the patch,
|
|
|
|
* and require the object already present in the recipient's
|
|
|
|
* object database.
|
|
|
|
*/
|
|
|
|
if (desc->buffer) {
|
|
|
|
free(desc->buffer);
|
|
|
|
desc->alloc = desc->size = 0;
|
|
|
|
}
|
|
|
|
get_sha1_hex(patch->new_sha1_prefix, sha1);
|
|
|
|
|
|
|
|
if (memcmp(sha1, null_sha1, 20)) {
|
|
|
|
char type[10];
|
|
|
|
unsigned long size;
|
|
|
|
|
|
|
|
desc->buffer = read_sha1_file(sha1, type, &size);
|
|
|
|
if (!desc->buffer)
|
|
|
|
return error("the necessary postimage %s for "
|
|
|
|
"'%s' does not exist",
|
|
|
|
patch->new_sha1_prefix, name);
|
|
|
|
desc->alloc = desc->size = size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-06-05 18:03:13 +00:00
|
|
|
|
|
|
|
while (frag) {
|
2005-06-05 19:16:32 +00:00
|
|
|
if (apply_one_fragment(desc, frag) < 0)
|
2005-11-15 01:37:05 +00:00
|
|
|
return error("patch failed: %s:%ld",
|
|
|
|
name, frag->oldpos);
|
2005-06-05 18:03:13 +00:00
|
|
|
frag = frag->next;
|
|
|
|
}
|
2005-06-05 19:43:56 +00:00
|
|
|
return 0;
|
2005-06-05 18:03:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int apply_data(struct patch *patch, struct stat *st)
|
|
|
|
{
|
2005-06-05 19:16:32 +00:00
|
|
|
char *buf;
|
|
|
|
unsigned long size, alloc;
|
|
|
|
struct buffer_desc desc;
|
2005-06-05 18:03:13 +00:00
|
|
|
|
2005-06-05 19:43:56 +00:00
|
|
|
size = 0;
|
|
|
|
alloc = 0;
|
|
|
|
buf = NULL;
|
|
|
|
if (patch->old_name) {
|
|
|
|
size = st->st_size;
|
|
|
|
alloc = size + 8192;
|
|
|
|
buf = xmalloc(alloc);
|
|
|
|
if (read_old_data(st, patch->old_name, buf, alloc) != size)
|
|
|
|
return error("read of %s failed", patch->old_name);
|
|
|
|
}
|
2005-06-05 19:16:32 +00:00
|
|
|
|
|
|
|
desc.size = size;
|
|
|
|
desc.alloc = alloc;
|
|
|
|
desc.buffer = buf;
|
|
|
|
if (apply_fragments(&desc, patch) < 0)
|
2005-06-05 18:03:13 +00:00
|
|
|
return -1;
|
2005-06-05 19:16:32 +00:00
|
|
|
patch->result = desc.buffer;
|
|
|
|
patch->resultsize = desc.size;
|
2005-06-05 21:05:43 +00:00
|
|
|
|
|
|
|
if (patch->is_delete && patch->resultsize)
|
|
|
|
return error("removal patch leaves file contents");
|
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
static int check_patch(struct patch *patch)
|
2005-05-26 19:25:52 +00:00
|
|
|
{
|
2005-05-26 22:10:02 +00:00
|
|
|
struct stat st;
|
2005-05-26 19:25:52 +00:00
|
|
|
const char *old_name = patch->old_name;
|
|
|
|
const char *new_name = patch->new_name;
|
2005-11-15 01:37:05 +00:00
|
|
|
const char *name = old_name ? old_name : new_name;
|
2005-05-26 19:25:52 +00:00
|
|
|
|
|
|
|
if (old_name) {
|
2005-05-26 22:10:02 +00:00
|
|
|
int changed;
|
2005-10-03 20:16:39 +00:00
|
|
|
int stat_ret = lstat(old_name, &st);
|
2005-05-26 22:10:02 +00:00
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
if (check_index) {
|
|
|
|
int pos = cache_name_pos(old_name, strlen(old_name));
|
|
|
|
if (pos < 0)
|
2005-10-03 20:16:39 +00:00
|
|
|
return error("%s: does not exist in index",
|
|
|
|
old_name);
|
|
|
|
if (stat_ret < 0) {
|
|
|
|
struct checkout costate;
|
|
|
|
if (errno != ENOENT)
|
|
|
|
return error("%s: %s", old_name,
|
|
|
|
strerror(errno));
|
|
|
|
/* checkout */
|
|
|
|
costate.base_dir = "";
|
|
|
|
costate.base_dir_len = 0;
|
|
|
|
costate.force = 0;
|
|
|
|
costate.quiet = 0;
|
|
|
|
costate.not_new = 0;
|
|
|
|
costate.refresh_cache = 1;
|
|
|
|
if (checkout_entry(active_cache[pos],
|
2006-03-05 08:24:15 +00:00
|
|
|
&costate,
|
|
|
|
NULL) ||
|
2005-10-03 20:16:39 +00:00
|
|
|
lstat(old_name, &st))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-02-09 05:15:24 +00:00
|
|
|
changed = ce_match_stat(active_cache[pos], &st, 1);
|
2005-06-05 18:03:13 +00:00
|
|
|
if (changed)
|
2005-10-03 20:16:39 +00:00
|
|
|
return error("%s: does not match index",
|
|
|
|
old_name);
|
2005-06-05 18:03:13 +00:00
|
|
|
}
|
2005-10-03 20:16:39 +00:00
|
|
|
else if (stat_ret < 0)
|
|
|
|
return error("%s: %s", old_name, strerror(errno));
|
|
|
|
|
2005-06-05 18:03:13 +00:00
|
|
|
if (patch->is_new < 0)
|
|
|
|
patch->is_new = 0;
|
2005-06-14 03:41:38 +00:00
|
|
|
st.st_mode = ntohl(create_ce_mode(st.st_mode));
|
2005-05-26 22:10:02 +00:00
|
|
|
if (!patch->old_mode)
|
|
|
|
patch->old_mode = st.st_mode;
|
2005-06-05 18:03:13 +00:00
|
|
|
if ((st.st_mode ^ patch->old_mode) & S_IFMT)
|
|
|
|
return error("%s: wrong type", old_name);
|
|
|
|
if (st.st_mode != patch->old_mode)
|
|
|
|
fprintf(stderr, "warning: %s has type %o, expected %o\n",
|
|
|
|
old_name, st.st_mode, patch->old_mode);
|
2005-05-26 19:25:52 +00:00
|
|
|
}
|
2005-05-26 22:10:02 +00:00
|
|
|
|
2005-05-26 19:25:52 +00:00
|
|
|
if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
|
2005-06-05 18:03:13 +00:00
|
|
|
if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
|
2005-05-26 22:10:02 +00:00
|
|
|
return error("%s: already exists in index", new_name);
|
|
|
|
if (!lstat(new_name, &st))
|
|
|
|
return error("%s: already exists in working directory", new_name);
|
|
|
|
if (errno != ENOENT)
|
|
|
|
return error("%s: %s", new_name, strerror(errno));
|
2005-08-17 07:01:07 +00:00
|
|
|
if (!patch->new_mode) {
|
|
|
|
if (patch->is_new)
|
|
|
|
patch->new_mode = S_IFREG | 0644;
|
|
|
|
else
|
|
|
|
patch->new_mode = patch->old_mode;
|
|
|
|
}
|
2005-05-26 19:25:52 +00:00
|
|
|
}
|
2005-06-05 18:03:13 +00:00
|
|
|
|
|
|
|
if (new_name && old_name) {
|
|
|
|
int same = !strcmp(old_name, new_name);
|
|
|
|
if (!patch->new_mode)
|
|
|
|
patch->new_mode = patch->old_mode;
|
|
|
|
if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
|
|
|
|
return error("new mode (%o) of %s does not match old mode (%o)%s%s",
|
|
|
|
patch->new_mode, new_name, patch->old_mode,
|
|
|
|
same ? "" : " of ", same ? "" : old_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (apply_data(patch, &st) < 0)
|
2005-11-15 01:37:05 +00:00
|
|
|
return error("%s: patch does not apply", name);
|
2005-05-26 22:10:02 +00:00
|
|
|
return 0;
|
2005-05-26 19:25:52 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
static int check_patch_list(struct patch *patch)
|
2005-05-26 17:23:51 +00:00
|
|
|
{
|
2005-05-26 22:10:02 +00:00
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
for (;patch ; patch = patch->next)
|
|
|
|
error |= check_patch(patch);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2005-10-07 10:42:00 +00:00
|
|
|
static inline int is_null_sha1(const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
return !memcmp(sha1, null_sha1, 20);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_index_list(struct patch *list)
|
|
|
|
{
|
|
|
|
struct patch *patch;
|
|
|
|
|
|
|
|
/* Once we start supporting the reverse patch, it may be
|
|
|
|
* worth showing the new sha1 prefix, but until then...
|
|
|
|
*/
|
|
|
|
for (patch = list; patch; patch = patch->next) {
|
|
|
|
const unsigned char *sha1_ptr;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
name = patch->old_name ? patch->old_name : patch->new_name;
|
|
|
|
if (patch->is_new)
|
|
|
|
sha1_ptr = null_sha1;
|
|
|
|
else if (get_sha1(patch->old_sha1_prefix, sha1))
|
|
|
|
die("sha1 information is lacking or useless (%s).",
|
|
|
|
name);
|
|
|
|
else
|
|
|
|
sha1_ptr = sha1;
|
2005-10-15 04:54:52 +00:00
|
|
|
|
|
|
|
printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
|
|
|
|
if (line_termination && quote_c_style(name, NULL, NULL, 0))
|
|
|
|
quote_c_style(name, NULL, stdout, 0);
|
|
|
|
else
|
|
|
|
fputs(name, stdout);
|
|
|
|
putchar(line_termination);
|
2005-10-07 10:42:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
static void stat_patch_list(struct patch *patch)
|
|
|
|
{
|
|
|
|
int files, adds, dels;
|
|
|
|
|
|
|
|
for (files = adds = dels = 0 ; patch ; patch = patch->next) {
|
|
|
|
files++;
|
|
|
|
adds += patch->lines_added;
|
|
|
|
dels += patch->lines_deleted;
|
|
|
|
show_stats(patch);
|
|
|
|
}
|
|
|
|
|
|
|
|
printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
|
2005-05-26 18:40:43 +00:00
|
|
|
}
|
|
|
|
|
2005-10-28 09:43:31 +00:00
|
|
|
static void numstat_patch_list(struct patch *patch)
|
|
|
|
{
|
|
|
|
for ( ; patch; patch = patch->next) {
|
|
|
|
const char *name;
|
|
|
|
name = patch->old_name ? patch->old_name : patch->new_name;
|
|
|
|
printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
|
|
|
|
if (line_termination && quote_c_style(name, NULL, NULL, 0))
|
|
|
|
quote_c_style(name, NULL, stdout, 0);
|
|
|
|
else
|
|
|
|
fputs(name, stdout);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-22 09:29:46 +00:00
|
|
|
static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
|
|
|
|
{
|
|
|
|
if (mode)
|
|
|
|
printf(" %s mode %06o %s\n", newdelete, mode, name);
|
|
|
|
else
|
|
|
|
printf(" %s %s\n", newdelete, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_mode_change(struct patch *p, int show_name)
|
|
|
|
{
|
|
|
|
if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
|
|
|
|
if (show_name)
|
|
|
|
printf(" mode change %06o => %06o %s\n",
|
|
|
|
p->old_mode, p->new_mode, p->new_name);
|
|
|
|
else
|
|
|
|
printf(" mode change %06o => %06o\n",
|
|
|
|
p->old_mode, p->new_mode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_rename_copy(struct patch *p)
|
|
|
|
{
|
|
|
|
const char *renamecopy = p->is_rename ? "rename" : "copy";
|
|
|
|
const char *old, *new;
|
|
|
|
|
|
|
|
/* Find common prefix */
|
|
|
|
old = p->old_name;
|
|
|
|
new = p->new_name;
|
|
|
|
while (1) {
|
|
|
|
const char *slash_old, *slash_new;
|
|
|
|
slash_old = strchr(old, '/');
|
|
|
|
slash_new = strchr(new, '/');
|
|
|
|
if (!slash_old ||
|
|
|
|
!slash_new ||
|
|
|
|
slash_old - old != slash_new - new ||
|
|
|
|
memcmp(old, new, slash_new - new))
|
|
|
|
break;
|
|
|
|
old = slash_old + 1;
|
|
|
|
new = slash_new + 1;
|
|
|
|
}
|
|
|
|
/* p->old_name thru old is the common prefix, and old and new
|
|
|
|
* through the end of names are renames
|
|
|
|
*/
|
|
|
|
if (old != p->old_name)
|
|
|
|
printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
|
2005-07-12 18:54:21 +00:00
|
|
|
(int)(old - p->old_name), p->old_name,
|
2005-06-22 09:29:46 +00:00
|
|
|
old, new, p->score);
|
|
|
|
else
|
|
|
|
printf(" %s %s => %s (%d%%)\n", renamecopy,
|
|
|
|
p->old_name, p->new_name, p->score);
|
|
|
|
show_mode_change(p, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void summary_patch_list(struct patch *patch)
|
|
|
|
{
|
|
|
|
struct patch *p;
|
|
|
|
|
|
|
|
for (p = patch; p; p = p->next) {
|
|
|
|
if (p->is_new)
|
|
|
|
show_file_mode_name("create", p->new_mode, p->new_name);
|
|
|
|
else if (p->is_delete)
|
|
|
|
show_file_mode_name("delete", p->old_mode, p->old_name);
|
|
|
|
else {
|
|
|
|
if (p->is_rename || p->is_copy)
|
|
|
|
show_rename_copy(p);
|
|
|
|
else {
|
|
|
|
if (p->score) {
|
|
|
|
printf(" rewrite %s (%d%%)\n",
|
|
|
|
p->new_name, p->score);
|
|
|
|
show_mode_change(p, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
show_mode_change(p, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-26 18:40:43 +00:00
|
|
|
static void patch_stats(struct patch *patch)
|
|
|
|
{
|
|
|
|
int lines = patch->lines_added + patch->lines_deleted;
|
|
|
|
|
|
|
|
if (lines > max_change)
|
|
|
|
max_change = lines;
|
|
|
|
if (patch->old_name) {
|
2005-10-15 04:54:52 +00:00
|
|
|
int len = quote_c_style(patch->old_name, NULL, NULL, 0);
|
|
|
|
if (!len)
|
|
|
|
len = strlen(patch->old_name);
|
2005-05-26 18:40:43 +00:00
|
|
|
if (len > max_len)
|
|
|
|
max_len = len;
|
|
|
|
}
|
|
|
|
if (patch->new_name) {
|
2005-10-15 04:54:52 +00:00
|
|
|
int len = quote_c_style(patch->new_name, NULL, NULL, 0);
|
|
|
|
if (!len)
|
|
|
|
len = strlen(patch->new_name);
|
2005-05-26 18:40:43 +00:00
|
|
|
if (len > max_len)
|
|
|
|
max_len = len;
|
|
|
|
}
|
2005-05-26 17:23:51 +00:00
|
|
|
}
|
|
|
|
|
2005-06-05 21:05:43 +00:00
|
|
|
static void remove_file(struct patch *patch)
|
|
|
|
{
|
|
|
|
if (write_index) {
|
|
|
|
if (remove_file_from_cache(patch->old_name) < 0)
|
|
|
|
die("unable to remove %s from index", patch->old_name);
|
|
|
|
}
|
|
|
|
unlink(patch->old_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
int namelen = strlen(path);
|
|
|
|
unsigned ce_size = cache_entry_size(namelen);
|
|
|
|
|
|
|
|
if (!write_index)
|
|
|
|
return;
|
|
|
|
|
2006-04-03 18:30:46 +00:00
|
|
|
ce = xcalloc(1, ce_size);
|
2005-06-05 21:05:43 +00:00
|
|
|
memcpy(ce->name, path, namelen);
|
|
|
|
ce->ce_mode = create_ce_mode(mode);
|
|
|
|
ce->ce_flags = htons(namelen);
|
|
|
|
if (lstat(path, &st) < 0)
|
|
|
|
die("unable to stat newly created file %s", path);
|
|
|
|
fill_stat_cache_info(ce, &st);
|
2006-04-02 12:44:09 +00:00
|
|
|
if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
|
2005-06-05 21:05:43 +00:00
|
|
|
die("unable to create backing store for newly created file %s", path);
|
|
|
|
if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
|
|
|
|
die("unable to add cache entry for %s", path);
|
|
|
|
}
|
|
|
|
|
2005-07-14 00:25:53 +00:00
|
|
|
static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
if (S_ISLNK(mode))
|
|
|
|
return symlink(buf, path);
|
2006-01-05 08:58:06 +00:00
|
|
|
fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
|
2005-07-14 00:25:53 +00:00
|
|
|
if (fd < 0)
|
|
|
|
return -1;
|
|
|
|
while (size) {
|
2005-12-20 00:18:28 +00:00
|
|
|
int written = xwrite(fd, buf, size);
|
|
|
|
if (written < 0)
|
2005-07-14 00:25:53 +00:00
|
|
|
die("writing file %s: %s", path, strerror(errno));
|
|
|
|
if (!written)
|
|
|
|
die("out of space writing file %s", path);
|
|
|
|
buf += written;
|
|
|
|
size -= written;
|
|
|
|
}
|
|
|
|
if (close(fd) < 0)
|
|
|
|
die("closing file %s: %s", path, strerror(errno));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-22 02:10:21 +00:00
|
|
|
/*
|
|
|
|
* We optimistically assume that the directories exist,
|
|
|
|
* which is true 99% of the time anyway. If they don't,
|
|
|
|
* we create them and try again.
|
|
|
|
*/
|
2006-02-04 06:50:57 +00:00
|
|
|
static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
|
2005-06-22 02:10:21 +00:00
|
|
|
{
|
2005-07-14 00:25:53 +00:00
|
|
|
if (!try_create_file(path, mode, buf, size))
|
|
|
|
return;
|
2005-06-22 02:10:21 +00:00
|
|
|
|
2005-07-14 00:25:53 +00:00
|
|
|
if (errno == ENOENT) {
|
2006-02-04 06:50:57 +00:00
|
|
|
if (safe_create_leading_directories(path))
|
|
|
|
return;
|
2005-07-14 00:25:53 +00:00
|
|
|
if (!try_create_file(path, mode, buf, size))
|
|
|
|
return;
|
2005-06-22 02:10:21 +00:00
|
|
|
}
|
|
|
|
|
2005-07-14 00:25:53 +00:00
|
|
|
if (errno == EEXIST) {
|
|
|
|
unsigned int nr = getpid();
|
2005-06-22 02:10:21 +00:00
|
|
|
|
2005-07-14 00:25:53 +00:00
|
|
|
for (;;) {
|
|
|
|
const char *newpath;
|
|
|
|
newpath = mkpath("%s~%u", path, nr);
|
|
|
|
if (!try_create_file(newpath, mode, buf, size)) {
|
|
|
|
if (!rename(newpath, path))
|
|
|
|
return;
|
|
|
|
unlink(newpath);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (errno != EEXIST)
|
|
|
|
break;
|
2006-01-05 09:00:12 +00:00
|
|
|
++nr;
|
|
|
|
}
|
2005-06-22 02:10:21 +00:00
|
|
|
}
|
2005-07-14 00:25:53 +00:00
|
|
|
die("unable to write file %s mode %o", path, mode);
|
2005-06-22 02:10:21 +00:00
|
|
|
}
|
|
|
|
|
2005-06-05 21:05:43 +00:00
|
|
|
static void create_file(struct patch *patch)
|
|
|
|
{
|
2006-02-04 06:50:57 +00:00
|
|
|
char *path = patch->new_name;
|
2005-06-05 21:05:43 +00:00
|
|
|
unsigned mode = patch->new_mode;
|
|
|
|
unsigned long size = patch->resultsize;
|
|
|
|
char *buf = patch->result;
|
|
|
|
|
|
|
|
if (!mode)
|
|
|
|
mode = S_IFREG | 0644;
|
2005-07-14 00:25:53 +00:00
|
|
|
create_one_file(path, mode, buf, size);
|
|
|
|
add_index_file(path, mode, buf, size);
|
2005-06-05 21:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void write_out_one_result(struct patch *patch)
|
|
|
|
{
|
|
|
|
if (patch->is_delete > 0) {
|
|
|
|
remove_file(patch);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (patch->is_new > 0 || patch->is_copy) {
|
|
|
|
create_file(patch);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Rename or modification boils down to the same
|
|
|
|
* thing: remove the old, write the new
|
|
|
|
*/
|
|
|
|
remove_file(patch);
|
|
|
|
create_file(patch);
|
|
|
|
}
|
|
|
|
|
2005-07-22 16:56:57 +00:00
|
|
|
static void write_out_results(struct patch *list, int skipped_patch)
|
2005-06-05 21:05:43 +00:00
|
|
|
{
|
2005-07-22 16:56:57 +00:00
|
|
|
if (!list && !skipped_patch)
|
2005-06-05 22:25:28 +00:00
|
|
|
die("No changes");
|
|
|
|
|
2005-06-05 21:05:43 +00:00
|
|
|
while (list) {
|
|
|
|
write_out_one_result(list);
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct cache_file cache_file;
|
|
|
|
|
2005-07-22 16:56:57 +00:00
|
|
|
static struct excludes {
|
|
|
|
struct excludes *next;
|
|
|
|
const char *path;
|
|
|
|
} *excludes;
|
|
|
|
|
|
|
|
static int use_patch(struct patch *p)
|
|
|
|
{
|
2005-08-23 20:34:07 +00:00
|
|
|
const char *pathname = p->new_name ? p->new_name : p->old_name;
|
2005-07-22 16:56:57 +00:00
|
|
|
struct excludes *x = excludes;
|
|
|
|
while (x) {
|
|
|
|
if (fnmatch(x->path, pathname, 0) == 0)
|
|
|
|
return 0;
|
|
|
|
x = x->next;
|
|
|
|
}
|
2005-11-26 07:14:15 +00:00
|
|
|
if (0 < prefix_length) {
|
|
|
|
int pathlen = strlen(pathname);
|
|
|
|
if (pathlen <= prefix_length ||
|
|
|
|
memcmp(prefix, pathname, prefix_length))
|
|
|
|
return 0;
|
|
|
|
}
|
2005-07-22 16:56:57 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-02-27 02:13:25 +00:00
|
|
|
static int apply_patch(int fd, const char *filename)
|
2005-05-23 17:52:17 +00:00
|
|
|
{
|
|
|
|
unsigned long offset, size;
|
|
|
|
char *buffer = read_patch_file(fd, &size);
|
2005-05-26 17:23:51 +00:00
|
|
|
struct patch *list = NULL, **listp = &list;
|
2005-07-22 16:56:57 +00:00
|
|
|
int skipped_patch = 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
2006-02-27 02:13:25 +00:00
|
|
|
patch_input_file = filename;
|
2005-05-23 17:52:17 +00:00
|
|
|
if (!buffer)
|
|
|
|
return -1;
|
|
|
|
offset = 0;
|
|
|
|
while (size > 0) {
|
2005-05-26 17:23:51 +00:00
|
|
|
struct patch *patch;
|
|
|
|
int nr;
|
|
|
|
|
2006-04-03 18:30:46 +00:00
|
|
|
patch = xcalloc(1, sizeof(*patch));
|
2005-05-26 17:23:51 +00:00
|
|
|
nr = parse_chunk(buffer + offset, size, patch);
|
2005-05-23 17:52:17 +00:00
|
|
|
if (nr < 0)
|
|
|
|
break;
|
2005-07-22 16:56:57 +00:00
|
|
|
if (use_patch(patch)) {
|
|
|
|
patch_stats(patch);
|
|
|
|
*listp = patch;
|
|
|
|
listp = &patch->next;
|
|
|
|
} else {
|
|
|
|
/* perhaps free it a bit better? */
|
|
|
|
free(patch);
|
|
|
|
skipped_patch++;
|
|
|
|
}
|
2005-05-23 17:52:17 +00:00
|
|
|
offset += nr;
|
|
|
|
size -= nr;
|
|
|
|
}
|
2005-05-26 17:23:51 +00:00
|
|
|
|
2006-02-27 02:13:25 +00:00
|
|
|
if (whitespace_error && (new_whitespace == error_on_whitespace))
|
|
|
|
apply = 0;
|
|
|
|
|
2005-06-05 21:05:43 +00:00
|
|
|
write_index = check_index && apply;
|
2006-05-09 08:08:23 +00:00
|
|
|
if (write_index && newfd < 0)
|
2005-06-05 21:05:43 +00:00
|
|
|
newfd = hold_index_file_for_update(&cache_file, get_index_file());
|
|
|
|
if (check_index) {
|
|
|
|
if (read_cache() < 0)
|
|
|
|
die("unable to read index file");
|
|
|
|
}
|
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
if ((check || apply) && check_patch_list(list) < 0)
|
|
|
|
exit(1);
|
|
|
|
|
2005-06-05 21:05:43 +00:00
|
|
|
if (apply)
|
2005-07-22 16:56:57 +00:00
|
|
|
write_out_results(list, skipped_patch);
|
2005-06-05 21:05:43 +00:00
|
|
|
|
2005-10-07 10:42:00 +00:00
|
|
|
if (show_index_info)
|
|
|
|
show_index_list(list);
|
|
|
|
|
2005-05-26 22:10:02 +00:00
|
|
|
if (diffstat)
|
|
|
|
stat_patch_list(list);
|
2005-05-26 17:23:51 +00:00
|
|
|
|
2005-10-28 09:43:31 +00:00
|
|
|
if (numstat)
|
|
|
|
numstat_patch_list(list);
|
|
|
|
|
2005-06-22 09:29:46 +00:00
|
|
|
if (summary)
|
|
|
|
summary_patch_list(list);
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
free(buffer);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-27 22:47:45 +00:00
|
|
|
static int git_apply_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (!strcmp(var, "apply.whitespace")) {
|
|
|
|
apply_default_whitespace = strdup(value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return git_default_config(var, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int i;
|
2005-05-23 23:42:21 +00:00
|
|
|
int read_stdin = 1;
|
2006-02-27 22:47:45 +00:00
|
|
|
const char *whitespace_option = NULL;
|
2005-05-23 17:52:17 +00:00
|
|
|
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
2006-04-10 09:33:06 +00:00
|
|
|
char *end;
|
2005-05-23 17:52:17 +00:00
|
|
|
int fd;
|
|
|
|
|
|
|
|
if (!strcmp(arg, "-")) {
|
2006-02-27 02:13:25 +00:00
|
|
|
apply_patch(0, "<stdin>");
|
2005-05-23 23:42:21 +00:00
|
|
|
read_stdin = 0;
|
2005-05-23 17:52:17 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-07-22 16:56:57 +00:00
|
|
|
if (!strncmp(arg, "--exclude=", 10)) {
|
|
|
|
struct excludes *x = xmalloc(sizeof(*x));
|
|
|
|
x->path = arg + 10;
|
|
|
|
x->next = excludes;
|
|
|
|
excludes = x;
|
|
|
|
continue;
|
|
|
|
}
|
2006-01-31 05:36:24 +00:00
|
|
|
if (!strncmp(arg, "-p", 2)) {
|
|
|
|
p_value = atoi(arg + 2);
|
|
|
|
continue;
|
|
|
|
}
|
2005-11-10 04:38:33 +00:00
|
|
|
if (!strcmp(arg, "--no-add")) {
|
|
|
|
no_add = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-26 19:25:52 +00:00
|
|
|
if (!strcmp(arg, "--stat")) {
|
2005-05-26 22:10:02 +00:00
|
|
|
apply = 0;
|
2005-05-26 19:25:52 +00:00
|
|
|
diffstat = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-11-15 01:37:05 +00:00
|
|
|
if (!strcmp(arg, "--allow-binary-replacement")) {
|
|
|
|
allow_binary_replacement = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-28 09:43:31 +00:00
|
|
|
if (!strcmp(arg, "--numstat")) {
|
|
|
|
apply = 0;
|
|
|
|
numstat = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-22 09:29:46 +00:00
|
|
|
if (!strcmp(arg, "--summary")) {
|
|
|
|
apply = 0;
|
|
|
|
summary = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-26 22:10:02 +00:00
|
|
|
if (!strcmp(arg, "--check")) {
|
|
|
|
apply = 0;
|
|
|
|
check = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-05 18:03:13 +00:00
|
|
|
if (!strcmp(arg, "--index")) {
|
|
|
|
check_index = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-23 16:00:01 +00:00
|
|
|
if (!strcmp(arg, "--apply")) {
|
|
|
|
apply = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-15 04:54:52 +00:00
|
|
|
if (!strcmp(arg, "--index-info")) {
|
2005-10-07 10:42:00 +00:00
|
|
|
apply = 0;
|
|
|
|
show_index_info = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-15 04:54:52 +00:00
|
|
|
if (!strcmp(arg, "-z")) {
|
|
|
|
line_termination = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2006-04-10 09:33:06 +00:00
|
|
|
if (!strncmp(arg, "-C", 2)) {
|
|
|
|
p_context = strtoul(arg + 2, &end, 0);
|
|
|
|
if (*end != '\0')
|
|
|
|
die("unrecognized context count '%s'", arg + 2);
|
|
|
|
continue;
|
|
|
|
}
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
if (!strncmp(arg, "--whitespace=", 13)) {
|
2006-02-27 22:47:45 +00:00
|
|
|
whitespace_option = arg + 13;
|
|
|
|
parse_whitespace_option(arg + 13);
|
|
|
|
continue;
|
The war on trailing whitespace
On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.
This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.
Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.
Totally untested, of course. But it compiles, so it must be fine.
HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.
I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).
Linus
2006-02-26 17:29:00 +00:00
|
|
|
}
|
2005-11-26 07:14:15 +00:00
|
|
|
|
|
|
|
if (check_index && prefix_length < 0) {
|
|
|
|
prefix = setup_git_directory();
|
|
|
|
prefix_length = prefix ? strlen(prefix) : 0;
|
2006-02-27 22:47:45 +00:00
|
|
|
git_config(git_apply_config);
|
|
|
|
if (!whitespace_option && apply_default_whitespace)
|
|
|
|
parse_whitespace_option(apply_default_whitespace);
|
2005-11-26 07:14:15 +00:00
|
|
|
}
|
|
|
|
if (0 < prefix_length)
|
|
|
|
arg = prefix_filename(prefix, prefix_length, arg);
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
fd = open(arg, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
usage(apply_usage);
|
2005-05-23 23:42:21 +00:00
|
|
|
read_stdin = 0;
|
2006-02-28 09:12:52 +00:00
|
|
|
set_default_whitespace_mode(whitespace_option);
|
2006-02-27 02:13:25 +00:00
|
|
|
apply_patch(fd, arg);
|
2005-05-23 17:52:17 +00:00
|
|
|
close(fd);
|
|
|
|
}
|
2006-02-28 09:12:52 +00:00
|
|
|
set_default_whitespace_mode(whitespace_option);
|
2005-05-23 23:42:21 +00:00
|
|
|
if (read_stdin)
|
2006-02-27 02:13:25 +00:00
|
|
|
apply_patch(0, "<stdin>");
|
2006-02-27 22:16:30 +00:00
|
|
|
if (whitespace_error) {
|
|
|
|
if (squelch_whitespace_errors &&
|
|
|
|
squelch_whitespace_errors < whitespace_error) {
|
|
|
|
int squelched =
|
|
|
|
whitespace_error - squelch_whitespace_errors;
|
|
|
|
fprintf(stderr, "warning: squelched %d whitespace error%s\n",
|
|
|
|
squelched,
|
|
|
|
squelched == 1 ? "" : "s");
|
|
|
|
}
|
|
|
|
if (new_whitespace == error_on_whitespace)
|
|
|
|
die("%d line%s add%s trailing whitespaces.",
|
|
|
|
whitespace_error,
|
|
|
|
whitespace_error == 1 ? "" : "s",
|
|
|
|
whitespace_error == 1 ? "s" : "");
|
|
|
|
if (applied_after_stripping)
|
|
|
|
fprintf(stderr, "warning: %d line%s applied after"
|
|
|
|
" stripping trailing whitespaces.\n",
|
|
|
|
applied_after_stripping,
|
|
|
|
applied_after_stripping == 1 ? "" : "s");
|
|
|
|
else if (whitespace_error)
|
|
|
|
fprintf(stderr, "warning: %d line%s add%s trailing"
|
|
|
|
" whitespaces.\n",
|
|
|
|
whitespace_error,
|
|
|
|
whitespace_error == 1 ? "" : "s",
|
|
|
|
whitespace_error == 1 ? "s" : "");
|
|
|
|
}
|
2006-05-09 08:08:23 +00:00
|
|
|
|
|
|
|
if (write_index) {
|
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
|
|
|
commit_index_file(&cache_file))
|
|
|
|
die("Unable to write new cachefile");
|
|
|
|
}
|
|
|
|
|
2005-05-23 17:52:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|