builtin/apply: make remove_file() return -1 on error

chriscool · gitster · commit 6e8df3146921 · 2016-08-11T12:41:47.000-07:00
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.

To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", remove_file() should return -1 instead of
calling die().

Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -4085,17 +4085,18 @@ static void patch_stats(struct apply_state *state, struct patch *patch)
 	}
 }
 
-static void remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
+static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
 {
 	if (state->update_index) {
 		if (remove_file_from_cache(patch->old_name) < 0)
-			die(_("unable to remove %s from index"), patch->old_name);
+			return error(_("unable to remove %s from index"), patch->old_name);
 	}
 	if (!state->cached) {
 		if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
 			remove_path(patch->old_name);
 		}
 	}
+	return 0;
 }
 
 static void add_index_file(struct apply_state *state,
@@ -4274,8 +4275,10 @@ static void write_out_one_result(struct apply_state *state,
 				 int phase)
 {
 	if (patch->is_delete > 0) {
-		if (phase == 0)
-			remove_file(state, patch, 1);
+		if (phase == 0) {
+			if (remove_file(state, patch, 1))
+				exit(128);
+		}
 		return;
 	}
 	if (patch->is_new > 0 || patch->is_copy) {
@@ -4287,8 +4290,10 @@ static void write_out_one_result(struct apply_state *state,
 	 * Rename or modification boils down to the same
 	 * thing: remove the old, write the new
 	 */
-	if (phase == 0)
-		remove_file(state, patch, patch->is_rename);
+	if (phase == 0) {
+		if (remove_file(state, patch, patch->is_rename))
+			exit(128);
+	}
 	if (phase == 1)
 		create_file(state, patch);
 }

Original file line number	Diff line number	Diff line change
`@@ -4085,17 +4085,18 @@ static void patch_stats(struct apply_state state, struct patch patch)`
`4085`	`4085`	`}`
`4086`	`4086`	`}`
`4087`	`4087`
`4088`		`-static void remove_file(struct apply_state state, struct patch patch, int rmdir_empty)`
	`4088`	`+static int remove_file(struct apply_state state, struct patch patch, int rmdir_empty)`
`4089`	`4089`	`{`
`4090`	`4090`	`if (state->update_index) {`
`4091`	`4091`	`if (remove_file_from_cache(patch->old_name) < 0)`
`4092`		`- die(_("unable to remove %s from index"), patch->old_name);`
	`4092`	`+ return error(_("unable to remove %s from index"), patch->old_name);`
`4093`	`4093`	`}`
`4094`	`4094`	`if (!state->cached) {`
`4095`	`4095`	`if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {`
`4096`	`4096`	`remove_path(patch->old_name);`
`4097`	`4097`	`}`
`4098`	`4098`	`}`
	`4099`	`+ return 0;`
`4099`	`4100`	`}`
`4100`	`4101`
`4101`	`4102`	`static void add_index_file(struct apply_state *state,`
`@@ -4274,8 +4275,10 @@ static void write_out_one_result(struct apply_state *state,`
`4274`	`4275`	`int phase)`
`4275`	`4276`	`{`
`4276`	`4277`	`if (patch->is_delete > 0) {`
`4277`		`- if (phase == 0)`
`4278`		`- remove_file(state, patch, 1);`
	`4278`	`+ if (phase == 0) {`
	`4279`	`+ if (remove_file(state, patch, 1))`
	`4280`	`+ exit(128);`
	`4281`	`+ }`
`4279`	`4282`	`return;`
`4280`	`4283`	`}`
`4281`	`4284`	`if (patch->is_new > 0 \|\| patch->is_copy) {`
`@@ -4287,8 +4290,10 @@ static void write_out_one_result(struct apply_state *state,`
`4287`	`4290`	`* Rename or modification boils down to the same`
`4288`	`4291`	`* thing: remove the old, write the new`
`4289`	`4292`	`*/`
`4290`		`- if (phase == 0)`
`4291`		`- remove_file(state, patch, patch->is_rename);`
	`4293`	`+ if (phase == 0) {`
	`4294`	`+ if (remove_file(state, patch, patch->is_rename))`
	`4295`	`+ exit(128);`
	`4296`	`+ }`
`4292`	`4297`	`if (phase == 1)`
`4293`	`4298`	`create_file(state, patch);`
`4294`	`4299`	`}`