[freeside-commits] branch master updated. 07f4516dab899ff15a34e197a3622df6675f63cf

Ivan ivan at 420.am
Mon Feb 20 00:35:26 PST 2012


The branch, master has been updated
       via  07f4516dab899ff15a34e197a3622df6675f63cf (commit)
      from  da5a5c6d5546aad5bc92e3255eaa6d9710c67426 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07f4516dab899ff15a34e197a3622df6675f63cf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 20 00:34:50 2012 -0800

    fixup commit scripts for git

diff --git a/bin/231add b/bin/231add
index ee9f8a4..c4b5437 100755
--- a/bin/231add
+++ b/bin/231add
@@ -9,15 +9,14 @@ my $dir = getcwd;
 ( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
 
 system join('',
-  #"cvs add @ARGV && ",
-  "cvs add @ARGV ; ",
+  "git 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",
+  "git add @ARGV; ",
   "cd /home/$USER/freeside2.1/$prefix/ && ",
-  "cvs add @ARGV"
+  "git add @ARGV"
 );
 
diff --git a/bin/231commit b/bin/231commit
index e047005..fa031b5 100755
--- a/bin/231commit
+++ b/bin/231commit
@@ -18,12 +18,12 @@ die "no files!" unless @ARGV;
 
 #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 & ) )"
+  "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
+  "( cd /home/$USER/freeside2.1/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
+  " && ( ( git commit  -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside2.1/$prefix; git commit -m $desc @ARGV && git push) )"
 );
 
diff --git a/bin/23add b/bin/23add
index 3c99ed8..7dc9f13 100755
--- a/bin/23add
+++ b/bin/23add
@@ -9,12 +9,11 @@ my $dir = getcwd;
 ( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
 
 system join('',
-  #"cvs add @ARGV && ",
-  "cvs add @ARGV ; ",
+  "git 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"
+  "git add @ARGV"
 );
 
diff --git a/bin/23commit b/bin/23commit
index e629a60..3416925 100755
--- a/bin/23commit
+++ b/bin/23commit
@@ -18,9 +18,9 @@ die "no files!" unless @ARGV;
 
 #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 & ) )"
+  "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && ( ( git commit  -m $desc @ARGV && git push ); ",
+  "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push ) )"
 );
 

-----------------------------------------------------------------------

Summary of changes:
 bin/231add    |    7 +++----
 bin/231commit |   14 +++++++-------
 bin/23add     |    5 ++---
 bin/23commit  |    8 ++++----
 4 files changed, 16 insertions(+), 18 deletions(-)




More information about the freeside-commits mailing list