undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/apply'

Browse Source 
* jc/apply:
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.
This commit is contained in:
Junio C Hamano 2006-05-17 15:47:33 -07:00
commit 53684bba49
2 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
apply.c
View File

@ -17,6 +17,8 @@
// --stat does just a diffstat, and doesn't actually apply // --stat does just a diffstat, and doesn't actually apply
// --numstat does numeric diffstat, and doesn't actually apply // --numstat does numeric diffstat, and doesn't actually apply
// --index-info shows the old and new index info for paths if available. // --index-info shows the old and new index info for paths if available.
// --index updates the cache as well.
// --cached updates only the cache without ever touching the working tree.
// //
static const char *prefix; static const char *prefix;
static int prefix_length = -1; static int prefix_length = -1;
@ -26,6 +28,7 @@ static int p_value = 1;
static int allow_binary_replacement = 0; static int allow_binary_replacement = 0;
static int check_index = 0; static int check_index = 0;
static int write_index = 0; static int write_index = 0;
static int cached = 0;
static int diffstat = 0; static int diffstat = 0;
static int numstat = 0; static int numstat = 0;
static int summary = 0; static int summary = 0;
@ -36,7 +39,7 @@ static int show_index_info = 0;
static int line_termination = '\n'; static int line_termination = '\n';
static unsigned long p_context = -1; static unsigned long p_context = -1;
static const char apply_usage[] = static const char apply_usage[] =
"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>..."; "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
static enum whitespace_eol { static enum whitespace_eol {
nowarn_whitespace, nowarn_whitespace,
@ -1600,7 +1603,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
return 0; return 0;
} }
static int apply_data(struct patch *patch, struct stat *st) static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
{ {
char *buf; char *buf;
unsigned long size, alloc; unsigned long size, alloc;
@ -1609,7 +1612,17 @@ static int apply_data(struct patch *patch, struct stat *st)
size = 0; size = 0;
alloc = 0; alloc = 0;
buf = NULL; buf = NULL;
if (patch->old_name) { if (cached) {
if (ce) {
char type[20];
buf = read_sha1_file(ce->sha1, type, &size);
if (!buf)
return error("read of %s failed",
patch->old_name);
alloc = size;
}
}
else if (patch->old_name) {
size = st->st_size; size = st->st_size;
alloc = size + 8192; alloc = size + 8192;
buf = xmalloc(alloc); buf = xmalloc(alloc);
@ -1637,16 +1650,21 @@ static int check_patch(struct patch *patch)
const char *old_name = patch->old_name; const char *old_name = patch->old_name;
const char *new_name = patch->new_name; const char *new_name = patch->new_name;
const char *name = old_name ? old_name : new_name; const char *name = old_name ? old_name : new_name;
struct cache_entry *ce = NULL;
if (old_name) { if (old_name) {
int changed; int changed = 0;
int stat_ret = lstat(old_name, &st); int stat_ret = 0;
unsigned st_mode = 0;
if (!cached)
stat_ret = lstat(old_name, &st);
if (check_index) { if (check_index) {
int pos = cache_name_pos(old_name, strlen(old_name)); int pos = cache_name_pos(old_name, strlen(old_name));
if (pos < 0) if (pos < 0)
return error("%s: does not exist in index", return error("%s: does not exist in index",
old_name); old_name);
ce = active_cache[pos];
if (stat_ret < 0) { if (stat_ret < 0) {
struct checkout costate; struct checkout costate;
if (errno != ENOENT) if (errno != ENOENT)
@ -1659,37 +1677,41 @@ static int check_patch(struct patch *patch)
costate.quiet = 0; costate.quiet = 0;
costate.not_new = 0; costate.not_new = 0;
costate.refresh_cache = 1; costate.refresh_cache = 1;
if (checkout_entry(active_cache[pos], if (checkout_entry(ce,
&costate, &costate,
NULL) || NULL) ||
lstat(old_name, &st)) lstat(old_name, &st))
return -1; return -1;
} }
if (!cached)
changed = ce_match_stat(active_cache[pos], &st, 1); changed = ce_match_stat(ce, &st, 1);
if (changed) if (changed)
return error("%s: does not match index", return error("%s: does not match index",
old_name); old_name);
if (cached)
st_mode = ntohl(ce->ce_mode);
} }
else if (stat_ret < 0) else if (stat_ret < 0)
return error("%s: %s", old_name, strerror(errno)); return error("%s: %s", old_name, strerror(errno));
if (!cached)
st_mode = ntohl(create_ce_mode(st.st_mode));
if (patch->is_new < 0) if (patch->is_new < 0)
patch->is_new = 0; patch->is_new = 0;
st.st_mode = ntohl(create_ce_mode(st.st_mode));
if (!patch->old_mode) if (!patch->old_mode)
patch->old_mode = st.st_mode; patch->old_mode = st_mode;
if ((st.st_mode ^ patch->old_mode) & S_IFMT) if ((st_mode ^ patch->old_mode) & S_IFMT)
return error("%s: wrong type", old_name); return error("%s: wrong type", old_name);
if (st.st_mode != patch->old_mode) if (st_mode != patch->old_mode)
fprintf(stderr, "warning: %s has type %o, expected %o\n", fprintf(stderr, "warning: %s has type %o, expected %o\n",
old_name, st.st_mode, patch->old_mode); old_name, st_mode, patch->old_mode);
} }
if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) { if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0) if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
return error("%s: already exists in index", new_name); return error("%s: already exists in index", new_name);
if (!lstat(new_name, &st)) if (!cached && !lstat(new_name, &st))
return error("%s: already exists in working directory", new_name); return error("%s: already exists in working directory", new_name);
if (errno != ENOENT) if (errno != ENOENT)
return error("%s: %s", new_name, strerror(errno)); return error("%s: %s", new_name, strerror(errno));
@ -1711,7 +1733,7 @@ static int check_patch(struct patch *patch)
same ? "" : " of ", same ? "" : old_name); same ? "" : " of ", same ? "" : old_name);
} }
if (apply_data(patch, &st) < 0) if (apply_data(patch, &st, ce) < 0)
return error("%s: patch does not apply", name); return error("%s: patch does not apply", name);
return 0; return 0;
} }
@ -1778,7 +1800,7 @@ static void numstat_patch_list(struct patch *patch)
{ {
for ( ; patch; patch = patch->next) { for ( ; patch; patch = patch->next) {
const char *name; const char *name;
name = patch->old_name ? patch->old_name : patch->new_name; name = patch->new_name ? patch->new_name : patch->old_name;
printf("%d\t%d\t", patch->lines_added, patch->lines_deleted); printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
if (line_termination && quote_c_style(name, NULL, NULL, 0)) if (line_termination && quote_c_style(name, NULL, NULL, 0))
quote_c_style(name, NULL, stdout, 0); quote_c_style(name, NULL, stdout, 0);
@ -1894,6 +1916,7 @@ static void remove_file(struct patch *patch)
if (remove_file_from_cache(patch->old_name) < 0) if (remove_file_from_cache(patch->old_name) < 0)
die("unable to remove %s from index", patch->old_name); die("unable to remove %s from index", patch->old_name);
} }
if (!cached)
unlink(patch->old_name); unlink(patch->old_name);
} }
@ -1911,9 +1934,11 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
memcpy(ce->name, path, namelen); memcpy(ce->name, path, namelen);
ce->ce_mode = create_ce_mode(mode); ce->ce_mode = create_ce_mode(mode);
ce->ce_flags = htons(namelen); ce->ce_flags = htons(namelen);
if (!cached) {
if (lstat(path, &st) < 0) if (lstat(path, &st) < 0)
die("unable to stat newly created file %s", path); die("unable to stat newly created file %s", path);
fill_stat_cache_info(ce, &st); fill_stat_cache_info(ce, &st);
}
if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0) if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
die("unable to create backing store for newly created file %s", path); die("unable to create backing store for newly created file %s", path);
if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
@ -1950,6 +1975,8 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
*/ */
static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size) static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
{ {
if (cached)
return;
if (!try_create_file(path, mode, buf, size)) if (!try_create_file(path, mode, buf, size))
return; return;
@ -2182,6 +2209,11 @@ int main(int argc, char **argv)
check_index = 1; check_index = 1;
continue; continue;
} }
if (!strcmp(arg, "--cached")) {
check_index = 1;
cached = 1;
continue;
}
if (!strcmp(arg, "--apply")) { if (!strcmp(arg, "--apply")) {
apply = 1; apply = 1;
continue; continue;

38
git-am.sh
View File

@ -59,46 +59,12 @@ fall_back_3way () {
GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
git-write-tree >"$dotest/patch-merge-base+" && git-write-tree >"$dotest/patch-merge-base+" &&
# index has the base tree now. # index has the base tree now.
( GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
cd "$dotest/patch-merge-tmp-dir" && git-apply $binary --cached <"$dotest/patch"
GIT_INDEX_FILE="../patch-merge-tmp-index" \
GIT_OBJECT_DIRECTORY="$O_OBJECT" \
git-apply $binary --index <../patch
)
then then
echo Using index info to reconstruct a base tree... echo Using index info to reconstruct a base tree...
mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
else
# Otherwise, try nearby trees that can be used to apply the
# patch.
(
N=10
# Hoping the patch is against our recent commits...
git-rev-list --max-count=$N HEAD
# or hoping the patch is against known tags...
git-ls-remote --tags .
) |
while read base junk
do
# See if we have it as a tree...
git-cat-file tree "$base" >/dev/null 2>&1 || continue
rm -fr "$dotest"/patch-merge-* &&
mkdir "$dotest/patch-merge-tmp-dir" || break
(
cd "$dotest/patch-merge-tmp-dir" &&
GIT_INDEX_FILE=../patch-merge-tmp-index &&
GIT_OBJECT_DIRECTORY="$O_OBJECT" &&
export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY &&
git-read-tree "$base" &&
git-apply $binary --index &&
mv ../patch-merge-tmp-index ../patch-merge-index &&
echo "$base" >../patch-merge-base
) <"$dotest/patch" 2>/dev/null && break
done
fi fi
test -f "$dotest/patch-merge-index" && test -f "$dotest/patch-merge-index" &&