Expand-Diff - support PS v2, add tests

Author: nightroman

Demo/Expand-Diff/.test.ps1

@@ -0,0 +1,68 @@
+
+task Add {
+	remove a, b
+
+	Expand-Diff.ps1 Test-Add.diff
+
+	$r = @(Get-ChildItem a -Recurse -Force)
+	equals $r.Count 0
+
+	$r = @(Get-ChildItem b -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\b\1.txt"
+	equals (Get-Content b\1.txt) '1'
+
+	remove a, b
+}
+
+task Delete {
+	remove a, b
+
+	Expand-Diff.ps1 Test-Delete.diff
+
+	$r = @(Get-ChildItem a -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\a\1.txt"
+	equals (Get-Content a\1.txt) '1'
+
+	$r = @(Get-ChildItem b -Recurse -Force)
+	equals $r.Count 0
+
+	remove a, b
+}
+
+task Rename {
+	remove a, b
+
+	Expand-Diff.ps1 Test-Rename.diff
+
+	$r = @(Get-ChildItem a -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\a\1.txt"
+	equals (Get-Content a\1.txt) '2'
+
+	$r = @(Get-ChildItem b -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\b\2.txt"
+	equals (Get-Content b\2.txt) '2'
+
+	remove a, b
+}
+
+task Change {
+	remove a, b
+
+	Expand-Diff.ps1 Test-Change.diff
+
+	$r = @(Get-ChildItem a -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\a\файл.txt"
+	equals ((Get-Content a\файл.txt -Encoding UTF8) -join '|') '@@ -1,5 +1,5 @@|мой|дядя|самый|честных|правил'
+
+	$r = @(Get-ChildItem b -Recurse -Force)
+	equals $r.Count 1
+	equals $r[0].FullName "$BuildRoot\b\файл.txt"
+	equals ((Get-Content b\файл.txt -Encoding UTF8) -join '|') '@@ -1,5 +1,5 @@|мой|дядя|самых|честных|правил'
+
+	remove a, b
+}

Demo/Expand-Diff/Test-Add.diff

@@ -0,0 +1,8 @@
+
+diff --git a/1.txt b/1.txt
+new file mode 100644
+index 0000000..d00491f
+--- /dev/null
++++ b/1.txt
+@@ -0,0 +1 @@
++1

Demo/Expand-Diff/Test-Change.diff

@@ -0,0 +1,12 @@
+
+diff --git "a/\321\204\320\260\320\271\320\273.txt" "b/\321\204\320\260\320\271\320\273.txt"
+index c6ab37f..33e126b 100644
+--- "a/\321\204\320\260\320\271\320\273.txt"
++++ "b/\321\204\320\260\320\271\320\273.txt"
+@@ -1,5 +1,5 @@
+ мой
+ дядя
+-самый
++самых
+ честных
+ правил

Demo/Expand-Diff/Test-Delete.diff

@@ -0,0 +1,8 @@
+
+diff --git a/1.txt b/1.txt
+deleted file mode 100644
+index d00491f..0000000
+--- a/1.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-1

Demo/Expand-Diff/Test-Rename.diff

@@ -0,0 +1,15 @@
+
+diff --git a/1.txt b/1.txt
+deleted file mode 100644
+index 0cfbf08..0000000
+--- a/1.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-2
+diff --git a/2.txt b/2.txt
+new file mode 100644
+index 0000000..0cfbf08
+--- /dev/null
++++ b/2.txt
+@@ -0,0 +1 @@
++2

Expand-Diff.ps1

@@ -1,8 +1,8 @@
 <#PSScriptInfo
-.VERSION 1.0.1
+.VERSION 1.0.2
 .AUTHOR Roman Kuzmin
 .COPYRIGHT (c) Roman Kuzmin
-.TAGS Git Diff Compare Merge
+.TAGS Git Diff Patch Compare Merge
 .GUID 964fe648-2547-4062-a2ce-6a0756b50223
 .PROJECTURI https://github.com/nightroman/PowerShelf
 .LICENSEURI http://www.apache.org/licenses/LICENSE-2.0
@@ -15,19 +15,19 @@
 .Description
 	The script is designed for diff and patch files created by git. It expands
 	the specified diff file into directories "a" and "b" (original and changes)
-	with pieces of files provided by the diff.
+	with pieces of files stored in the diff.
 
 	Then you can use your diff tool of choice in order to compare the
 	directories "a" and "b", i.e. to visualize the original diff file.
 
 	The following diff lines are recognized and processed:
 
-	|--- a/... | "a/..." | /dev/null ~ file "a"
-	|+++ b/... | "b/..." | /dev/null ~ file "b"
-	|@@... ~ chunk header
-	| ... ~ common line
-	|-... ~ "a" line
-	|+... ~ "b" line
+		--- a/... | "a/..." | /dev/null ~ file "a"
+		+++ b/... | "b/..." | /dev/null ~ file "b"
+		@@... ~ chunk header
+		 ... ~ common line
+		-... ~ "a" line
+		+... ~ "b" line
 
 	Other lines are ignored.
 
@@ -58,15 +58,15 @@ $Root = $PSCmdlet.GetUnresolvedProviderPathFromPSPath($Root)
 
 $RootA = Join-Path $Root a
 $RootB = Join-Path $Root b
-if (Test-Path -LiteralPath $RootA) {throw "The path '$RootA' exists. Remove it or specify a different root."}
-if (Test-Path -LiteralPath $RootB) {throw "The path '$RootB' exists. Remove it or specify a different root."}
+if (Test-Path -LiteralPath $RootA) {throw "The item '$RootA' exists. Remove it or specify a different root."}
+if (Test-Path -LiteralPath $RootB) {throw "The item '$RootB' exists. Remove it or specify a different root."}
 $null = [System.IO.Directory]::CreateDirectory($RootA)
 $null = [System.IO.Directory]::CreateDirectory($RootB)
 
 $fileA = ''
 $fileB = ''
-$linesA = [System.Collections.Generic.List[string]]@()
-$linesB = [System.Collections.Generic.List[string]]@()
+$linesA = [Activator]::CreateInstance([System.Collections.Generic.List[string]])
+$linesB = [Activator]::CreateInstance([System.Collections.Generic.List[string]])
 
 function Write-A {
 	if ($fileA) {
@@ -88,9 +88,10 @@ $regexOctets = [regex]'(\\\d\d\d)+'
 
 $decodeOctets = {
 	$x = $args[0].Value
-	$a = [System.Collections.Generic.List[byte]]@()
-	for($i = 1; $i -lt $x.Length; $i += 4) {
-		$a.Add([byte][Convert]::ToInt32($x.Substring($i, 3), 8))
+	$n = $x.Length / 4
+	$a = [Activator]::CreateInstance([byte[]], $n)
+	for($i = 0; $i -lt $n; ++$i) {
+		$a[$i] = [Convert]::ToByte($x.Substring($i * 4 + 1, 3), 8)
 	}
 	[System.Text.Encoding]::UTF8.GetString($a)
 }

Pack/Release-Notes.md

@@ -1,5 +1,9 @@
 # PowerShelf Release Notes
 
+## v1.11.2
+
+*Expand-Diff.ps1* - PowerShell v2 support, tests.
+
 ## v1.11.1
 
 *Expand-Diff.ps1* - deal with encoded file names.