Page MenuHomePhabricator
Files F15432149

D21334.diff
No OneTemporary
Actions

D21334.diff
View Options

diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php
--- a/src/repository/api/ArcanistMercurialAPI.php
+++ b/src/repository/api/ArcanistMercurialAPI.php
@@ -9,9 +9,6 @@
private $localCommitInfo;
private $rawDiffCache = array();
- private $supportsRebase;
- private $supportsPhases;
-
private $featureResults = array();
private $featureFutures = array();
@@ -145,19 +142,10 @@
return $base;
}
- // Mercurial 2.1 and up have phases which indicate if something is
- // published or not. To find which revs are outgoing, it's much
- // faster to check the phase instead of actually checking the server.
- if ($this->supportsPhases()) {
- list($err, $stdout) = $this->execManualLocal(
- 'log --branch %s -r %s --style default',
- $this->getBranchName(),
- 'draft()');
- } else {
- list($err, $stdout) = $this->execManualLocal(
- 'outgoing --branch %s --style default',
- $this->getBranchName());
- }
+ list($err, $stdout) = $this->execManualLocal(
+ 'log --branch %s -r %s --style default',
+ $this->getBranchName(),
+ 'draft()');
if (!$err) {
$logs = ArcanistMercurialParser::parseMercurialLog($stdout);
@@ -508,24 +496,6 @@
}
}
- public function supportsRebase() {
- if ($this->supportsRebase === null) {
- list($err) = $this->execManualLocal('help rebase');
- $this->supportsRebase = $err === 0;
- }
-
- return $this->supportsRebase;
- }
-
- public function supportsPhases() {
- if ($this->supportsPhases === null) {
- list($err) = $this->execManualLocal('help phase');
- $this->supportsPhases = $err === 0;
- }
-
- return $this->supportsPhases;
- }
-
public function supportsCommitRanges() {
return true;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 4:28 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7313860
Default Alt Text
D21334.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility