From 3c1e470b4c320973ea875014076f2fb5e9b240ed Mon Sep 17 00:00:00 2001
From: Tom Nicholls <github@tomnicholls.me.uk>
Date: Thu, 19 Dec 2013 23:55:55 +0000
Subject: [PATCH 1/4] ttlogmerge: New helper script for the Unison file
 synchroniser to allow TT logfiles from different computers to be merged into
 a master file with the best single set of information

---
 script/ttlogmerge.pl | 131 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 script/ttlogmerge.pl

diff --git a/script/ttlogmerge.pl b/script/ttlogmerge.pl
new file mode 100644
index 0000000..2607d6c
--- /dev/null
+++ b/script/ttlogmerge.pl
@@ -0,0 +1,131 @@
+#!/usr/bin/perl
+
+# Syntax: ttlogmerge logfile1 logfile2 outputlogfile
+#
+# A helper script for the Unison file synchroniser. One option for Unison is to
+# use an external program to merge two files which have been change in both
+# roots. This script uses this feature to merge two TagTime log files which
+# have been created on different machines.
+#
+# In principle, this allows you to run TagTime on multiple computers and, as
+# long as they have the same period and random seeds, create a merged file
+# which tracks what you were doing on all your machines.
+#
+# If a ping only exists in one file, use it.
+# If a ping exists in both files but one is tagged "RETRO", use the other.
+# If a ping exists in both files and both or neither are tagged "RETRO",
+#    then use the one with the most tags entered.
+# Note that it is assumed that both files have timestamps in ascending order.
+
+use strict;
+use warnings;
+
+sub longer
+# Note that this counts the length of text input, not the number of tags
+{
+	(length($_[0]) >= length($_[1])) ? $_[0] : $_[1];
+}
+
+sub parse
+# Returns the initial timestamp and tag set
+{
+	my $s = $_[0];
+	my @tokens = split(/\s+/, $s);
+	for my $i (1..3) { pop(@tokens) } # Discard date string
+#	print "parse: ", $_[0], @tokens;
+	return @tokens;
+}
+
+sub parse_timestamp
+# Returns just the initial timestamp from a line
+{
+	my $s = $_[0];
+	my @tokens = split(/\s+/, $s);
+	print "parse_timestamp: ", $tokens[0];
+	return $tokens[0];
+}
+
+open(my $f1, "<", $ARGV[0]) or die;
+open(my $f2, "<", $ARGV[1]) or die;
+open(my $fo, ">", $ARGV[2]) or die;
+
+# Read initial lines from files
+my $l1 = <$f1>;
+my $l2 = <$f2>;
+
+# If one file is present but empty, this will be skipped, and the other file
+# will be copied into the output file by the second loop.
+while (defined $l1 and defined $l2) {
+	my @l1a = &parse($l1);
+	my @l2a = &parse($l2);
+#	print $l1a[0], " ", $l2a[0], " ";
+#	print "Less than: ", ($l1a[0] < $l2a[0]);
+#	print "Greater than: ", ($l1a[0] > $l2a[0]);
+#	print "Equal: ", ($l1a[0] == $l2a[0]);
+#	exit();
+	if (not defined $l1a[0] or not defined $l2a[0])
+	{
+#		print "Spurious blank line.\n";
+		last; # Spurious blank line
+	}
+	if ($l1a[0] < $l2a[0]) {
+		# f1 has ping not in f2
+#		print $l1a[0], " ", $l2a[0], " <: Writing l1.\n", $l1; 
+		print $fo $l1;
+		$l1 = <$f1>;
+	} elsif ($l1a[0] > $l2a[0]) {
+		# f2 has ping not in f1
+#		print $l1a[0], " ", $l2a[0], " >: Writing l2.\n", $l2; 
+		print $fo $l2;
+		$l2 = <$f2>;
+	} else {
+		# both f1 and f2 have a ping
+		if ($l1 eq $l2) {
+			# Identical. Print one copy and get new data
+#			print "Identical. Writing l1.\n", $l1; 
+			print $fo $l1;
+			$l1 = <$f1>;
+			$l2 = <$f2>;
+		} else {
+			# Different content.
+			if (index($l1, " RETRO ") != -1) {
+				if (index($l2, " RETRO ") != -1) {
+#					print "Both RETRO: Writing the longer.\n", $l1, $l2, &longer($l1,$l2); 
+					# Both RETRO - print longer
+					print $fo &longer($l1, $l2);
+				} else {
+					# 1 RETRO, 2 not
+#					print "1 RETRO, 2 not. Writing l2.\n", $l1, $l2; 
+					print $fo $l2;
+				} 
+			} elsif (index($l2, "RETRO") != -1) {
+#				print "2 RETRO, 1 not. Writing l1.\n", $l1, $l2; 
+				# 2 RETRO, 1 not
+				print $fo $l1;
+			} else {
+				 # Both non-RETRO (shouldn't really happen)
+#				print "Neither RETRO. Strange. Writing the longer.\n", $l1, $l2, &longer($l1,$l2); 
+				print $fo &longer($l1, $l2);
+			}
+			# Get new lines from both files
+			$l1 = <$f1>;
+			$l2 = <$f2>;
+		}
+	}
+} 
+
+# One or both of the files is exhausted and its line undefined.
+# Any non-undefined files have unprocessed data in $lx
+if (defined $l1) {
+	do {
+#		print "Extra line in f1. Writing.\n", $l1; 
+		print $fo $l1
+	} while ($l1 = <$f1>);
+} elsif (defined $l2) {
+	do {
+#		print "Extra line in f2. Writing.\n", $l2; 
+		print $fo $l2
+	} while ($l2 = <$f2>);
+}			
+
+exit(0)

From 119f52f658ad9ffaa3a6e929258d2e61ed4c28ad Mon Sep 17 00:00:00 2001
From: Tom Nicholls <github@tomnicholls.me.uk>
Date: Fri, 20 Dec 2013 00:12:16 +0000
Subject: [PATCH 2/4] ttlogmerge: tidy up for release

---
 script/ttlogmerge.pl | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/script/ttlogmerge.pl b/script/ttlogmerge.pl
index 2607d6c..80b4569 100644
--- a/script/ttlogmerge.pl
+++ b/script/ttlogmerge.pl
@@ -21,7 +21,6 @@
 use warnings;
 
 sub longer
-# Note that this counts the length of text input, not the number of tags
 {
 	(length($_[0]) >= length($_[1])) ? $_[0] : $_[1];
 }
@@ -58,31 +57,22 @@ sub parse_timestamp
 while (defined $l1 and defined $l2) {
 	my @l1a = &parse($l1);
 	my @l2a = &parse($l2);
-#	print $l1a[0], " ", $l2a[0], " ";
-#	print "Less than: ", ($l1a[0] < $l2a[0]);
-#	print "Greater than: ", ($l1a[0] > $l2a[0]);
-#	print "Equal: ", ($l1a[0] == $l2a[0]);
-#	exit();
 	if (not defined $l1a[0] or not defined $l2a[0])
 	{
-#		print "Spurious blank line.\n";
 		last; # Spurious blank line
 	}
 	if ($l1a[0] < $l2a[0]) {
 		# f1 has ping not in f2
-#		print $l1a[0], " ", $l2a[0], " <: Writing l1.\n", $l1; 
 		print $fo $l1;
 		$l1 = <$f1>;
 	} elsif ($l1a[0] > $l2a[0]) {
 		# f2 has ping not in f1
-#		print $l1a[0], " ", $l2a[0], " >: Writing l2.\n", $l2; 
 		print $fo $l2;
 		$l2 = <$f2>;
 	} else {
 		# both f1 and f2 have a ping
 		if ($l1 eq $l2) {
 			# Identical. Print one copy and get new data
-#			print "Identical. Writing l1.\n", $l1; 
 			print $fo $l1;
 			$l1 = <$f1>;
 			$l2 = <$f2>;
@@ -90,21 +80,17 @@ sub parse_timestamp
 			# Different content.
 			if (index($l1, " RETRO ") != -1) {
 				if (index($l2, " RETRO ") != -1) {
-#					print "Both RETRO: Writing the longer.\n", $l1, $l2, &longer($l1,$l2); 
 					# Both RETRO - print longer
 					print $fo &longer($l1, $l2);
 				} else {
 					# 1 RETRO, 2 not
-#					print "1 RETRO, 2 not. Writing l2.\n", $l1, $l2; 
 					print $fo $l2;
 				} 
 			} elsif (index($l2, "RETRO") != -1) {
-#				print "2 RETRO, 1 not. Writing l1.\n", $l1, $l2; 
 				# 2 RETRO, 1 not
 				print $fo $l1;
 			} else {
 				 # Both non-RETRO (shouldn't really happen)
-#				print "Neither RETRO. Strange. Writing the longer.\n", $l1, $l2, &longer($l1,$l2); 
 				print $fo &longer($l1, $l2);
 			}
 			# Get new lines from both files

From ec022013fb8e8edc729fe3efbbfee6ea1873157e Mon Sep 17 00:00:00 2001
From: Tom Nicholls <github@tomnicholls.me.uk>
Date: Fri, 20 Dec 2013 01:01:40 +0000
Subject: [PATCH 3/4] ttlogmerge: Add missing semicolon

---
 script/ttlogmerge.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 script/ttlogmerge.pl

diff --git a/script/ttlogmerge.pl b/script/ttlogmerge.pl
old mode 100644
new mode 100755
index 80b4569..882e7d1
--- a/script/ttlogmerge.pl
+++ b/script/ttlogmerge.pl
@@ -114,4 +114,4 @@ sub parse_timestamp
 	} while ($l2 = <$f2>);
 }			
 
-exit(0)
+exit(0);

From 5104ea0eaa8eab7c9b41a2efbdceac57ba7c097a Mon Sep 17 00:00:00 2001
From: Tom Nicholls <github@tomnicholls.me.uk>
Date: Fri, 20 Dec 2013 01:10:20 +0000
Subject: [PATCH 4/4] ttlogmerge: Give usage notes

---
 script/ttlogmerge.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/ttlogmerge.pl b/script/ttlogmerge.pl
index 882e7d1..a2755c2 100755
--- a/script/ttlogmerge.pl
+++ b/script/ttlogmerge.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Syntax: ttlogmerge logfile1 logfile2 outputlogfile
+# Syntax: ttlogmerge.pl logfile1 logfile2 outputlogfile
 #
 # A helper script for the Unison file synchroniser. One option for Unison is to
 # use an external program to merge two files which have been change in both
@@ -16,6 +16,11 @@
 # If a ping exists in both files and both or neither are tagged "RETRO",
 #    then use the one with the most tags entered.
 # Note that it is assumed that both files have timestamps in ascending order.
+#
+# This is best used by adding something like the following to your Unison
+# preferences file:
+#
+# merge = Path path/to/tagtime/*.log -> /path/to/ttlogmerge.pl CURRENT1 CURRENT2 NEW
 
 use strict;
 use warnings;