r3729 - branches/nexuiz-2.0
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Jun 29 06:28:50 EDT 2008
Author: div0
Date: 2008-06-29 06:28:49 -0400 (Sun, 29 Jun 2008)
New Revision: 3729
Modified:
branches/nexuiz-2.0/branch-manager
Log:
let "unmerged" command detect revision holes that contain no single change in master, and fill these gaps in .patchsets
Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager 2008-06-28 15:25:03 UTC (rev 3728)
+++ branches/nexuiz-2.0/branch-manager 2008-06-29 10:28:49 UTC (rev 3729)
@@ -182,14 +182,29 @@
elsif($cmd eq 'unmerged')
{
LoadSettings();
+ my @autoadd = ();
for(GetUnappliedRanges(GetMasterRev()))
{
my ($a, $b) = @$_;
- print "Unapplied: $a to $b\n";
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)
+ {
+ push @autoadd, [$a, $b];
+ next;
+ }
$log =~ s/^/ /gm;
+ print "Unapplied: $a to $b\n";
print "$log\n\n";
}
+ for(@autoadd)
+ {
+ my ($a, $b) = @$_;
+ print "Autofilled revision hole $a to $b\n";
+ AddPatch $a, $b;
+ }
+ WriteSettings() if @autoadd;
}
elsif($cmd eq 'merge')
{
More information about the nexuiz-commits
mailing list