Page MenuHomePhabricator
Files F15338358

D19830.diff
No OneTemporary
Actions

D19830.diff
View Options

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
@@ -839,6 +839,7 @@
'DiffusionLookSoonConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php',
'DiffusionLowLevelCommitFieldsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php',
'DiffusionLowLevelCommitQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php',
+ 'DiffusionLowLevelFilesizeQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelFilesizeQuery.php',
'DiffusionLowLevelGitRefQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php',
'DiffusionLowLevelMercurialBranchesQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelMercurialBranchesQuery.php',
'DiffusionLowLevelMercurialPathsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelMercurialPathsQuery.php',
@@ -6250,6 +6251,7 @@
'DiffusionLookSoonConduitAPIMethod' => 'DiffusionConduitAPIMethod',
'DiffusionLowLevelCommitFieldsQuery' => 'DiffusionLowLevelQuery',
'DiffusionLowLevelCommitQuery' => 'DiffusionLowLevelQuery',
+ 'DiffusionLowLevelFilesizeQuery' => 'DiffusionLowLevelQuery',
'DiffusionLowLevelGitRefQuery' => 'DiffusionLowLevelQuery',
'DiffusionLowLevelMercurialBranchesQuery' => 'DiffusionLowLevelQuery',
'DiffusionLowLevelMercurialPathsQuery' => 'DiffusionLowLevelQuery',
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -1305,97 +1305,11 @@
public function loadFileSizesForCommit($identifier) {
$repository = $this->getRepository();
- $vcs = $repository->getVersionControlSystem();
-
- $path_sizes = array();
-
- switch ($vcs) {
- case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
- list($paths_raw) = $repository->execxLocalCommand(
- 'diff-tree -z -r --no-commit-id %s --',
- $identifier);
-
- // With "-z" we get "<fields>\0<filename>\0" for each line. Group the
- // delimited text into "<fields>, <filename>" pairs.
- $paths_raw = trim($paths_raw, "\0");
- $paths_raw = explode("\0", $paths_raw);
- if (count($paths_raw) % 2) {
- throw new Exception(
- pht(
- 'Unexpected number of output lines from "git diff-tree" when '.
- 'processing commit ("%s"): got %s lines, expected an even '.
- 'number.',
- $identifier,
- phutil_count($paths_raw)));
- }
- $paths_raw = array_chunk($paths_raw, 2);
-
- $paths = array();
- foreach ($paths_raw as $path_raw) {
- list($fields, $pathname) = $path_raw;
- $fields = explode(' ', $fields);
-
- // Fields are:
- //
- // :100644 100644 aaaa bbbb M
- //
- // [0] Old file mode.
- // [1] New file mode.
- // [2] Old object hash.
- // [3] New object hash.
- // [4] Change mode.
-
- $paths[] = array(
- 'path' => $pathname,
- 'newHash' => $fields[3],
- );
- }
-
- if ($paths) {
- $check_paths = array();
- foreach ($paths as $path) {
- if ($path['newHash'] === self::EMPTY_HASH) {
- $path_sizes[$path['path']] = 0;
- continue;
- }
- $check_paths[$path['newHash']][] = $path['path'];
- }
-
- if ($check_paths) {
- $future = $repository->getLocalCommandFuture(
- 'cat-file --batch-check=%s',
- '%(objectsize)')
- ->write(implode("\n", array_keys($check_paths)));
-
- list($sizes) = $future->resolvex();
- $sizes = trim($sizes);
- $sizes = phutil_split_lines($sizes, false);
- if (count($sizes) !== count($check_paths)) {
- throw new Exception(
- pht(
- 'Unexpected number of output lines from "git cat-file" when '.
- 'processing commit ("%s"): got %s lines, expected %s.',
- $identifier,
- phutil_count($sizes),
- phutil_count($check_paths)));
- }
- foreach ($check_paths as $object_hash => $path_names) {
- $object_size = (int)array_shift($sizes);
- foreach ($path_names as $path_name) {
- $path_sizes[$path_name] = $object_size;
- }
- }
- }
- }
- break;
- default:
- throw new Exception(
- pht(
- 'File size limits are not supported for this VCS.'));
- }
-
- return $path_sizes;
+ return id(new DiffusionLowLevelFilesizeQuery())
+ ->setRepository($repository)
+ ->withIdentifier($identifier)
+ ->execute();
}
public function loadCommitRefForCommit($identifier) {
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelFilesizeQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelFilesizeQuery.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelFilesizeQuery.php
@@ -0,0 +1,125 @@
+<?php
+
+final class DiffusionLowLevelFilesizeQuery
+ extends DiffusionLowLevelQuery {
+
+ private $identifier;
+
+ public function withIdentifier($identifier) {
+ $this->identifier = $identifier;
+ return $this;
+ }
+
+ protected function executeQuery() {
+ if (!strlen($this->identifier)) {
+ throw new PhutilInvalidStateException('withIdentifier');
+ }
+
+ $type = $this->getRepository()->getVersionControlSystem();
+ switch ($type) {
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
+ $result = $this->loadGitFilesizes();
+ break;
+ default:
+ throw new Exception(pht('Unsupported repository type "%s"!', $type));
+ }
+
+ return $result;
+ }
+
+ private function loadGitFilesizes() {
+ $repository = $this->getRepository();
+ $identifier = $this->identifier;
+
+ $paths_future = $repository->getLocalCommandFuture(
+ 'diff-tree -z -r --no-commit-id %s --',
+ $identifier);
+
+ // With "-z" we get "<fields>\0<filename>\0" for each line. Process the
+ // delimited text as "<fields>, <filename>" pairs.
+
+ $path_lines = id(new LinesOfALargeExecFuture($paths_future))
+ ->setDelimiter("\0");
+
+ $paths = array();
+
+ $path_pairs = new PhutilChunkedIterator($path_lines, 2);
+ foreach ($path_pairs as $path_pair) {
+ if (count($path_pair) != 2) {
+ throw new Exception(
+ pht(
+ 'Unexpected number of output lines from "git diff-tree" when '.
+ 'processing commit ("%s"): expected an even number of lines.',
+ $identifier));
+ }
+
+ list($fields, $pathname) = array_values($path_pair);
+ $fields = explode(' ', $fields);
+
+ // Fields are:
+ //
+ // :100644 100644 aaaa bbbb M
+ //
+ // [0] Old file mode.
+ // [1] New file mode.
+ // [2] Old object hash.
+ // [3] New object hash.
+ // [4] Change mode.
+
+ $paths[] = array(
+ 'path' => $pathname,
+ 'newHash' => $fields[3],
+ );
+ }
+
+ $path_sizes = array();
+
+ if (!$paths) {
+ return $path_sizes;
+ }
+
+ $check_paths = array();
+ foreach ($paths as $path) {
+ if ($path['newHash'] === DiffusionCommitHookEngine::EMPTY_HASH) {
+ $path_sizes[$path['path']] = 0;
+ continue;
+ }
+ $check_paths[$path['newHash']][] = $path['path'];
+ }
+
+ if (!$check_paths) {
+ return $path_sizes;
+ }
+
+ $future = $repository->getLocalCommandFuture(
+ 'cat-file --batch-check=%s',
+ '%(objectsize)');
+
+ $future->write(implode("\n", array_keys($check_paths)));
+
+ $size_lines = id(new LinesOfALargeExecFuture($future))
+ ->setDelimiter("\n");
+ foreach ($size_lines as $line) {
+ $object_size = (int)$line;
+
+ $object_hash = head_key($check_paths);
+ $path_names = $check_paths[$object_hash];
+ unset($check_paths[$object_hash]);
+
+ foreach ($path_names as $path_name) {
+ $path_sizes[$path_name] = $object_size;
+ }
+ }
+
+ if ($check_paths) {
+ throw new Exception(
+ pht(
+ 'Unexpected number of output lines from "git cat-file" when '.
+ 'processing commit ("%s").',
+ $identifier));
+ }
+
+ return $path_sizes;
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 10:35 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7324700
Default Alt Text
D19830.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility