From: ivan <ivan>
Date: Thu, 21 Jul 2011 17:53:55 +0000 (+0000)
Subject: 2.3 branch
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4f5d50c6a24ff8a96c0bf25d67571c4142cbea8c

2.3 branch
---

diff --git a/bin/21commit b/bin/21commit
index 211c0ed18..849de21b6 100755
--- a/bin/21commit
+++ b/bin/21commit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# usage: 19commit 'log message' filename filename ...
+# usage: 21commit 'log message' filename filename ...
 
 use Cwd;
 use String::ShellQuote;
diff --git a/bin/231add b/bin/231add
new file mode 100755
index 000000000..ee9f8a456
--- /dev/null
+++ b/bin/231add
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+system join('',
+  #"cvs add @ARGV && ",
+  "cvs add @ARGV ; ",
+  "( for file in @ARGV; do ",
+     "cp -i \$file /home/$USER/freeside2.3/$prefix/`dirname \$file`;",
+     "cp -i \$file /home/$USER/freeside2.1/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside2.3/$prefix/ && ",
+  "cvs add @ARGV",
+  "cd /home/$USER/freeside2.1/$prefix/ && ",
+  "cvs add @ARGV"
+);
+
diff --git a/bin/231commit b/bin/231commit
new file mode 100755
index 000000000..9a87d8882
--- /dev/null
+++ b/bin/231commit
@@ -0,0 +1,29 @@
+#!/usr/bin/perl
+
+# usage: 231commit 'log message' filename filename ...
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+my $desc = shell_quote(shift @ARGV); # -m
+
+die "no files!" unless @ARGV;
+
+#warn "$prefix";
+
+#print <<END;
+system join('',
+  "( cd /home/$USER/freeside2.3/$prefix; cvs update @ARGV ) && ",
+  "( cd /home/$USER/freeside2.1/$prefix; cvs update @ARGV ) && ",
+  "cvs diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && cvs diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
+  " && ( ( cvs commit  -m $desc @ARGV & ); ",
+  "( sleep 1;cd /home/$USER/freeside2.3/$prefix; cvs commit -m $desc @ARGV & ) ); "
+  "( sleep 1;cd /home/$USER/freeside2.1/$prefix; cvs commit -m $desc @ARGV & ) )"
+);
+
diff --git a/bin/23add b/bin/23add
new file mode 100755
index 000000000..3c99ed8f5
--- /dev/null
+++ b/bin/23add
@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+system join('',
+  #"cvs add @ARGV && ",
+  "cvs add @ARGV ; ",
+  "( for file in @ARGV; do ",
+     "cp -i \$file /home/$USER/freeside2.3/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside2.3/$prefix/ && ",
+  "cvs add @ARGV"
+);
+
diff --git a/bin/23commit b/bin/23commit
new file mode 100755
index 000000000..e629a60e6
--- /dev/null
+++ b/bin/23commit
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+# usage: 23commit 'log message' filename filename ...
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+my $desc = shell_quote(shift @ARGV); # -m
+
+die "no files!" unless @ARGV;
+
+#warn "$prefix";
+
+#print <<END;
+system join('',
+  "( cd /home/$USER/freeside2.3/$prefix; cvs update @ARGV ) && ",
+  "cvs diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && ( ( cvs commit  -m $desc @ARGV & ); ",
+  "( sleep 1;cd /home/$USER/freeside2.3/$prefix; cvs commit -m $desc @ARGV & ) )"
+);
+
diff --git a/bin/23diff b/bin/23diff
new file mode 100755
index 000000000..0c0575aa6
--- /dev/null
+++ b/bin/23diff
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+my $file = shift;
+
+chomp(my $dir = `pwd`);
+$dir =~ s/freeside\//freeside2.3\//;
+
+#$cmd = "diff -u $file $dir/$file";
+$cmd = "diff -u $dir/$file $file";
+print "$cmd\n";
+system($cmd);
+