Teach fast-import how to clear the internal branch content.

Some frontends may not be able to (easily) keep track of which files
are included in the branch, and which aren't.  Performing this
tracking can be tedious and error prone for the frontend to do,
especially if its foreign data source cannot supply the changed
path list on a per-commit basis.

fast-import now allows a frontend to request that a branch's tree
be wiped clean (reset to the empty tree) at the start of a commit,
allowing the frontend to feed in all paths which belong on the branch.

This is ideal for a tar-file importer frontend, for example, as
the frontend just needs to reformat the tar data stream into a gfi
data stream, which may be something a few Perl regexps can take
care of. :)

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/fast-import.c b/fast-import.c
index c72c5c7a94..f80ddee2fa 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -26,7 +26,8 @@ Format of STDIN stream:
     lf;
   commit_msg ::= data;
 
-  file_change ::= file_del | file_obm | file_inm;
+  file_change ::= file_clr | file_del | file_obm | file_inm;
+  file_clr ::= 'deleteall' lf;
   file_del ::= 'D' sp path_str lf;
   file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
   file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
@@ -1640,6 +1641,14 @@ static void file_change_d(struct branch *b)
 	free(p_uq);
 }
 
+static void file_change_deleteall(struct branch *b)
+{
+	release_tree_content_recursive(b->branch_tree.tree);
+	hashclr(b->branch_tree.versions[0].sha1);
+	hashclr(b->branch_tree.versions[1].sha1);
+	load_tree(&b->branch_tree);
+}
+
 static void cmd_from(struct branch *b)
 {
 	const char *from;
@@ -1784,6 +1793,8 @@ static void cmd_new_commit(void)
 			file_change_m(b);
 		else if (!strncmp("D ", command_buf.buf, 2))
 			file_change_d(b);
+		else if (!strcmp("deleteall", command_buf.buf))
+			file_change_deleteall(b);
 		else
 			die("Unsupported file_change: %s", command_buf.buf);
 		read_next_command();