revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-25 16:22:42 +01:00
Code Issues Releases Wiki Activity

Fix commit range selection in Mercurial

Browse source 
Summary:
  - Noncontentious Mercurial stuff from D863.
  - Use "hg outgoing --branch" to make sure we aren't including outgoing
revisions on other branches.
  - Use "hg summary" to figure out where the working copy is, so "hg up <older
rev> && arc diff" works like expected.

Test Plan: Ran "arc diff" from multiple branches with the working copy in
various states.

Reviewers: Makinde, aran, jungejason, nh, tuomaspelkonen

Reviewed By: Makinde

CC: aran, Makinde

Differential Revision: 936
This commit is contained in:
epriestley 2011-09-14 19:08:16 -07:00
parent 02344602c1
commit 1c9746a46e
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/repository/api/mercurial/ArcanistMercurialAPI.php
View file

@ -69,7 +69,7 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
public function getRelativeCommit() { public function getRelativeCommit() {
if (empty($this->relativeCommit)) { if (empty($this->relativeCommit)) {
list($stdout) = execx( list($stdout) = execx(
'(cd %s && hg outgoing --limit 1)', '(cd %s && hg outgoing --branch `hg branch` --limit 1)',
$this->getPath()); $this->getPath());
$logs = $this->parseMercurialLog($stdout); $logs = $this->parseMercurialLog($stdout);
if (!count($logs)) { if (!count($logs)) {
@ -87,7 +87,7 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
'(cd %s && hg log --rev %s..%s --)', '(cd %s && hg log --rev %s..%s --)',
$this->getPath(), $this->getPath(),
$this->getRelativeCommit(), $this->getRelativeCommit(),
'tip'); $this->getWorkingCopyRevision());
$logs = $this->parseMercurialLog($info); $logs = $this->parseMercurialLog($info);
// Get rid of the first log, it's not actually part of the diff. "hg log" // Get rid of the first log, it's not actually part of the diff. "hg log"
@ -188,10 +188,11 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
$options = $this->getDiffOptions(); $options = $this->getDiffOptions();
list($stdout) = execx( list($stdout) = execx(
'(cd %s && hg diff %C --rev %s --rev tip -- %s)', '(cd %s && hg diff %C --rev %s --rev %s -- %s)',
$this->getPath(), $this->getPath(),
$options, $options,
$this->getRelativeCommit(), $this->getRelativeCommit(),
$this->getWorkingCopyRevision(),
$path); $path);
return $stdout; return $stdout;
@ -201,10 +202,11 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
$options = $this->getDiffOptions(); $options = $this->getDiffOptions();
list($stdout) = execx( list($stdout) = execx(
'(cd %s && hg diff %C --rev %s --rev tip --)', '(cd %s && hg diff %C --rev %s --rev %s --)',
$this->getPath(), $this->getPath(),
$options, $options,
$this->getRelativeCommit()); $this->getRelativeCommit(),
$this->getWorkingCopyRevision());
return $stdout; return $stdout;
} }
@ -214,7 +216,9 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
} }
public function getCurrentFileData($path) { public function getCurrentFileData($path) {
return $this->getFileDataAtRevision($path, 'tip'); return $this->getFileDataAtRevision(
$path,
$this->getWorkingCopyRevision());
} }
private function getFileDataAtRevision($path, $revision) { private function getFileDataAtRevision($path, $revision) {
@ -326,4 +330,26 @@ class ArcanistMercurialAPI extends ArcanistRepositoryAPI {
return $result; return $result;
} }
private function getWorkingCopyRevision() {
// In Mercurial, "tip" means the tip of the current branch, not what's in
// the working copy. The tip may be ahead of the working copy. We need to
// use "hg summary" to figure out what is actually in the working copy.
// For instance, "hg up 4 && arc diff" should not show commits 5 and above.
// The output of "hg summary" is different from the output of other hg
// commands so just parse it manually.
list($stdout) = execx(
'(cd %s && hg summary)',
$this->getPath());
$lines = explode("\n", $stdout);
$first = head($lines);
$match = null;
if (!preg_match('/^parent: \d+:([^ ]+)( |$)/', $first, $match)) {
throw new Exception("Unable to parse 'hg summary'.");
}
return trim($match[1]);
}
} }