[freeside-commits] branch master updated. 507f1933d20b58119cc8a23f673070ae69422fc2

[Ivan]

The branch, master has been updated
       via  507f1933d20b58119cc8a23f673070ae69422fc2 (commit)
       via  6a5a5eae620f0c98eb5c18c24d9c989879508292 (commit)
      from  a7e94a7efca6c4e27e94011513171e642883b94d (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 507f1933d20b58119cc8a23f673070ae69422fc2
Merge: 6a5a5ea a7e94a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 4 14:03:23 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 6a5a5eae620f0c98eb5c18c24d9c989879508292
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 4 14:03:12 2015 -0700

    ivan's stupid multi-branch tools, don't use them

diff --git a/bin/43add b/bin/43add
new file mode 100755
index 0000000..90d5935
--- /dev/null
+++ b/bin/43add
@@ -0,0 +1,22 @@
+#!/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('',
+  "git add @ARGV ; ",
+  "( for file in @ARGV; do ",
+     "cp -i \$file /home/$USER/freeside4/$prefix/`dirname \$file`;",
+     "cp -i \$file /home/$USER/freeside3/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside4/$prefix/ && ",
+  "git add @ARGV; ",
+  "cd /home/$USER/freeside3/$prefix/ && ",
+  "git add @ARGV"
+);
+
diff --git a/bin/43commit b/bin/43commit
new file mode 100755
index 0000000..7e3155f
--- /dev/null
+++ b/bin/43commit
@@ -0,0 +1,29 @@
+#!/usr/bin/perl
+
+# usage: 43commit '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/freeside4/$prefix; git pull ) && ",
+  "( cd /home/$USER/freeside3/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside4/$prefix; patch -p1 ) ",
+  " && git diff -u @ARGV | ( cd /home/$USER/freeside3/$prefix; patch -p1 ) ",
+  " && ( ( git pull && git commit  -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside4/$prefix; git commit -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside3/$prefix; git commit -m $desc @ARGV && git push) )"
+);
+
diff --git a/bin/4add b/bin/4add
new file mode 100755
index 0000000..bc3b5ca
--- /dev/null
+++ b/bin/4add
@@ -0,0 +1,19 @@
+#!/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('',
+  "git add @ARGV ; ",
+  "( for file in @ARGV; do ",
+     "cp -i \$file /home/$USER/freeside4/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside4/$prefix/ && ",
+  "git add @ARGV"
+);
+
diff --git a/bin/4commit b/bin/4commit
new file mode 100755
index 0000000..aea15ec
--- /dev/null
+++ b/bin/4commit
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+# usage: 4commit '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/freeside4/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside4/$prefix; patch -p1 ) ",
+  " && ( ( git pull && git commit  -m $desc @ARGV && git push ); ",
+  "( cd /home/$USER/freeside4/$prefix; git commit -m $desc @ARGV && git push ) )"
+);
+
diff --git a/bin/4diff b/bin/4diff
new file mode 100755
index 0000000..468325d
--- /dev/null
+++ b/bin/4diff
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+my $file = shift;
+
+chomp(my $dir = `pwd`);
+$dir =~ s/freeside(\/?)/freeside4$1/;
+warn $dir;
+
+#$cmd = "diff -u $file $dir/$file";
+$cmd = "diff -ubBw $dir/$file $file";
+print "$cmd\n";
+system($cmd);
+

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

Summary of changes:
 bin/{32add => 43add}       |    6 +++---
 bin/{32commit => 43commit} |   12 ++++++------
 bin/{3add => 4add}         |    4 ++--
 bin/{3commit => 4commit}   |    8 ++++----
 bin/{3diff => 4diff}       |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 copy bin/{32add => 43add} (78%)
 copy bin/{32commit => 43commit} (60%)
 copy bin/{3add => 4add} (73%)
 copy bin/{3commit => 4commit} (63%)
 copy bin/{3diff => 4diff} (82%)