r3824 - in branches/nexuiz-2.0: . Docs/server/rcon2irc data/gfx/menu/default data/qcsrc/menu data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-14 09:07:25 -0400 (Mon, 14 Jul 2008)
New Revision: 3824

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl
   branches/nexuiz-2.0/branch-manager
   branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/listbox.c
   branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc
Log:
(branch-manager: add "unmerged-diff" command)
r3822 | div0 | 2008-07-14 14:48:37 +0200 (Mon, 14 Jul 2008) | 2 lines
add COLOR_SCROLLBAR_C
r3823 | div0 | 2008-07-14 14:58:27 +0200 (Mon, 14 Jul 2008) | 2 lines
add throttling for IRC


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/.patchsets	2008-07-14 13:07:25 UTC (rev 3824)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3804,3807-3808,3817-3817
+revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3804,3807-3808,3817-3817,3822-3823

Modified: branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl
===================================================================
--- branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl	2008-07-14 13:07:25 UTC (rev 3824)
@@ -631,6 +631,7 @@
 $config{dp_listen} = $dpsock->sockname();
 print "Listening on $config{dp_listen}\n";
 
+$channels->{irc}->throttle(0.5, 5);
 
 
 # Utility routine to write to a channel by name, also outputting what's been written and some status

Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/branch-manager	2008-07-14 13:07:25 UTC (rev 3824)
@@ -173,6 +173,12 @@
 	return $log;
 }
 
+sub GetDiff($$)
+{
+	my ($first, $last) = @_;
+	return OutputOf 'svn diff -r#1:#2 #3', $first-1, $last, $conf{master};
+}
+
 my ($cmd, @args) = @ARGV;
 $cmd = 'help' if not defined $cmd;
 
@@ -190,6 +196,33 @@
 		print "Unapplied: $a to $b\n";
 	}
 }
+elsif($cmd eq 'unmerged-diff')
+{
+	LoadSettings();
+	my @autoadd = ();
+	for(GetUnappliedRanges(GetMasterRev()))
+	{
+		my ($a, $b) = @$_;
+		my $log = GetLog $a, $b;
+		if($log eq '')
+		{
+			push @autoadd, [$a, $b];
+			next;
+		}
+		$log =~ s/^/  /gm;
+		print "Unapplied: $a to $b\n";
+		print "$log\n";
+		print GetDiff $a, $b;
+		print "\n";
+	}
+	for(@autoadd)
+	{
+		my ($a, $b) = @$_;
+		print "Autofilled revision hole $a to $b\n";
+		AddPatch $a, $b;
+	}
+	WriteSettings() if @autoadd;
+}
 elsif($cmd eq 'unmerged')
 {
 	LoadSettings();
@@ -218,6 +251,8 @@
 elsif($cmd eq 'merge')
 {
 	my ($first, $last) = @args;
+	die "Usage: $0 merge first last"
+		if not defined $first;
 	$last = $first if not defined $last;
 
 	die "There is an uncommitted merge"
@@ -241,6 +276,8 @@
 elsif($cmd eq 'undo')
 {
 	my ($first, $last) = @args;
+	die "Usage: $0 undo first last"
+		if not defined $first;
 	$last = $first if not defined $last;
 	
 	die "There is an uncommitted merge"
@@ -291,6 +328,7 @@
   $0 init masterrepo rev
   $0 info
   $0 unmerged
+  $0 unmerged-diff
   $0 merge rev1 [rev2]
   $0 undo rev1 [rev2]
   $0 commit

Modified: branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt	2008-07-14 13:07:25 UTC (rev 3824)
@@ -137,6 +137,7 @@
 //   uses "scrollbar" images
 COLOR_SCROLLBAR_N               '1 1 1'
 COLOR_SCROLLBAR_F               '1 1 1'
+COLOR_SCROLLBAR_C               '1 1 1'
 COLOR_SCROLLBAR_S               '1 1 1'
 WIDTH_SCROLLBAR                 16
 

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/listbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/listbox.c	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/listbox.c	2008-07-14 13:07:25 UTC (rev 3824)
@@ -10,6 +10,7 @@
 	ATTRIB(NexuizListBox, color, vector, SKINCOLOR_SCROLLBAR_N)
 	ATTRIB(NexuizListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F)
 	ATTRIB(NexuizListBox, color2, vector, SKINCOLOR_SCROLLBAR_S)
+	ATTRIB(NexuizListBox, colorC, vector, SKINCOLOR_SCROLLBAR_C)
 ENDCLASS(NexuizListBox)
 entity makeNexuizListBox();
 #endif

Modified: branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc	2008-07-14 12:58:27 UTC (rev 3823)
+++ branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc	2008-07-14 13:07:25 UTC (rev 3824)
@@ -169,6 +169,7 @@
 	SKINSTRING(GFX_SCROLLBAR, "scrollbar");
 	SKINVECTOR(COLOR_SCROLLBAR_N, '1 1 1');
 	SKINVECTOR(COLOR_SCROLLBAR_F, '1 1 1');
+	SKINVECTOR(COLOR_SCROLLBAR_C, '1 1 1');
 	SKINVECTOR(COLOR_SCROLLBAR_S, '1 1 1');
 	SKINFLOAT(WIDTH_SCROLLBAR, 16);