From: Martin Langhoff <martin@catalyst.net.nz>
Date: Fri, 11 Nov 2005 05:00:57 +0000 (+1300)
Subject: archimport: handle pika escaping
X-Git-Tag: v0.99.9h^2~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f84f9d38ebd809ecab89d2d4926c3ff6bc3c60f5;p=git.git

archimport: handle pika escaping

Arch uses pika escaping in some places (but not all!). Specifically, commits of
the type 'patch' use pika escaping in the log entries, which we parse to know
what to add/delete and what to commit.

This patch checks for hints of pika escaping and asks tla to unescape for us.

Originally implemented by Penny Leach <penny@catalyst.net.nz>

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-archimport.perl b/git-archimport.perl
index 980e827b2..e22c81628 100755
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -565,6 +565,11 @@ sub parselog {
             next if $t =~ m!\{arch\}/!;
             next if $t =~ m!\.arch-ids/!;
             next if $t =~ m!\.arch-inventory$!;
+           # tla cat-archive-log will give us filenames with spaces as file\(sp)name - why?
+           # we can assume that any filename with \ indicates some pika escaping that we want to get rid of.
+           if  ($t =~ /\\/ ){
+               $t = `tla escape --unescaped '$t'`;
+           }
             push (@tmp, shell_quote($t));
         }
         @$ref = @tmp;