Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14835666
D17547.id42207.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
D17547.id42207.diff
View Options
diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php
--- a/src/repository/api/ArcanistSubversionAPI.php
+++ b/src/repository/api/ArcanistSubversionAPI.php
@@ -292,25 +292,12 @@
// directory is newly added (see T5555) so we need to filter the results
// out later as well.
- if (phutil_is_windows()) {
- // TODO: Provide a binary_safe_diff script for Windows.
- // TODO: Provide a diff command which can take lines of context somehow.
- return $this->buildLocalFuture(
- array(
- 'diff --depth empty %s',
- $path,
- ));
- } else {
- $diff_bin = $root.'/../scripts/repository/binary_safe_diff.sh';
- $diff_cmd = Filesystem::resolvePath($diff_bin);
- return $this->buildLocalFuture(
- array(
- 'diff --depth empty --diff-cmd %s -x -U%d %s',
- $diff_cmd,
- $this->getDiffLinesOfContext(),
- $path,
- ));
- }
+ return $this->buildLocalFuture(
+ array(
+ 'diff --depth empty --internal-diff -x -U%d %s',
+ $this->getDiffLinesOfContext(),
+ $path,
+ ));
}
public function primeSVNInfoResult($path, $result) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jan 31, 10:13 PM (14 h, 20 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7079912
Default Alt Text
D17547.id42207.diff (1 KB)
Attached To
Mode
D17547: *Use subversion's internal diff tool for arc diff operation*
Attached
Detach File
Event Timeline
Log In to Comment