enable diff against local files not in bak

[bak-git.git] / bak-git-server.pl

diff --git a/bak-git-server.pl b/bak-git-server.pl
index 8ac6e3a..6c8a8f9 100755 (executable)
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -28,6 +28,8 @@ bak command overview:
 
   bak - push all changed files to server
 
+See L<http://blog.rot13.org/bak-git> for more information
+
 =cut
 
 use warnings;
@@ -51,7 +53,7 @@ $server_ip ||= '127.0.0.1';
 
 my $shell_client = <<__SHELL_CLIENT__;
 #!/bin/sh
-echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
+echo \$USER/\$SUDO_USER `hostname` `pwd` \$* | nc $server_ip 9001
 __SHELL_CLIENT__
 
 chdir $dir;
@@ -90,6 +92,11 @@ warn "dir: $dir listen: $server_ip:9001\n"
 sub pull_changes {
        my $hostname = shift;
        system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
+       if ( @_ ) {
+               open(my $files, '>>', "/tmp/$hostname.list");
+               print $files "$_\n" foreach @_;
+               close($files);
+       }
        system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
 }
 
@@ -98,6 +105,7 @@ while (my $client = $server->accept()) {
        chomp($line);
        warn "<<< $line\n";
        my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
+       $hostname =~ s/\..+$//;
 
        my $on_host = '';
        if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
@@ -111,6 +119,9 @@ while (my $client = $server->accept()) {
        my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
        warn "$hostname [$command] $on_host:$path | $message\n";
+
+       my $args_message = $message;
+
        $message ||= "$path [$command]";
        $message = "$hostname: $message";
 
@@ -131,8 +142,14 @@ while (my $client = $server->accept()) {
                pull_changes $hostname;
        } elsif ( $command eq 'add' ) {
                mkpath "$hostname/$dir" unless -e "$hostname/$dir";
-               system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
-               print $client git 'add', "$hostname/$path";
+               while ( $path ) {
+                       system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
+                       print $client git 'add', "$hostname/$path";
+
+                       $args_message =~ s/^(.+)\b// || last;
+                       $path = $1;
+                       warn "? $path";
+               }
        } elsif ( $command eq 'commit' ) {
                pull_changes $hostname;
                $message =~ s/'/\\'/g;
@@ -141,8 +158,9 @@ while (my $client = $server->accept()) {
        } elsif ( $command =~ m{(diff|status|log|ch)} ) {
                $command .= ' --stat' if $command eq 'log';
                $command = 'log --patch-with-stat' if $command =~ m/^ch/;
-               pull_changes $hostname if $command eq 'diff';
+               pull_changes( $hostname ) if $command eq 'diff';
                if ( $on_host ) {
+                       system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
                        system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
                        open(my $diff, '-|', "diff -Nuw $hostname$path $on_host$path");
                        while(<$diff>) {
@@ -150,7 +168,11 @@ while (my $client = $server->accept()) {
                        }
                } else {
                        # commands without path will show host-wide status/changes
-                       print $client git($command, $rel_path ? $backup_path : $hostname);
+                       my $backup_path = $rel_path ? $backup_path : "$hostname/";
+                       # hostname must end with / to prevent error from git:
+                       # ambiguous argument 'arh-hw': both revision and filename
+                       # to support branches named as hosts
+                       print $client git($command, $backup_path);
                }
        } elsif ( $command eq 'revert' ) {
                if ( $on_host ) {