Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15397210
D8653.id20540.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D8653.id20540.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
@@ -232,7 +232,7 @@
// 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>.+)',
+ '(?P<type>Modified|Added|Deleted|Copied): (?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".
@@ -314,6 +314,7 @@
case 'Modified':
case 'Added':
case 'Deleted':
+ case 'Copied':
$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
@@ -573,6 +573,7 @@
case 'svnlook-basics.svndiff':
case 'svnlook-add.svndiff':
case 'svnlook-delete.svndiff':
+ case 'svnlook-copied.svndiff':
$this->assertEqual(1, count($changes));
break;
case 'git-format-patch.gitdiff':
diff --git a/src/parser/__tests__/diff/svnlook-copied.svndiff b/src/parser/__tests__/diff/svnlook-copied.svndiff
new file mode 100644
--- /dev/null
+++ b/src/parser/__tests__/diff/svnlook-copied.svndiff
@@ -0,0 +1,7 @@
+Copied: movedfile (from rev 30, newfile)
+===================================================================
+--- movedfile (rev 0)
++++ movedfile 2014-03-31 02:21:25 UTC (txn 30-1o)
+@@ -0,0 +1,2 @@
++blamo
++blamo
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Mar 17, 6:48 PM (4 d, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7229637
Default Alt Text
D8653.id20540.diff (1 KB)
Attached To
Mode
D8653: Allow arc to parse `svnlook` diffs from moves/copies
Attached
Detach File
Event Timeline
Log In to Comment