-n --no-delete option

mddiff.1.txt

@@ -2,8 +2,8 @@ NAME
   mddiff - computes diff for maildirs
 SYNOPSIS
   mddiff [--max-mailno mno] [--db-file dbf] [-l|--list] [-s|--symlink]
-         [--exclude globexpr] [-v|--verbose] [-d|--dry-run] [--help]
-         [--sha1sum] paths
+         [--exclude globexpr] [-v|--verbose] [-d|--dry-run] 
+         [-n|--no-delete] [--help] [--sha1sum] paths
 DESCRIPTION
   mddiff computes the delta from an old status of a maildir (previously
   recorded in a support file, called db file) and the current status, 
@@ -54,6 +54,11 @@ DESCRIPTION
   entered. If the match is successful, the directory and all its 
   subedirectories are skipped.
 
+  The --no-delete option tells mddiff to not output a DELETE action for
+  files that disappear. Note that a DELETE action is anyway generated for
+  files that are moved (i.e. move is COPY plus DELETE). The result is that
+  deletions are not propagated to the other endpoint.
+
 OPTIONS
   --max-mailno mno      Estimation of max mail message number (defaults to the
                         number of messages in the db-file + 1000 or 500000
@@ -69,6 +74,7 @@ OPTIONS
   -s --symlink          Create symlinks for paths read on the input fifo
   -v --verbose          Increase program verbosity (printed on stderr)
   -d --dry-run          Do not generate a new db-file
+  -n --no-delete        Do not track deleted files
   --help                This help screen
 
 NOTES

mddiff.c

@@ -138,6 +138,8 @@ STATIC char* txtURL(const char* string, char* outbuff) {
 	return outbuff;
 }
 
+#define PROMOTE(what,from,to) ((what) = ((what) == (from)) ? (to) : (from))
+
 // flags used to mark struct mail so that at the end of the scanning 
 // we output commands lookig that flag
 enum sight {
@@ -188,6 +190,7 @@ STATIC int only_mkdirp;
 STATIC int only_mkfifo;
 STATIC int n_excludes;
 STATIC char **excludes;
+STATIC int no_delete;
 
 // ============================ helpers =====================================
 
@@ -623,10 +626,12 @@ STATIC void analyze_file(const char* dir,const char* file) {
 	if (bodyalias != 0) {
 		if (hsha_equal(GPTR(bodyalias), GPTR(m))) {
 			COMMAND_COPY(bodyalias,m);
+			PROMOTE(mail(bodyalias)->seen, NOT_SEEN, MOVED);
 			mail(m)->seen=SEEN;
 			return;
 		} else {
 			COMMAND_COPYBODY(bodyalias,m);
+			PROMOTE(mail(bodyalias)->seen, NOT_SEEN, MOVED);
 			mail(m)->seen=SEEN;
 			return;
 		}
@@ -727,7 +732,11 @@ STATIC void generate_deletions(){
 	size_t m;
 
 	for(m=1; m < mailno; m++){
-		if (mail(m)->seen == NOT_SEEN) 
+		if (!no_delete && (mail(m)->seen == NOT_SEEN || mail(m)->seen == MOVED))
+			// normally moved or removed mails are deleted
+			COMMAND_DELETE(m);
+		else if (no_delete && mail(m)->seen == MOVED)
+			// if --no-delete only moved mails should be deleted
 			COMMAND_DELETE(m);
 		else 
 			VERBOSE(seen,"STATUS OF %s %s %s IS %s\n",
@@ -841,6 +850,7 @@ STATIC struct option long_options[] = {
 	{"symlink"   , no_argument      , NULL, 's'},
 	{"verbose"   , no_argument      , NULL, 'v'},
 	{"dry-run"   , no_argument      , NULL, 'd'},
+	{"no-delete" , no_argument      , NULL, 'n'},
 	{"help"      , no_argument      , NULL, 'h'},
 	{NULL        , no_argument      , NULL, 0},
 };
@@ -866,6 +876,7 @@ STATIC const char* long_options_doc[] = {
 			"Symbolic Link generation mode (short -s)",
 			"Increase program verbosity (printed on stderr, short -v)",
 			"Do not generate a new db file (short -d)",
+			"Do not track deletions (short -n)",
 			"This help screen",
 			NULL
 };
@@ -919,7 +930,7 @@ int main(int argc, char *argv[]) {
 	g_assert(MAIL(GPTR(1)) == 1);
 
 	for(;;) {
-		c = getopt_long(argc, argv, "vhdls", long_options, &option_index);
+		c = getopt_long(argc, argv, "vhndls", long_options, &option_index);
 		if (c == -1) break; // no more args
 		switch (c) {
 			case OPT_MAX_MAILNO:
@@ -948,6 +959,9 @@ int main(int argc, char *argv[]) {
 			case 'd':
 				dry_run = 1;
 			break;
+			case 'n':
+				no_delete = 1;
+			break;
 			case 'l':
 				only_list_subfolders = 1;
 			break;

smd-common

@@ -83,6 +83,7 @@ init() {
 	REMOTEEXCLUDE=
 	LOCALEXCLUDE=
 	SMDCLIENTOPTS=
+	SMDSERVEROPTS=
 
 	# default values for the configuration file
 	DEBUG=false
@@ -246,6 +247,9 @@ parse_args() {
 				VERBOSE=1
 				SHOWTAGS=1
 			;;
+			-n|--no-delete)
+				SMDSERVEROPTS="$SMDSERVEROPTS -n"
+			;;
 			-*)
 				cat <<-EOT
 				usage: `basename $0` [options] [endpoint]

smd-config.5.txt

@@ -116,6 +116,17 @@ LOCAL SYNCHRONIZATION
 
   SMDCLIENTOPTS=-l
 
+DELETIONS
+
+  In some cases, usually unidirectional synchronizations, one may want
+  to not propagate deletions. E.g. one keeps a slim working mailbox but
+  pushes to a backup mailbox to save every email. For that scenario
+  smd-pull and smd-push accept a -n, --no-delete, option. 
+  To avoid specifying this option every time one can put it in the
+  configuration file:
+
+  SMDSERVEROPTS=-n
+
 FILES
 
   ~/.smd/config.*

smd-pull

@@ -57,7 +57,7 @@ CLIENT=$!
 atexit_kill $CLIENT
 
 EXITCODE=0
-($SSH $SERVERNAME $REMOTESMDSERVER $REMOTEEXCLUDE $CHILDSARGS $CLIENTNAME $MAILBOX_REMOTE < $LtS 2> $SL) > $StL  || EXITCODE=1
+($SSH $SERVERNAME $REMOTESMDSERVER $REMOTEEXCLUDE $CHILDSARGS $SMDSERVEROPTS $CLIENTNAME $MAILBOX_REMOTE < $LtS 2> $SL) > $StL  || EXITCODE=1
 
 wait $CLIENT || EXITCODE=1 
 wait $REPORTER || EXITCODE=1 

smd-pull.1.txt

@@ -2,7 +2,8 @@ NAME
   smd-pull - syncs the local mail dir letting the remote one untouched
 
 SYNOPSIS
-  smd-pull [-d|--dry-run] [-v|--verbose] [-s|--show-tags] [-t|--template-only] [endpoint]
+  smd-pull [-d|--dry-run] [-v|--verbose] [-s|--show-tags] [-t|--template-only] 
+           [-n|--no-delete] [endpoint]
 
 DESCRIPTION
   smd-pull performs in the local maildir all the changes that
@@ -16,6 +17,7 @@ OPTIONS
   -v --verbose        Verbose output
   -s --show-tags      Machine readable output
   -d --dry-run        Do not perform any action for real
+  -n --no-delete      Do not propagate deletions
   -t --template-only  Just create a template configuration file if none
   endpoint            Is the suffix for the name of the configuration file to 
 		      use. If it is omitted, the configuration file

smd-push

@@ -54,7 +54,7 @@ atexit_kill $REPORTER
 
 setup_workarea
 
-(cd $WORKAREA; $SMDSERVER $CHILDSARGS $CLIENTNAME $MAILBOX_REMOTE < $LtC 2>> $CL) > $CtL &
+(cd $WORKAREA; $SMDSERVER $CHILDSARGS $SMDSERVEROPTS $CLIENTNAME $MAILBOX_REMOTE < $LtC 2>> $CL) > $CtL &
 CLIENT=$!
 atexit_kill $CLIENT
 

smd-push.1.txt

@@ -2,7 +2,8 @@ NAME
   smd-push - syncs the remote mail dir letting the local one untouched
 
 SYNOPSIS
-  smd-push [-d|--dry-run] [-v|--verbose] [-s|--show-tags] [-t|--template-only] [endpoint]
+  smd-push [-d|--dry-run] [-v|--verbose] [-s|--show-tags] [-t|--template-only]
+           [-n|--no-delete] [endpoint]
 
 DESCRIPTION
   smd-push performs in the remote maildir all the changes that
@@ -16,6 +17,7 @@ OPTIONS
   -v --verbose        Verbose output
   -s --show-tags      Machine readable output
   -d --dry-run        Do not perform any action for real
+  -n --no-delete      Do not propagate deletions
   -t --template-only  Just create a template configuration file if none
   endpoint            Is the suffix for the name of the configuration file to
                       use. If it is omitted, the configuration file 

smd-server

@@ -18,8 +18,9 @@ function main()
 
 	-- argument parsing
 	local exclude = {}
+	local no_delete = false
 	local usage = "Usage: "..arg[0]:match('[^/]+$')..
-		" [-vd] endpointname mailboxes...\n"
+		" [-vdn] endpointname mailboxes...\n"
 	while #arg > 2 do
 		if arg[1] == '-v' or arg[1] == '--verbose' then
 			set_verbose(true)
@@ -27,6 +28,9 @@ function main()
 		elseif arg[1] == '-d' or arg[1] == '--dry-run' then
 			set_dry_run(true)
 			table.remove(arg,1)
+		elseif arg[1] == '-n' or arg[1] == '--no-delete' then
+			no_delete = true
+			table.remove(arg,1)
 		elseif arg[1] == '--exclude' then
 			exclude[#exclude + 1] = arg[1]
 			exclude[#exclude + 1] = arg[2]
@@ -52,6 +56,8 @@ function main()
 
 	local database_opt = '--db-file '.. dbfile
 	local mailbox_opt = table.concat(arg,' ')
+	local no_delete_opt = ''
+	if no_delete then no_delete_opt = '-n' end
 	local dry_opt = ''
 	if dry_run() then dry_opt = '-d' end
 	local exclude_opt = table.concat(exclude, ' ')
@@ -61,7 +67,7 @@ function main()
 	
 	-- run mddiff and send the output to the client
 	local mddiff = MDDIFF..' '..dry_opt..' '..database_opt..' '..
-		exclude_opt..' '..mailbox_opt
+		exclude_opt..' '..no_delete_opt..' '..mailbox_opt
 	local r = io.popen(mddiff,"r")
 	local sent = 0
 	while true do

smd-server.1.txt

@@ -18,6 +18,7 @@ DESCRIPTION
 OPTIONS
   -v --verbose    Increase program verbosity (printed on stderr)
   -d --dry-run    Do not perform any action for real
+  -n --no-delete  Do not track deleted files
   --exclude glob  Exclude paths matching glob
 
 NOTES

tests.d/mddiff/09-no-delete

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+mdiff Mail
+assert $? 0 "mdiff failed"
+
+mv db.txt.new db.txt
+mv db.txt.mtime.new db.txt.mtime
+
+ls Mail/cur | head -n 2 > mails
+exec 7<mails
+read MAIL1 <&7
+read MAIL2 <&7
+exec 7<&-
+
+rm Mail/cur/$MAIL1
+mv Mail/cur/$MAIL2 Mail/cur/foo
+
+mdiff Mail
+N=`cat log.mddiff | wc -l`
+assert $N 3 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 2 "too few DELETE commands: $N"
+N=`cat log.mddiff | grep ^COPY | wc -l`
+assert $N 1 "not 1 COPY command: $N"
+mdiff -n Mail
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 1 "too many DELETE commands: $N"
+N=`cat log.mddiff | grep ^DELETE | grep $MAIL1 | wc -l`
+assert $N 0 "deletes aven if -n"

tests.d/pull-push/25-pull-nodel

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+mpull -t
+assert $? 0 "failed mpull -t"
+echo DEBUG=true >> target/.smd/config.default
+
+mpull
+assert $? 0 "failed mpull"
+test_eq Mail target/Mail 
+
+cp -r target/Mail target/Mail.bak
+rm Mail/cur/`ls Mail/cur|head -n1`
+mpull -n
+assert $? 0 "failed mpull after deletion"
+test_eq target/Mail target/Mail.bak 
+