mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 14:52:40 +01:00
Correct a bunch of mercurial revset construction
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:
parent
2613ea196f
commit
410b58a2e2
1 changed files with 6 additions and 6 deletions
|
@ -478,7 +478,7 @@ EOTEXT
|
|||
} else if ($this->isHg) {
|
||||
$onto_tip = $repository_api->getCanonicalRevisionName($this->onto);
|
||||
$common_ancestor = $repository_api->getCanonicalRevisionName(
|
||||
sprintf("ancestor('%s','%s')",
|
||||
hgsprintf("ancestor(%s, %s)",
|
||||
$this->onto,
|
||||
$this->branch));
|
||||
|
||||
|
@ -531,12 +531,12 @@ EOTEXT
|
|||
// function). So we're guaranteed to have onto as an ancestor of branch
|
||||
// when we use first((onto::branch)-onto) below.
|
||||
$branch_root = $repository_api->getCanonicalRevisionName(
|
||||
sprintf("first((%s::%s)-%s)",
|
||||
hgsprintf("first((%s::%s)-%s)",
|
||||
$this->onto,
|
||||
$this->branch,
|
||||
$this->onto));
|
||||
|
||||
$branch_range = sprintf(
|
||||
$branch_range = hgsprintf(
|
||||
"(%s::%s)",
|
||||
$branch_root,
|
||||
$this->branch);
|
||||
|
@ -571,7 +571,7 @@ EOTEXT
|
|||
// check if the branch had children
|
||||
list($output) = $repository_api->execxLocal(
|
||||
"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 = array_filter($child_branch_roots);
|
||||
|
@ -632,8 +632,8 @@ EOTEXT
|
|||
// 2. roots({x,g,y,z} - {g} - {w,x})
|
||||
// 3. roots({y,z})
|
||||
// 4. {y,z}
|
||||
$alt_branch_revset = sprintf(
|
||||
'roots(descendants(%s)-descendants(%s)-%s)',
|
||||
$alt_branch_revset = hgsprintf(
|
||||
'roots(descendants(%s)-descendants(%s)-%R)',
|
||||
$branch_root,
|
||||
$this->branch,
|
||||
$branch_range);
|
||||
|
|
Loading…
Reference in a new issue