X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bak-git-server.pl;h=2b223c6c55a92a42e0afd1685b28798f8aa7d034;hb=4df71e9d801a1b344952b36e9c8bdf33294c01d1;hp=a81ef35861816aac139903d06df17db5a51ae13d;hpb=86d7c71f6e86fc26acd746251d6383b20293e433;p=bak-git.git

diff --git a/bak-git-server.pl b/bak-git-server.pl
index a81ef35..2b223c6 100755
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -15,6 +15,19 @@ You will want to add following to C<~/.ssh/config>
 
   RemoteForward 9001 localhost:9001
 
+bak command overview:
+
+  bak add /path
+  bak commit [/path [message]]
+  bak diff [host:][/path]
+  bak status [/path]
+  bak log [/path]
+
+  bak ch[anges]
+  bak revert [host:]/path
+
+  bak - push all changed files to server
+
 =cut
 
 use warnings;
@@ -33,12 +46,12 @@ GetOptions(
 ) || die "$!\n";
 
 my ( $dir, $server_ip ) = @ARGV;
-die "usage: $0 /backup/directory\n" unless $dir;
+die "usage: $0 /backup/directory 127.0.0.1\n" unless $dir;
 $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;
@@ -77,38 +90,80 @@ 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 ($hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,<$client>,5);
-
+	my $line = <$client>;
+	chomp($line);
+	warn "<<< $line\n";
+	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{/[^/]+$}{};
 
+	my $backup_path = -e "$hostname/$path" ? "$hostname/$path" : $hostname;
+
+	sub git {
+		my $args = join(' ',@_);
+		warn "# git $args\n";
+		my $out = `git $args`;
+		warn "$out\n# [", length($out), " bytes]\n" if defined $out;
+		return $out;
+	}
+
 	if ( ! $command ) {
 		pull_changes $hostname;
 	} elsif ( $command eq 'add' ) {
 		mkpath "$hostname/$dir" unless -e "$hostname/$dir";
 		system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
-		system 'git', 'add', "$hostname/$path";
+		print $client git 'add', "$hostname/$path";
 	} elsif ( $command eq 'commit' ) {
 		pull_changes $hostname;
-		system 'git', 'commit', '-m', $message,
-			-e "$hostname/$path" ? "$hostname/$path" : $hostname;
-	} elsif ( $command =~ m{(diff|status|log)} ) {
-		my $opt = '--summary' if $command eq 'log';
-		pull_changes $hostname if $command eq 'diff';
-		print $client `git $command $opt $hostname`;
+		$message =~ s/'/\\'/g;
+		$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';
+		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";
 	}