Page MenuHomePhabricator
Files F15424340

D19057.id45685.diff
No OneTemporary
Actions

D19057.id45685.diff
View Options

diff --git a/resources/sql/autopatches/20161213.diff.01.hunks.php b/resources/sql/autopatches/20161213.diff.01.hunks.php
--- a/resources/sql/autopatches/20161213.diff.01.hunks.php
+++ b/resources/sql/autopatches/20161213.diff.01.hunks.php
@@ -25,9 +25,9 @@
$row['oldLen'],
$row['newOffset'],
$row['newLen'],
- DifferentialModernHunk::DATATYPE_TEXT,
+ DifferentialHunk::DATATYPE_TEXT,
'utf8',
- DifferentialModernHunk::DATAFORMAT_RAW,
+ DifferentialHunk::DATAFORMAT_RAW,
// In rare cases, this could be NULL. See T12090.
(string)$row['changes'],
$row['dateCreated'],
diff --git a/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql b/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_differential.differential_hunk_modern
+ TO {$NAMESPACE}_differential.differential_hunk;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -489,7 +489,6 @@
'DifferentialMailEngineExtension' => 'applications/differential/engineextension/DifferentialMailEngineExtension.php',
'DifferentialMailView' => 'applications/differential/mail/DifferentialMailView.php',
'DifferentialManiphestTasksField' => 'applications/differential/customfield/DifferentialManiphestTasksField.php',
- 'DifferentialModernHunk' => 'applications/differential/storage/DifferentialModernHunk.php',
'DifferentialParseCacheGarbageCollector' => 'applications/differential/garbagecollector/DifferentialParseCacheGarbageCollector.php',
'DifferentialParseCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php',
'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
@@ -5651,7 +5650,6 @@
'DifferentialMailEngineExtension' => 'PhabricatorMailEngineExtension',
'DifferentialMailView' => 'Phobject',
'DifferentialManiphestTasksField' => 'DifferentialCoreCustomField',
- 'DifferentialModernHunk' => 'DifferentialHunk',
'DifferentialParseCacheGarbageCollector' => 'PhabricatorGarbageCollector',
'DifferentialParseCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
@@ -217,8 +217,8 @@
// -echo "test";
// -(empty line)
- $hunk = id(new DifferentialModernHunk())->setChanges($context);
- $vs_hunk = id(new DifferentialModernHunk())->setChanges($vs_context);
+ $hunk = id(new DifferentialHunk())->setChanges($context);
+ $vs_hunk = id(new DifferentialHunk())->setChanges($vs_context);
if ($hunk->makeOldFile() != $vs_hunk->makeOldFile() ||
$hunk->makeNewFile() != $vs_hunk->makeNewFile()) {
return true;
diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
--- a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -32,8 +32,8 @@
$storage = $args->getArg('to');
switch ($storage) {
- case DifferentialModernHunk::DATATYPE_TEXT:
- case DifferentialModernHunk::DATATYPE_FILE:
+ case DifferentialHunk::DATATYPE_TEXT:
+ case DifferentialHunk::DATATYPE_FILE:
break;
default:
throw new PhutilArgumentUsageException(
@@ -44,13 +44,13 @@
$old_data = $hunk->getChanges();
switch ($storage) {
- case DifferentialModernHunk::DATATYPE_TEXT:
+ case DifferentialHunk::DATATYPE_TEXT:
$hunk->saveAsText();
$this->logOkay(
pht('TEXT'),
pht('Convereted hunk to text storage.'));
break;
- case DifferentialModernHunk::DATATYPE_FILE:
+ case DifferentialHunk::DATATYPE_FILE:
$hunk->saveAsFile();
$this->logOkay(
pht('FILE'),
@@ -71,7 +71,7 @@
}
private function loadHunk($id) {
- $hunk = id(new DifferentialModernHunk())->load($id);
+ $hunk = id(new DifferentialHunk())->load($id);
if (!$hunk) {
throw new PhutilArgumentUsageException(
pht(
diff --git a/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
--- a/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
@@ -3,7 +3,7 @@
final class DifferentialChangesetParserTestCase extends PhabricatorTestCase {
public function testDiffChangesets() {
- $hunk = new DifferentialModernHunk();
+ $hunk = new DifferentialHunk();
$hunk->setChanges("+a\n b\n-c");
$hunk->setNewOffset(1);
$hunk->setNewLen(2);
@@ -20,7 +20,7 @@
);
foreach ($tests as $changes => $expected) {
- $hunk = new DifferentialModernHunk();
+ $hunk = new DifferentialHunk();
$hunk->setChanges($changes);
$hunk->setNewOffset(11);
$hunk->setNewLen(3);
diff --git a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
--- a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
@@ -14,7 +14,7 @@
$new_len,
$changes) {
- $hunk = id(new DifferentialModernHunk())
+ $hunk = id(new DifferentialHunk())
->setOldOffset($old_offset)
->setOldLen($old_len)
->setNewOffset($new_offset)
diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php
--- a/src/applications/differential/query/DifferentialHunkQuery.php
+++ b/src/applications/differential/query/DifferentialHunkQuery.php
@@ -30,25 +30,12 @@
}
}
+ public function newResultObject() {
+ return new DifferentialHunk();
+ }
+
protected function loadPage() {
- $all_results = array();
-
- // Load modern hunks.
- $table = new DifferentialModernHunk();
- $conn_r = $table->establishConnection('r');
-
- $modern_data = queryfx_all(
- $conn_r,
- 'SELECT * FROM %T %Q %Q %Q',
- $table->getTableName(),
- $this->buildWhereClause($conn_r),
- $this->buildOrderClause($conn_r),
- $this->buildLimitClause($conn_r));
- $modern_results = $table->loadAllFromArray($modern_data);
-
- // Strip all the IDs off since they're not unique and nothing should be
- // using them.
- return array_values($modern_results);
+ return $this->loadStandardPage($this->newResultObject());
}
protected function willFilterPage(array $hunks) {
@@ -76,8 +63,8 @@
return $hunks;
}
- protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
- $where = array();
+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+ $where = parent::buildWhereClauseParts($conn);
if (!$this->changesets) {
throw new Exception(
@@ -87,13 +74,11 @@
}
$where[] = qsprintf(
- $conn_r,
+ $conn,
'changesetID IN (%Ld)',
mpull($this->changesets, 'getID'));
- $where[] = $this->buildPagingClause($conn_r);
-
- return $this->formatWhereClause($where);
+ return $where;
}
public function getQueryApplicationClass() {
diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
--- a/src/applications/differential/storage/DifferentialChangeset.php
+++ b/src/applications/differential/storage/DifferentialChangeset.php
@@ -118,11 +118,11 @@
public function delete() {
$this->openTransaction();
- $modern_hunks = id(new DifferentialModernHunk())->loadAllWhere(
+ $hunks = id(new DifferentialHunk())->loadAllWhere(
'changesetID = %d',
$this->getID());
- foreach ($modern_hunks as $modern_hunk) {
- $modern_hunk->delete();
+ foreach ($hunks as $hunk) {
+ $hunk->delete();
}
$this->unsavedHunks = array();
@@ -292,7 +292,7 @@
PhabricatorDestructionEngine $engine) {
$this->openTransaction();
- $hunks = id(new DifferentialModernHunk())->loadAllWhere(
+ $hunks = id(new DifferentialHunk())->loadAllWhere(
'changesetID = %d',
$this->getID());
foreach ($hunks as $hunk) {
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -189,7 +189,7 @@
$hunks = $change->getHunks();
if ($hunks) {
foreach ($hunks as $hunk) {
- $dhunk = new DifferentialModernHunk();
+ $dhunk = new DifferentialHunk();
$dhunk->setOldOffset($hunk->getOldOffset());
$dhunk->setOldLen($hunk->getOldLength());
$dhunk->setNewOffset($hunk->getNewOffset());
diff --git a/src/applications/differential/storage/DifferentialHunk.php b/src/applications/differential/storage/DifferentialHunk.php
--- a/src/applications/differential/storage/DifferentialHunk.php
+++ b/src/applications/differential/storage/DifferentialHunk.php
@@ -1,6 +1,6 @@
<?php
-abstract class DifferentialHunk
+final class DifferentialHunk
extends DifferentialDAO
implements
PhabricatorPolicyInterface,
@@ -11,16 +11,55 @@
protected $oldLen;
protected $newOffset;
protected $newLen;
+ protected $dataType;
+ protected $dataEncoding;
+ protected $dataFormat;
+ protected $data;
private $changeset;
private $splitLines;
private $structuredLines;
private $structuredFiles = array();
+ private $rawData;
+ private $forcedEncoding;
+ private $fileData;
+
const FLAG_LINES_ADDED = 1;
const FLAG_LINES_REMOVED = 2;
const FLAG_LINES_STABLE = 4;
+ const DATATYPE_TEXT = 'text';
+ const DATATYPE_FILE = 'file';
+
+ const DATAFORMAT_RAW = 'byte';
+ const DATAFORMAT_DEFLATED = 'gzde';
+
+ protected function getConfiguration() {
+ return array(
+ self::CONFIG_BINARY => array(
+ 'data' => true,
+ ),
+ self::CONFIG_COLUMN_SCHEMA => array(
+ 'dataType' => 'bytes4',
+ 'dataEncoding' => 'text16?',
+ 'dataFormat' => 'bytes4',
+ 'oldOffset' => 'uint32',
+ 'oldLen' => 'uint32',
+ 'newOffset' => 'uint32',
+ 'newLen' => 'uint32',
+ ),
+ self::CONFIG_KEY_SCHEMA => array(
+ 'key_changeset' => array(
+ 'columns' => array('changesetID'),
+ ),
+ 'key_created' => array(
+ 'columns' => array('dateCreated'),
+ ),
+ ),
+ ) + parent::getConfiguration();
+ }
+
public function getAddedLines() {
return $this->makeContent($include = '+');
}
@@ -214,6 +253,197 @@
}
+/* -( Storage )------------------------------------------------------------ */
+
+
+ public function setChanges($text) {
+ $this->rawData = $text;
+
+ $this->dataEncoding = $this->detectEncodingForStorage($text);
+ $this->dataType = self::DATATYPE_TEXT;
+
+ list($format, $data) = $this->formatDataForStorage($text);
+
+ $this->dataFormat = $format;
+ $this->data = $data;
+
+ return $this;
+ }
+
+ public function getChanges() {
+ return $this->getUTF8StringFromStorage(
+ $this->getRawData(),
+ nonempty($this->forcedEncoding, $this->getDataEncoding()));
+ }
+
+ public function forceEncoding($encoding) {
+ $this->forcedEncoding = $encoding;
+ return $this;
+ }
+
+ private function formatDataForStorage($data) {
+ $deflated = PhabricatorCaches::maybeDeflateData($data);
+ if ($deflated !== null) {
+ return array(self::DATAFORMAT_DEFLATED, $deflated);
+ }
+
+ return array(self::DATAFORMAT_RAW, $data);
+ }
+
+ public function saveAsText() {
+ $old_type = $this->getDataType();
+ $old_data = $this->getData();
+
+ if ($old_type == self::DATATYPE_TEXT) {
+ return $this;
+ }
+
+ $raw_data = $this->getRawData();
+
+ $this->setDataType(self::DATATYPE_TEXT);
+
+ list($format, $data) = $this->formatDataForStorage($raw_data);
+ $this->setDataFormat($format);
+ $this->setData($data);
+
+ $result = $this->save();
+
+ $this->destroyData($old_type, $old_data);
+
+ return $result;
+ }
+
+ public function saveAsFile() {
+ $old_type = $this->getDataType();
+ $old_data = $this->getData();
+
+ if ($old_type == self::DATATYPE_FILE) {
+ return $this;
+ }
+
+ $raw_data = $this->getRawData();
+
+ list($format, $data) = $this->formatDataForStorage($raw_data);
+ $this->setDataFormat($format);
+
+ $file = PhabricatorFile::newFromFileData(
+ $data,
+ array(
+ 'name' => 'differential-hunk',
+ 'mime-type' => 'application/octet-stream',
+ 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+ ));
+
+ $this->setDataType(self::DATATYPE_FILE);
+ $this->setData($file->getPHID());
+
+ // NOTE: Because hunks don't have a PHID and we just load hunk data with
+ // the omnipotent viewer, we do not need to attach the file to anything.
+
+ $result = $this->save();
+
+ $this->destroyData($old_type, $old_data);
+
+ return $result;
+ }
+
+ private function getRawData() {
+ if ($this->rawData === null) {
+ $type = $this->getDataType();
+ $data = $this->getData();
+
+ switch ($type) {
+ case self::DATATYPE_TEXT:
+ // In this storage type, the changes are stored on the object.
+ $data = $data;
+ break;
+ case self::DATATYPE_FILE:
+ $data = $this->loadFileData();
+ break;
+ default:
+ throw new Exception(
+ pht('Hunk has unsupported data type "%s"!', $type));
+ }
+
+ $format = $this->getDataFormat();
+ switch ($format) {
+ case self::DATAFORMAT_RAW:
+ // In this format, the changes are stored as-is.
+ $data = $data;
+ break;
+ case self::DATAFORMAT_DEFLATED:
+ $data = PhabricatorCaches::inflateData($data);
+ break;
+ default:
+ throw new Exception(
+ pht('Hunk has unsupported data encoding "%s"!', $type));
+ }
+
+ $this->rawData = $data;
+ }
+
+ return $this->rawData;
+ }
+
+ private function loadFileData() {
+ if ($this->fileData === null) {
+ $type = $this->getDataType();
+ if ($type !== self::DATATYPE_FILE) {
+ throw new Exception(
+ pht(
+ 'Unable to load file data for hunk with wrong data type ("%s").',
+ $type));
+ }
+
+ $file_phid = $this->getData();
+
+ $file = $this->loadRawFile($file_phid);
+ $data = $file->loadFileData();
+
+ $this->fileData = $data;
+ }
+
+ return $this->fileData;
+ }
+
+ private function loadRawFile($file_phid) {
+ $viewer = PhabricatorUser::getOmnipotentUser();
+
+
+ $files = id(new PhabricatorFileQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($file_phid))
+ ->execute();
+ if (!$files) {
+ throw new Exception(
+ pht(
+ 'Failed to load file ("%s") with hunk data.',
+ $file_phid));
+ }
+
+ $file = head($files);
+
+ return $file;
+ }
+
+ private function destroyData(
+ $type,
+ $data,
+ PhabricatorDestructionEngine $engine = null) {
+
+ if (!$engine) {
+ $engine = new PhabricatorDestructionEngine();
+ }
+
+ switch ($type) {
+ case self::DATATYPE_FILE:
+ $file = $this->loadRawFile($data);
+ $engine->destroyObject($file);
+ break;
+ }
+ }
+
+
/* -( PhabricatorPolicyInterface )----------------------------------------- */
@@ -237,8 +467,13 @@
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
+
+ $type = $this->getDataType();
+ $data = $this->getData();
+
+ $this->destroyData($type, $data, $engine);
+
$this->delete();
}
-
}
diff --git a/src/applications/differential/storage/DifferentialModernHunk.php b/src/applications/differential/storage/DifferentialModernHunk.php
deleted file mode 100644
--- a/src/applications/differential/storage/DifferentialModernHunk.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-final class DifferentialModernHunk extends DifferentialHunk {
-
- const DATATYPE_TEXT = 'text';
- const DATATYPE_FILE = 'file';
-
- const DATAFORMAT_RAW = 'byte';
- const DATAFORMAT_DEFLATED = 'gzde';
-
- protected $dataType;
- protected $dataEncoding;
- protected $dataFormat;
- protected $data;
-
- private $rawData;
- private $forcedEncoding;
- private $fileData;
-
- public function getTableName() {
- return 'differential_hunk_modern';
- }
-
- protected function getConfiguration() {
- return array(
- self::CONFIG_BINARY => array(
- 'data' => true,
- ),
- self::CONFIG_COLUMN_SCHEMA => array(
- 'dataType' => 'bytes4',
- 'dataEncoding' => 'text16?',
- 'dataFormat' => 'bytes4',
- 'oldOffset' => 'uint32',
- 'oldLen' => 'uint32',
- 'newOffset' => 'uint32',
- 'newLen' => 'uint32',
- ),
- self::CONFIG_KEY_SCHEMA => array(
- 'key_changeset' => array(
- 'columns' => array('changesetID'),
- ),
- 'key_created' => array(
- 'columns' => array('dateCreated'),
- ),
- ),
- ) + parent::getConfiguration();
- }
-
- public function setChanges($text) {
- $this->rawData = $text;
-
- $this->dataEncoding = $this->detectEncodingForStorage($text);
- $this->dataType = self::DATATYPE_TEXT;
-
- list($format, $data) = $this->formatDataForStorage($text);
-
- $this->dataFormat = $format;
- $this->data = $data;
-
- return $this;
- }
-
- public function getChanges() {
- return $this->getUTF8StringFromStorage(
- $this->getRawData(),
- nonempty($this->forcedEncoding, $this->getDataEncoding()));
- }
-
- public function forceEncoding($encoding) {
- $this->forcedEncoding = $encoding;
- return $this;
- }
-
- private function formatDataForStorage($data) {
- $deflated = PhabricatorCaches::maybeDeflateData($data);
- if ($deflated !== null) {
- return array(self::DATAFORMAT_DEFLATED, $deflated);
- }
-
- return array(self::DATAFORMAT_RAW, $data);
- }
-
- public function saveAsText() {
- $old_type = $this->getDataType();
- $old_data = $this->getData();
-
- if ($old_type == self::DATATYPE_TEXT) {
- return $this;
- }
-
- $raw_data = $this->getRawData();
-
- $this->setDataType(self::DATATYPE_TEXT);
-
- list($format, $data) = $this->formatDataForStorage($raw_data);
- $this->setDataFormat($format);
- $this->setData($data);
-
- $result = $this->save();
-
- $this->destroyData($old_type, $old_data);
-
- return $result;
- }
-
- public function saveAsFile() {
- $old_type = $this->getDataType();
- $old_data = $this->getData();
-
- if ($old_type == self::DATATYPE_FILE) {
- return $this;
- }
-
- $raw_data = $this->getRawData();
-
- list($format, $data) = $this->formatDataForStorage($raw_data);
- $this->setDataFormat($format);
-
- $file = PhabricatorFile::newFromFileData(
- $data,
- array(
- 'name' => 'differential-hunk',
- 'mime-type' => 'application/octet-stream',
- 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
- ));
-
- $this->setDataType(self::DATATYPE_FILE);
- $this->setData($file->getPHID());
-
- // NOTE: Because hunks don't have a PHID and we just load hunk data with
- // the omnipotent viewer, we do not need to attach the file to anything.
-
- $result = $this->save();
-
- $this->destroyData($old_type, $old_data);
-
- return $result;
- }
-
- private function getRawData() {
- if ($this->rawData === null) {
- $type = $this->getDataType();
- $data = $this->getData();
-
- switch ($type) {
- case self::DATATYPE_TEXT:
- // In this storage type, the changes are stored on the object.
- $data = $data;
- break;
- case self::DATATYPE_FILE:
- $data = $this->loadFileData();
- break;
- default:
- throw new Exception(
- pht('Hunk has unsupported data type "%s"!', $type));
- }
-
- $format = $this->getDataFormat();
- switch ($format) {
- case self::DATAFORMAT_RAW:
- // In this format, the changes are stored as-is.
- $data = $data;
- break;
- case self::DATAFORMAT_DEFLATED:
- $data = PhabricatorCaches::inflateData($data);
- break;
- default:
- throw new Exception(
- pht('Hunk has unsupported data encoding "%s"!', $type));
- }
-
- $this->rawData = $data;
- }
-
- return $this->rawData;
- }
-
- private function loadFileData() {
- if ($this->fileData === null) {
- $type = $this->getDataType();
- if ($type !== self::DATATYPE_FILE) {
- throw new Exception(
- pht(
- 'Unable to load file data for hunk with wrong data type ("%s").',
- $type));
- }
-
- $file_phid = $this->getData();
-
- $file = $this->loadRawFile($file_phid);
- $data = $file->loadFileData();
-
- $this->fileData = $data;
- }
-
- return $this->fileData;
- }
-
- private function loadRawFile($file_phid) {
- $viewer = PhabricatorUser::getOmnipotentUser();
-
-
- $files = id(new PhabricatorFileQuery())
- ->setViewer($viewer)
- ->withPHIDs(array($file_phid))
- ->execute();
- if (!$files) {
- throw new Exception(
- pht(
- 'Failed to load file ("%s") with hunk data.',
- $file_phid));
- }
-
- $file = head($files);
-
- return $file;
- }
-
-
- public function destroyObjectPermanently(
- PhabricatorDestructionEngine $engine) {
-
- $type = $this->getDataType();
- $data = $this->getData();
-
- $this->destroyData($type, $data, $engine);
-
- return parent::destroyObjectPermanently($engine);
- }
-
-
- private function destroyData(
- $type,
- $data,
- PhabricatorDestructionEngine $engine = null) {
-
- if (!$engine) {
- $engine = new PhabricatorDestructionEngine();
- }
-
- switch ($type) {
- case self::DATATYPE_FILE:
- $file = $this->loadRawFile($data);
- $engine->destroyObject($file);
- break;
- }
- }
-
-}
diff --git a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
--- a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
@@ -5,7 +5,7 @@
public function testMakeChanges() {
$root = dirname(__FILE__).'/hunk/';
- $hunk = new DifferentialModernHunk();
+ $hunk = new DifferentialHunk();
$hunk->setChanges(Filesystem::readFile($root.'basic.diff'));
$hunk->setOldOffset(1);
$hunk->setNewOffset(11);
@@ -23,7 +23,7 @@
);
$this->assertEqual($added, $hunk->getAddedLines());
- $hunk = new DifferentialModernHunk();
+ $hunk = new DifferentialHunk();
$hunk->setChanges(Filesystem::readFile($root.'newline.diff'));
$hunk->setOldOffset(1);
$hunk->setNewOffset(11);

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 23, 9:35 PM (3 w, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7717976
Default Alt Text
D19057.id45685.diff (23 KB)

Event Timeline

Phabricator · Built by Phacility