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

Correct a bunch of mercurial revset construction

Browse source 
Summary: Possibly improves T2387 state of the world?

Test Plan: not yet

Reviewers: bos, DurhamGoode

Reviewed By: DurhamGoode

CC: aran

Maniphest Tasks: T2387

Differential Revision: https://secure.phabricator.com/D4712
This commit is contained in:
epriestley 2013-01-28 16:28:14 -08:00
parent 2613ea196f
commit 410b58a2e2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/workflow/ArcanistLandWorkflow.php
View file

@ -478,7 +478,7 @@ EOTEXT
} else if ($this->isHg) { } else if ($this->isHg) {
$onto_tip = $repository_api->getCanonicalRevisionName($this->onto); $onto_tip = $repository_api->getCanonicalRevisionName($this->onto);
$common_ancestor = $repository_api->getCanonicalRevisionName( $common_ancestor = $repository_api->getCanonicalRevisionName(
sprintf("ancestor('%s','%s')", hgsprintf("ancestor(%s, %s)",
$this->onto, $this->onto,
$this->branch)); $this->branch));
@ -531,12 +531,12 @@ EOTEXT
// function). So we're guaranteed to have onto as an ancestor of branch // function). So we're guaranteed to have onto as an ancestor of branch
// when we use first((onto::branch)-onto) below. // when we use first((onto::branch)-onto) below.
$branch_root = $repository_api->getCanonicalRevisionName( $branch_root = $repository_api->getCanonicalRevisionName(
sprintf("first((%s::%s)-%s)", hgsprintf("first((%s::%s)-%s)",
$this->onto, $this->onto,
$this->branch, $this->branch,
$this->onto)); $this->onto));
$branch_range = sprintf( $branch_range = hgsprintf(
"(%s::%s)", "(%s::%s)",
$branch_root, $branch_root,
$this->branch); $this->branch);
@ -571,7 +571,7 @@ EOTEXT
// check if the branch had children // check if the branch had children
list($output) = $repository_api->execxLocal( list($output) = $repository_api->execxLocal(
"log -r %s --template '{node}\\n'", "log -r %s --template '{node}\\n'",
sprintf("children(%s)", $this->branch)); hgsprintf("children(%s)", $this->branch));
$child_branch_roots = phutil_split_lines($output, false); $child_branch_roots = phutil_split_lines($output, false);
$child_branch_roots = array_filter($child_branch_roots); $child_branch_roots = array_filter($child_branch_roots);
@ -632,8 +632,8 @@ EOTEXT
// 2. roots({x,g,y,z} - {g} - {w,x}) // 2. roots({x,g,y,z} - {g} - {w,x})
// 3. roots({y,z}) // 3. roots({y,z})
// 4. {y,z} // 4. {y,z}
$alt_branch_revset = sprintf( $alt_branch_revset = hgsprintf(
'roots(descendants(%s)-descendants(%s)-%s)', 'roots(descendants(%s)-descendants(%s)-%R)',
$branch_root, $branch_root,
$this->branch, $this->branch,
$branch_range); $branch_range);