r3731 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-06-29 06:35:30 -0400 (Sun, 29 Jun 2008)
New Revision: 3731

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/branch-manager
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
Log:
r3730 | div0 | 2008-06-29 12:31:38 +0200 (Sun, 29 Jun 2008) | 2 lines
oops... remove some debug spam

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-06-29 10:31:38 UTC (rev 3730)
+++ branches/nexuiz-2.0/.patchsets	2008-06-29 10:35:30 UTC (rev 3731)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3726
+revisions_applied = 1-3730

Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager	2008-06-29 10:31:38 UTC (rev 3730)
+++ branches/nexuiz-2.0/branch-manager	2008-06-29 10:35:30 UTC (rev 3731)
@@ -162,6 +162,17 @@
 	return $1;
 }
 
+sub GetLog($$)
+{
+	my ($first, $last) = @_;
+	my $log = OutputOf 'svn log -r#1:#2 #3', $first, $last, $conf{master};
+	$log =~ s/^-*$//gm;
+	$log =~ s/\n+/\n/gs;
+	$log =~ s/^\n//s;
+	$log =~ s/\n$//s;
+	return $log;
+}
+
 my ($cmd, @args) = @ARGV;
 $cmd = 'help' if not defined $cmd;
 
@@ -186,10 +197,8 @@
 	for(GetUnappliedRanges(GetMasterRev()))
 	{
 		my ($a, $b) = @$_;
-		my $log = OutputOf 'svn log -r#1:#2 #3', $a, $b, $conf{master};
-		$log =~ s/^-*$//gm;
-		$log =~ s/\n+/\n/gs;
-		if($log =~ /^\n?$/s)
+		my $log = GetLog $a, $b;
+		if($log eq '')
 		{
 			push @autoadd, [$a, $b];
 			next;
@@ -221,7 +230,7 @@
 	
 	open my $fh, '>', '.commitmsg'
 		or die "open .commitmsg";
-	print $fh OutputOf 'svn log -r#1:#2 #3', $first, $last, $conf{master};
+	print $fh GetLog $first, $last;
 	close $fh;
 
 	WriteSettings();
@@ -241,7 +250,7 @@
 
 	open my $fh, '>', '.commitmsg'
 		or die "open .commitmsg";
-	print $fh OutputOf 'svn log -r#1:#2 #3', $first, $last, $conf{master};
+	print $fh "undo the following merge:\n", GetLog $first, last;
 	close $fh;
 
 	WriteSettings();

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2008-06-29 10:31:38 UTC (rev 3730)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2008-06-29 10:35:30 UTC (rev 3731)
@@ -116,9 +116,9 @@
 				if(teamcheck)
 				if(spot.team != teamcheck)
 					error("invalid spawn added");
-				*/
 
 				print("added ", etos(spot), "\n");
+				*/
 			}
 		}
 	}