Page MenuHomePhabricator
Files F90764

D7790.diff
All Users
Actions

D7790.diff
View Options

diff --git a/src/parser/ArcanistDiffParser.php b/src/parser/ArcanistDiffParser.php
--- a/src/parser/ArcanistDiffParser.php
+++ b/src/parser/ArcanistDiffParser.php
@@ -207,6 +207,8 @@
$patterns = array(
// This is a normal SVN text change, probably from "svn diff".
'(?P<type>Index): (?P<cur>.+)',
+ // This is an SVN text change, probably from "svnlook diff".
+ '(?P<type>Modified|Added|Deleted): (?P<cur>.+)',
// This is an SVN property change, probably from "svn diff".
'(?P<type>Property changes on): (?P<cur>.+)',
// This is a git commit message, probably from "git show".
@@ -285,6 +287,9 @@
switch ($match['type']) {
case 'Index':
+ case 'Modified':
+ case 'Added':
+ case 'Deleted':
$this->parseIndexHunk($change);
break;
case 'Property changes on':
diff --git a/src/parser/__tests__/ArcanistDiffParserTestCase.php b/src/parser/__tests__/ArcanistDiffParserTestCase.php
--- a/src/parser/__tests__/ArcanistDiffParserTestCase.php
+++ b/src/parser/__tests__/ArcanistDiffParserTestCase.php
@@ -570,6 +570,11 @@
ArcanistDiffChangeType::TYPE_CHANGE,
$change->getType());
break;
+ case 'svnlook-basics.svndiff':
+ case 'svnlook-add.svndiff':
+ case 'svnlook-delete.svndiff':
+ $this->assertEqual(1, count($changes));
+ break;
default:
throw new Exception("No test block for diff file {$diff_file}.");
break;
diff --git a/src/parser/__tests__/diff/svnlook-add.svndiff b/src/parser/__tests__/diff/svnlook-add.svndiff
new file mode 100644
--- /dev/null
+++ b/src/parser/__tests__/diff/svnlook-add.svndiff
@@ -0,0 +1,7 @@
+Added: OTHER
+===================================================================
+--- OTHER (rev 0)
++++ OTHER 2013-12-18 21:00:43 UTC (txn 18-y)
+@@ -0,0 +1 @@
++other
+
diff --git a/src/parser/__tests__/diff/svnlook-basics.svndiff b/src/parser/__tests__/diff/svnlook-basics.svndiff
new file mode 100644
--- /dev/null
+++ b/src/parser/__tests__/diff/svnlook-basics.svndiff
@@ -0,0 +1,10 @@
+Modified: README
+===================================================================
+--- README 2013-12-18 20:56:12 UTC (rev 17)
++++ README 2013-12-18 20:56:47 UTC (txn 17-x)
+@@ -17,3 +17,4 @@
+ j
+ j
+ j
++j
+
diff --git a/src/parser/__tests__/diff/svnlook-delete.svndiff b/src/parser/__tests__/diff/svnlook-delete.svndiff
new file mode 100644
--- /dev/null
+++ b/src/parser/__tests__/diff/svnlook-delete.svndiff
@@ -0,0 +1,7 @@
+Deleted: OTHER
+===================================================================
+--- OTHER 2013-12-18 21:00:43 UTC (rev 19)
++++ OTHER 2013-12-18 21:01:18 UTC (txn 19-z)
+@@ -1 +0,0 @@
+-other
+

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/bp/5e/y3oiyhksi6buuwj2
Default Alt Text
D7790.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility