[freeside-commits] branch master updated. a0f3e18fa990c3be65c09f45cca3e102732d77d4

Ivan ivan at 420.am
Fri May 10 00:47:16 PDT 2013


The branch, master has been updated
       via  a0f3e18fa990c3be65c09f45cca3e102732d77d4 (commit)
       via  a40c575ed229d24706a3dd491ea9fda14f7dea81 (commit)
      from  2272361a3302113bb43cbf4581e7187db25f3a58 (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 a0f3e18fa990c3be65c09f45cca3e102732d77d4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 10 00:47:12 2013 -0700

    my silly multi-branch tools

diff --git a/bin/3add b/bin/3add
new file mode 100755
index 0000000..8bc034d
--- /dev/null
+++ b/bin/3add
@@ -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/freeside3/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside3/$prefix/ && ",
+  "git add @ARGV"
+);
+

commit a40c575ed229d24706a3dd491ea9fda14f7dea81
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 10 00:46:53 2013 -0700

    3add

diff --git a/bin/3commit b/bin/3commit
new file mode 100755
index 0000000..cd1db21
--- /dev/null
+++ b/bin/3commit
@@ -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/freeside3/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside3/$prefix; patch -p1 ) ",
+  " && ( ( git pull && git commit  -m $desc @ARGV && git push ); ",
+  "( cd /home/$USER/freeside3/$prefix; git commit -m $desc @ARGV && git push ) )"
+);
+
diff --git a/bin/3diff b/bin/3diff
new file mode 100755
index 0000000..badafd5
--- /dev/null
+++ b/bin/3diff
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+my $file = shift;
+
+chomp(my $dir = `pwd`);
+$dir =~ s/freeside(\/?)/freeside3$1/;
+warn $dir;
+
+#$cmd = "diff -u $file $dir/$file";
+$cmd = "diff -ubBw $dir/$file $file";
+print "$cmd\n";
+system($cmd);
+

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

Summary of changes:
 bin/{23add => 3add}       |    4 ++--
 bin/{23commit => 3commit} |    6 +++---
 bin/{23diff => 3diff}     |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 copy bin/{23add => 3add} (71%)
 copy bin/{23commit => 3commit} (66%)
 copy bin/{23diff => 3diff} (81%)




More information about the freeside-commits mailing list