don't pull whole directory on diff (sigh!)

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

diff --git a/bak-git-server.pl b/bak-git-server.pl
index 882dba3..2b223c6 100755 (executable)
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -19,12 +19,12 @@ bak command overview:
 
   bak add /path
   bak commit [/path [message]]
-  bak diff [/path]
+  bak diff [host:][/path]
   bak status [/path]
   bak log [/path]
 
   bak ch[anges]
-  bak revert /path
+  bak revert [host:]/path
 
   bak - push all changed files to server
 
@@ -51,7 +51,7 @@ $server_ip ||= '127.0.0.1';
 
 my $shell_client = <<__SHELL_CLIENT__;
 #!/bin/sh
-echo `hostname -s` `pwd` \$* | nc $server_ip 9001
+echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
 __SHELL_CLIENT__
 
 chdir $dir;
@@ -90,19 +90,34 @@ 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/"
 }
 
 while (my $client = $server->accept()) {
        my $line = <$client>;
+       chomp($line);
        warn "<<< $line\n";
-       my ($hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,5);
-
+       my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
+
+       my $on_host = '';
+       if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
+               if ( -e $1 ) {
+                       $on_host = $1;
+               } else {
+                       print $client "host $1 doesn't exist in backup\n";
+                       next;
+               }
+       }
        my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
-       $message ||= '';
-       warn "$hostname [$command] $path | $message\n";
-       $message ||= "$hostname [$command] $path";
+       warn "$hostname [$command] $on_host:$path | $message\n";
+       $message ||= "$path [$command]";
+       $message = "$hostname: $message";
 
        my $dir = $path;
        $dir =~ s{/[^/]+$}{};
@@ -126,16 +141,29 @@ while (my $client = $server->accept()) {
        } elsif ( $command eq 'commit' ) {
                pull_changes $hostname;
                $message =~ s/'/\\'/g;
-               print $client git( "commit -m '$message' $backup_path" );
+               $user =~ s/\/$//;
+               print $client git( "commit -m '$message' --author '$user <$hostname>' $backup_path" );
        } 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';
-               # commands without path will show host-wide status/changes
-               print $client git($command, $rel_path ? $backup_path : $hostname);
+               pull_changes( $hostname ) if $command eq 'diff';
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
+                       open(my $diff, '-|', "diff -Nuw $hostname$path $on_host$path");
+                       while(<$diff>) {
+                               print $client $_;
+                       }
+               } else {
+                       # commands without path will show host-wide status/changes
+                       print $client git($command, $rel_path ? $backup_path : $hostname);
+               }
        } elsif ( $command eq 'revert' ) {
-               print $client git "checkout -- $hostname/$path";
-               system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "$on_host/$path", "root\@$hostname:$path";
+               } else {
+                       print $client git "checkout -- $hostname/$path";
+                       system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               }
        } else {
                print $client "Unknown command: $command\n";
        }