Page MenuHomestyx hydra
Files F1455577

No OneTemporary
Actions

View Options

diff --git a/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
index cb03a7b9b9..23b352eea2 100644
--- a/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
@@ -1,51 +1,72 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
final class DiffusionMercurialRawDiffQuery extends DiffusionRawDiffQuery {
protected function executeQuery() {
+ $raw_diff = $this->executeRawDiffCommand();
+
+ // the only legitimate case here is if we are looking at the first commit
+ // in the repository. no parents means first commit.
+ if (!$raw_diff) {
+ $drequest = $this->getRequest();
+ $parent_query =
+ DiffusionCommitParentsQuery::newFromDiffusionRequest($drequest);
+ $parents = $parent_query->loadParents();
+ if ($parents === array()) {
+ // mercurial likes the string null here
+ $this->setAgainstCommit('null');
+ $raw_diff = $this->executeRawDiffCommand();
+ }
+ }
+
+ return $raw_diff;
+ }
+
+
+ protected function executeRawDiffCommand() {
$drequest = $this->getRequest();
$repository = $drequest->getRepository();
$commit = $drequest->getCommit();
// If there's no path, get the entire raw diff.
$path = nonempty($drequest->getPath(), '.');
$against = $this->getAgainstCommit();
if ($against === null) {
$against = $commit.'^';
}
$future = $repository->getLocalCommandFuture(
'diff -U %d --git --rev %s:%s -- %s',
$this->getLinesOfContext(),
$against,
$commit,
$path);
if ($this->getTimeout()) {
$future->setTimeout($this->getTimeout());
}
list($raw_diff) = $future->resolvex();
return $raw_diff;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 14, 7:57 AM (1 d, 9 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
336879
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)