mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-18 19:40:55 +01:00
parent
d6bfdf6ce7
commit
e5bb756b51
1 changed files with 1 additions and 7 deletions
|
@ -743,16 +743,10 @@ class DifferentialChangesetParser {
|
||||||
|
|
||||||
$changeset = $this->changeset;
|
$changeset = $this->changeset;
|
||||||
|
|
||||||
// Get the diff for figuring out the creation method. Currently
|
|
||||||
// 'web' method is broken for 'ignore-all' mode, because the original
|
|
||||||
// file is not available, only the diff part.
|
|
||||||
$diff = id(new DifferentialDiff())->load($changeset->getDiffID());
|
|
||||||
|
|
||||||
if ($changeset->getFileType() == DifferentialChangeType::FILE_TEXT ||
|
if ($changeset->getFileType() == DifferentialChangeType::FILE_TEXT ||
|
||||||
$changeset->getFileType() == DifferentialChangeType::FILE_SYMLINK) {
|
$changeset->getFileType() == DifferentialChangeType::FILE_SYMLINK) {
|
||||||
if ($skip_cache || !$this->loadCache()) {
|
if ($skip_cache || !$this->loadCache()) {
|
||||||
if ($this->whitespaceMode == self::WHITESPACE_IGNORE_ALL &&
|
if ($this->whitespaceMode == self::WHITESPACE_IGNORE_ALL) {
|
||||||
$diff->getCreationMethod() != 'web') {
|
|
||||||
|
|
||||||
// Huge mess. Generate a "-bw" (ignore all whitespace changes) diff,
|
// Huge mess. Generate a "-bw" (ignore all whitespace changes) diff,
|
||||||
// parse it out, and then play a shell game with the parsed format
|
// parse it out, and then play a shell game with the parsed format
|
||||||
|
|
Loading…
Reference in a new issue