support for MOVE command in the whole stack

MOVE is more efficient than COPY + DELETE, especially on COW file systems

DESIGN

@@ -209,8 +209,9 @@ and bsha to the sha1 sum of its body.
 - `ADD name hsha bsha` is generated whenever a new mail message is found,
   and there is no mail message with a different name but the same body.
 - `COPY name hsha bsha TO newname` is generated if a new message is found,
-  that the mailbox contains a copy of it. In case mail has been moved,
-  this message is followed by a `DELETE` command.
+  and the mailbox contains a copy of it.
+- `MOVE name hsha bsha TO newname` is generated if a new message is found,
+  and the mailbox does not contain a copy of it but it used do.
 - `COPYBODY name bsha TO newname newhsha` is generated when a new file is 
   created, and that file has the same body of an already existent file. 
   In case mail has been moved, this message is followed by a `DELETE` command.

mddiff.1.txt

@@ -3,7 +3,7 @@ NAME
 SYNOPSIS
   mddiff [--max-mailno mno] [--db-file dbf] [-l|--list] [-s|--symlink]
          [--exclude globexpr] [-v|--verbose] [-d|--dry-run] 
-         [-n|--no-delete] [--help] [--sha1sum] paths
+         [-n|--no-delete] [--no-move] [--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, 
@@ -75,6 +75,7 @@ OPTIONS
   -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
+  --no-move             Do not generate MOVE (only COPY + DELETE)
   --help                This help screen
 
 NOTES

mddiff.c

@@ -191,6 +191,7 @@ STATIC int only_mkfifo;
 STATIC int n_excludes;
 STATIC char **excludes;
 STATIC int no_delete;
+STATIC int no_move;
 
 // ============================ helpers =====================================
 
@@ -514,6 +515,12 @@ STATIC void load_db(const char* dbname){
 		txtsha(mail(m)->bsha, tmpbuff_2),\
 		URLtxt(mail_name(n),tmpbuff_6))
 
+#define COMMAND_MOVE(m,n) \
+	fprintf(stdout, "MOVE %s %s %s TO %s\n", URLtxt(mail_name(m),tmpbuff_5),\
+		txtsha(mail(m)->hsha, tmpbuff_1),\
+		txtsha(mail(m)->bsha, tmpbuff_2),\
+		URLtxt(mail_name(n),tmpbuff_6))
+
 #define COMMAND_COPYBODY(m,n) \
 	fprintf(stdout, "COPYBODY %s %s TO %s %s\n",\
 		URLtxt(mail_name(m),tmpbuff_5),txtsha(mail(m)->bsha, tmpbuff_1),\
@@ -535,6 +542,46 @@ STATIC void load_db(const char* dbname){
 		txtsha(mail(m)->bsha,tmpbuff_2), \
 		txtsha(mail(n)->hsha,tmpbuff_3))
 
+STATIC int is_old_file_still_there(const char* file){
+	int fd;
+	struct stat sb;
+	mail_t alias, m;
+
+	m = alloc_mail();
+	snprintf(next_name(), MAX_EMAIL_NAME_LEN,"%s",file);
+	set_mail_name(m,alloc_name());
+
+	fd = open_rdonly_noatime(mail_name(m));
+	if (fd == -1) {
+			goto err_alloc_cleanup;
+	}
+	if (fstat(fd, &sb) == -1) {
+			goto err_alloc_fd_cleanup;
+	}
+
+	alias = MAIL(g_hash_table_lookup(filename2mail,GPTR(m)));
+
+	if (alias != 0 && lastcheck >= sb.st_mtime) {
+		// we cache that it has been seen already
+		mail(alias)->seen=SEEN;
+
+		close(fd);
+		dealloc_name();
+		dealloc_mail();
+
+		return 1;
+	}
+
+err_alloc_fd_cleanup:
+	close(fd);
+
+err_alloc_cleanup:
+	dealloc_name();
+	dealloc_mail();
+
+	return 0;
+}
+
 // the heart
 STATIC void analyze_file(const char* dir,const char* file) {    
 	unsigned char *addr,*next;
@@ -543,7 +590,7 @@ STATIC void analyze_file(const char* dir,const char* file) {
 	mail_t alias, m;
 	GChecksum* ctx;
 	gsize ctx_len;
-	GSList *bodyaliases = NULL;
+	GSList *bodyaliases = NULL, *bodyaliases_orig = NULL;
 
 	m = alloc_mail();
 	snprintf(next_name(), MAX_EMAIL_NAME_LEN,"%s/%s",dir,file);
@@ -626,7 +673,7 @@ STATIC void analyze_file(const char* dir,const char* file) {
 		}
 	}
 
-	bodyaliases = g_hash_table_lookup(bsha2mail,GPTR(m));
+	bodyaliases_orig = bodyaliases = g_hash_table_lookup(bsha2mail,GPTR(m));
 
 	// some messages with the same body are there
 	if (bodyaliases != NULL) {
@@ -635,9 +682,28 @@ STATIC void analyze_file(const char* dir,const char* file) {
 			mail_t bodyalias = MAIL(bodyaliases->data);
 			if (hsha_equal(GPTR(bodyalias), GPTR(m))) {
 				// this one has the same header too
-				COMMAND_COPY(bodyalias,m);
-				PROMOTE(mail(bodyalias)->seen, NOT_SEEN, MOVED);
-				mail(m)->seen=SEEN;
+
+				// absurd, see the else case
+				g_assert(mail(bodyalias)->seen != MOVED || no_move);
+				if (mail(bodyalias)->seen == SEEN ||
+					is_old_file_still_there(mail_name(bodyalias)) ||
+					no_move) {
+					// a real copy
+					COMMAND_COPY(bodyalias,m);
+					PROMOTE(mail(bodyalias)->seen, NOT_SEEN, MOVED);
+					mail(m)->seen=SEEN;
+				} else {
+					// a real move
+					COMMAND_MOVE(bodyalias,m);
+
+					// the new file is the source for such body so that if the
+					// file was copied twice and then removed we generate a
+					// MOVE x -> y and a COPY y -> z
+					g_hash_table_insert(bsha2mail,GPTR(m),
+						g_slist_prepend(bodyaliases_orig,GPTR(m)));
+					mail(bodyalias)->seen=MOVED;
+					mail(m)->seen=SEEN;
+				}
 				return;
 			}
 		}
@@ -742,10 +808,11 @@ STATIC void generate_deletions(){
 	size_t m;
 
 	for(m=1; m < mailno; m++){
-		if (!no_delete && (mail(m)->seen == NOT_SEEN || mail(m)->seen == MOVED))
+		if (!no_delete &&
+			(mail(m)->seen == NOT_SEEN || (no_move && mail(m)->seen == MOVED)))
 			// normally moved or removed mails are deleted
 			COMMAND_DELETE(m);
-		else if (no_delete && mail(m)->seen == MOVED)
+		else if (no_delete && no_move && mail(m)->seen == MOVED)
 			// if --no-delete only moved mails should be deleted
 			COMMAND_DELETE(m);
 		else 
@@ -854,6 +921,7 @@ STATIC void extra_sha1sum_file(const char* file) {
 #define OPT_SHA1SUM    303
 #define OPT_MKDIRP     304
 #define OPT_MKFIFO     305
+#define OPT_NOMOVE     306
 
 // command line options
 STATIC struct option long_options[] = {
@@ -868,6 +936,7 @@ STATIC struct option long_options[] = {
 	{"verbose"   , no_argument      , NULL, 'v'},
 	{"dry-run"   , no_argument      , NULL, 'd'},
 	{"no-delete" , no_argument      , NULL, 'n'},
+	{"no-move"   , no_argument      , NULL, OPT_NOMOVE},
 	{"help"      , no_argument      , NULL, 'h'},
 	{NULL        , no_argument      , NULL, 0},
 };
@@ -970,6 +1039,9 @@ int main(int argc, char *argv[]) {
 			case OPT_MKFIFO:
 				only_mkfifo = 1;
 			break;
+			case OPT_NOMOVE:
+				no_move = 1;
+			break;
 			case 'v':
 				verbose = 1;
 			break;

smd-client

@@ -265,7 +265,8 @@ function execute_copy(name_src, hsha, bsha, name_tgt)
 	local ex_src, hsha_src, bsha_src = exists_and_sha(name_src)
 	local ex_tgt, hsha_tgt, bsha_tgt = exists_and_sha(name_tgt)
 	if ex_src and ex_tgt then
-		if hsha_src == hsha_tgt and bsha_src == bsha_tgt then
+		if hsha_src == hsha_tgt and bsha_src == bsha_tgt and
+		   hsha_src == hsha and bsha_src == bsha then
 			return (trace(true)) -- skip copy, already there
 		else
 			log_error('Failed to copy '..name_src..' to '..name_tgt)
@@ -292,7 +293,7 @@ function execute_copy(name_src, hsha, bsha, name_tgt)
 				else
 					ok = 0 -- we do not copy for real (--dry-run)
 				end
-				if ok == 0 then 
+				if ok == 0 then
 					return (trace(true)) -- copy successful
 				else 
 					log_error('Failed to copy '..name_src..' to '..name_tgt..
@@ -303,7 +304,7 @@ function execute_copy(name_src, hsha, bsha, name_tgt)
 					return (trace(false)) -- copy failed (cp command failed)
 				end
 		else
-				-- sub-optimal, we may reuse body or header 
+				-- sub-optimal, we may reuse body or header
 				return (get_full_email(name_tgt,hsha,bsha))
 		end
 	elseif not ex_src and ex_tgt then
@@ -334,6 +335,84 @@ function execute_copy(name_src, hsha, bsha, name_tgt)
 	end
 end
 
+function execute_move(name_src, hsha, bsha, name_tgt)
+	local ex_src, hsha_src, bsha_src = exists_and_sha(name_src)
+	local ex_tgt, hsha_tgt, bsha_tgt = exists_and_sha(name_tgt)
+	if ex_src and ex_tgt then
+		if hsha_tgt == hsha and bsha_tgt == bsha then
+			-- the target is already in place
+			if hsha_src == hsha and bsha_src == bsha then
+				return (execute_delete(name_src,hsha,bsha))
+			else
+				return (trace(true)) -- the source has changes, nothing to do
+			end
+		else
+			log_error('Failed to move '..name_src..' to '..name_tgt)
+			log_error('The destination already exists but its content differs.')
+			log_error('To fix this problem you have two options:')
+			log_error('- rename '..name_tgt..' by hand so that '..name_src)
+			log_error('  can be copied without replacing it.')
+			log_error('  Executing `cd; mv -n '..quote(name_tgt)..' '..
+				quote(tmp_for(name_tgt,false))..'` should work.')
+			log_error('- run @@INVERSECOMMAND@@ so that your changes to '..
+				name_tgt)
+			log_error('  are propagated to the other mailbox')
+
+			log_tags("move-message","concurrent-mailbox-edit",true,
+				mk_act('mv',name_tgt),
+				"run(@@INVERSECOMMAND@@ @@ENDPOINT@@)")
+			return (trace(false)) -- fail move, already there but !=
+		end
+	elseif ex_src and not ex_tgt then
+		if hsha_src == hsha and bsha_src == bsha then
+			local ok, err
+			if not dry_run() then
+				ok, err = os.rename(name_src,name_tgt)
+			else
+				ok = true -- we do not move for real (--dry-run)
+			end
+			if ok then
+				return (trace(true)) -- move successful
+			else
+				log_error('Failed to move '..name_src..' to '..name_tgt..
+					' : '..(err or 'unknown error'))
+
+				log_tags("move-message","bad-directory-permission",true,
+					mk_act('display', name_tgt))
+				return (trace(false)) -- copy failed (cp command failed)
+			end
+		else
+			-- sub-optimal, we may reuse body or header
+			return (get_full_email(name_tgt,hsha,bsha))
+		end
+	elseif not ex_src and ex_tgt then
+		if hsha == hsha_tgt and bsha == bsha_tgt then
+			return (trace(true)) -- skip move, already there (and no source)
+		else
+			log_error('Failed to move '..name_src..' to '..name_tgt)
+			log_error('The source file has been locally removed.')
+			log_error('The destination file already exists but its '..
+				'content differs.')
+			log_error('To fix this problem you have two options:')
+			log_error('- rename '..name_tgt..' by hand so that '..
+				name_src..' can be')
+			log_error('  copied without replacing it.')
+			log_error('  Executing `cd; mv -n '..quote(name_tgt)..' '..
+				quote(tmp_for(name_tgt,false))..'` should work.')
+			log_error('- run @@INVERSECOMMAND@@ so that your changes to '..
+				name_tgt..' are')
+			log_error('  propagated to the other mailbox')
+
+			log_tags("copy-message","concurrent-mailbox-edit",true,
+				mk_act('mv', name_tgt),
+				"run(@@INVERSECOMMAND@@ @@ENDPOINT@@)")
+			return (trace(false)) -- skip copy, already there and !=, no source
+		end
+	else
+		return (get_full_email(name_tgt,hsha,bsha))
+	end
+end
+
 function execute_replaceheader(name, hsha, bsha, hsha_new)
 	if exists(name) then
 		local hsha_l, bsha_l = sha_file(name)
@@ -367,7 +446,7 @@ function execute_copybody(name, bsha, newname, hsha)
 			else
 				ok = 0 -- we do not copy the body for merging (--dry-run)
 			end
-			if ok == 0 then 
+			if ok == 0 then
 				ok = get_header_and_merge(newname,hsha)
 				if ok then
 					return (trace(true)) -- copybody OK
@@ -442,21 +521,21 @@ end
 function execute(cmd)
 	local opcode = parse(cmd, '^(%S+)')
 
-	if opcode == "ADD" then 
+	if opcode == "ADD" then
 		local name, hsha, bsha = parse(cmd, '^ADD (%S+) (%S+) (%S+)$')
 		name = url_decode(name)
 		mkdir_p(name)
 		return (execute_add(name, hsha, bsha))
 	end
 
-	if opcode == "DELETE" then 
+	if opcode == "DELETE" then
 		local name, hsha, bsha = parse(cmd, '^DELETE (%S+) (%S+) (%S+)$')
 		name = url_decode(name)
 		mkdir_p(name)
 		return (execute_delete(name, hsha, bsha))
 	end
 
-	if opcode == "COPY" then 
+	if opcode == "COPY" then
 		local name_src, hsha, bsha, name_tgt = 
 			parse(cmd, '^COPY (%S+) (%S+) (%S+) TO (%S+)$')
 		name_src = url_decode(name_src)
@@ -465,6 +544,16 @@ function execute(cmd)
 		mkdir_p(name_tgt)
 		return (execute_copy(name_src, hsha, bsha, name_tgt))
 	end
+
+	if opcode == "MOVE" then
+		local name_src, hsha, bsha, name_tgt =
+			parse(cmd, '^MOVE (%S+) (%S+) (%S+) TO (%S+)$')
+		name_src = url_decode(name_src)
+		name_tgt = url_decode(name_tgt)
+		mkdir_p(name_src)
+		mkdir_p(name_tgt)
+		return (execute_move(name_src, hsha, bsha, name_tgt))
+	end
 	
 	if opcode == "REPLACEHEADER" then
 		local name, hsha, bsha, hsha_new = 
@@ -672,7 +761,7 @@ function main()
 	statistics.xdelta = receive(io.stdin, xdelta)
 
 	local rc
-	if not dry_run() and apply_xdelta then 
+	if not dry_run() and apply_xdelta then
 		rc = os.execute(XDELTA..' patch '..xdelta..' '..dbfile..' '..newdb)
 	else
 		rc = 0 -- the xdelta transmitted with --dry-run is dummy

smd-server

@@ -19,6 +19,7 @@ function main()
 	-- argument parsing
 	local exclude = {}
 	local no_delete = false
+	local no_move = false
 	local just_mddiff = false
 	local stop_after_diff = false
 	local override_db = nil
@@ -35,6 +36,9 @@ function main()
 		elseif arg[1] == '-n' or arg[1] == '--no-delete' then
 			no_delete = true
 			table.remove(arg,1)
+		elseif arg[1] == '--no-move' then
+			no_move = true
+			table.remove(arg,1)
 		elseif arg[1] == '--exclude' then
 			exclude[#exclude + 1] = arg[1]
 			exclude[#exclude + 1] = arg[2]
@@ -94,11 +98,14 @@ function main()
 	local mailbox_opt = table.concat(arg,' ')
 	local no_delete_opt = ''
 	if no_delete then no_delete_opt = '-n' end
+	local no_move_opt = ''
+	if no_move then no_move_opt = '--no-move' end
 	local dry_opt = ''
 	if dry_run() then dry_opt = '-d' end
 	local exclude_opt = table.concat(exclude, ' ')
 	local mddiff = MDDIFF..' '..dry_opt..' '..database_opt..' '..
-		exclude_opt..' '..no_delete_opt..' '..mailbox_opt
+		exclude_opt..' '..no_delete_opt..' '..no_move_opt..' '..
+		mailbox_opt
 	
 	-- to call mddiff from another tool with the same cmdline
 	if just_mddiff then

smd-uniform-names

@@ -88,7 +88,7 @@ CHILDSARGS="$ORIG_CHILDARGS --rename-only --override-db ~/$RENAMEDB"
 CLIENT=$!
 atexit_kill $CLIENT
 
-CHILDSARGS="$ORIG_CHILDARGS --stop-after-diff --override-db ~/$RENAMEDB"
+CHILDSARGS="$ORIG_CHILDARGS --no-move --stop-after-diff --override-db ~/$RENAMEDB"
 (run_remote_server < $LtS 2> $SL) > $StL  || EXITCODE=1
 
 wait $CLIENT || EXITCODE=1 

tests.d/client-server/02-move-mail

@@ -9,11 +9,8 @@ msync 2
 
 test_eq Mail target/Mail 
 
-X=`grep '^DELETE ' log.s2c | wc -l`
-assert $X 1 "missing DELETE in s2c"
-
-X=`grep '^COPY ' log.s2c | wc -l`
-assert $X 1 "missing COPY in s2c"
+X=`grep '^MOVE ' log.s2c | wc -l`
+assert $X 1 "missing MOVE in s2c"
 
 X=`grep '^COMMIT$' log.c2s | wc -l`
 assert $X 1 "missing COMMIT in c2s"

tests.d/client-server/33-move-fail1

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+msync 1
+
+M=Mail/cur/`ls Mail/cur/ | head -n 1`
+
+mv $M Mail/cur/copied_here
+echo -e 'foo\n\nbar' > target/Mail/cur/copied_here
+
+msync 2
+
+test_eq target/$M Mail/cur/copied_here
+
+X=`grep '^MOVE ' log.s2c | wc -l`
+assert $X 1 "missing MOVE in s2c"
+
+X=`grep '^COMMIT$' log.c2s | wc -l`
+assert $X 0 "missing COMMIT in c2s"

tests.d/client-server/34-move-fail2

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+msync 1
+
+M=Mail/cur/`ls Mail/cur/ | head -n 1`
+
+mv $M Mail/cur/copied_here
+mv target/$M target/Mail/cur/copied_here
+
+msync 2
+
+test_eq target/Mail Mail
+
+X=`grep '^MOVE ' log.s2c | wc -l`
+assert $X 1 "missing MOVE in s2c"
+
+X=`grep '^COMMIT$' log.c2s | wc -l`
+assert $X 1 "missing COMMIT in c2s"

tests.d/client-server/35-delete

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+msync 1
+
+M=Mail/cur/`ls Mail/cur/ | head -n 1`
+
+rm $M
+
+msync 2
+
+test_eq target/Mail Mail
+
+X=`grep '^DELETE ' log.s2c | wc -l`
+assert $X 1 "missing DELETE in s2c"
+
+X=`grep '^COMMIT$' log.c2s | wc -l`
+assert $X 1 "missing COMMIT in c2s"

tests.d/client-server/36-move-fail3

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+msync 1
+
+M=Mail/cur/`ls Mail/cur/ | head -n 1`
+
+mv $M Mail/cur/copied_here
+cp target/$M target/Mail/cur/copied_here
+sed -i 's/a/z/' target/$M
+
+msync 2
+
+X=`grep '^MOVE ' log.s2c | wc -l`
+assert $X 1 "missing MOVE in s2c"
+
+X=`grep '^COMMIT$' log.c2s | wc -l`
+assert $X 1 "missing COMMIT in c2s"

tests.d/mddiff/09-no-delete

@@ -17,13 +17,15 @@ 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"
+assert $N 2 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | grep $MAIL1 | wc -l`
+assert $N 1 "no DELETE command for $MAIL1"
 N=`cat log.mddiff | grep ^COPY | wc -l`
-assert $N 1 "not 1 COPY command: $N"
+assert $N 0 "COPY command"
+N=`cat log.mddiff | grep ^MOVE | grep $MAIL2 | wc -l`
+assert $N 1 "no MOVE command for $MAIL2"
 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"
+assert $N 0 "a DELETE command: $N"
+N=`cat log.mddiff | grep ^MOVE | grep $MAIL2 | wc -l`
+assert $N 1 "no MOVE command for $MAIL2"

tests.d/mddiff/10-move

@@ -0,0 +1,27 @@
+#!/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<&-
+
+mv Mail/cur/$MAIL1 Mail/cur/foo
+cp Mail/cur/$MAIL2 Mail/cur/bar1
+mv Mail/cur/$MAIL2 Mail/cur/bar2
+
+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 0 "DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 1 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 2 "wrong number of MOVE command: $N"

tests.d/mddiff/11-move-copy

@@ -0,0 +1,25 @@
+#!/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<&-
+
+cp Mail/cur/$MAIL2 Mail/cur/bar1
+
+mdiff Mail
+N=`cat log.mddiff | wc -l`
+assert $N 1 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 0 "DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 1 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 0 "wrong number of MOVE command: $N"

tests.d/mddiff/12-move-nodelete

@@ -0,0 +1,25 @@
+#!/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<&-
+
+mv Mail/cur/$MAIL2 Mail/cur/bar1
+
+mdiff --no-delete Mail
+N=`cat log.mddiff | wc -l`
+assert $N 1 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 0 "DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 0 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 1 "wrong number of MOVE command: $N"

tests.d/mddiff/13-move-copy-nomove

@@ -0,0 +1,26 @@
+#!/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<&-
+
+cp Mail/cur/$MAIL2 Mail/cur/bar0
+mv Mail/cur/$MAIL2 Mail/cur/bar1
+
+mdiff --no-move Mail
+N=`cat log.mddiff | wc -l`
+assert $N 3 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 1 "no DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 1 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 0 "wrong number of MOVE command: $N"

tests.d/mddiff/14-move-copy

@@ -0,0 +1,26 @@
+#!/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<&-
+
+cp Mail/cur/$MAIL2 Mail/cur/bar0
+mv Mail/cur/$MAIL2 Mail/cur/bar1
+
+mdiff Mail
+N=`cat log.mddiff | wc -l`
+assert $N 2 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 0 "DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 1 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 1 "wrong number of MOVE command: $N"

tests.d/mddiff/15-move-copy-nodelete

@@ -0,0 +1,26 @@
+#!/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<&-
+
+cp Mail/cur/$MAIL2 Mail/cur/bar0
+mv Mail/cur/$MAIL2 Mail/cur/bar1
+
+mdiff --no-delete Mail
+N=`cat log.mddiff | wc -l`
+assert $N 2 "too many commands: $N"
+N=`cat log.mddiff | grep ^DELETE | wc -l`
+assert $N 0 "DELETE command"
+N=`cat log.mddiff | grep ^COPY | grep Mail/cur/bar1 | wc -l`
+assert $N 1 "missing COPY command"
+N=`cat log.mddiff | grep ^MOVE | wc -l`
+assert $N 1 "wrong number of MOVE command: $N"