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

Fix escaping of bookmarknames properly for arc patch

Browse source 
Summary:
Fixes T4596. I misunderstood this issue and D8512 was not correct. Specifically:

  - The `hg log` needs to be escaped, since otherwise "arcpatch-x" is interpreted as a revset.
  - The `hg update` does not need to be escaped, since updating to a revset doesn't make sense and the command never treats its argument as a revset.
  - The `hg bookmark` does not need to be escaped, for similar reasons.

Test Plan:
  - Ran these commands in isolation and got sensible, consistent results.
  - Ran `arc patch` several times in a row and got proper bookmark names.

Reviewers: btrahan, durham, rvanvelzen

Reviewed By: rvanvelzen

Subscribers: epriestley

Maniphest Tasks: T4596

Differential Revision: https://secure.phabricator.com/D8661
This commit is contained in:
epriestley 2014-04-01 08:21:15 -07:00
parent 5280f3708e
commit 11e2c1688f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/workflow/ArcanistPatchWorkflow.php
View file

@ -265,7 +265,7 @@ EOTEXT
list($err) = $repository_api->execManualLocal( list($err) = $repository_api->execManualLocal(
'log -r %s', 'log -r %s',
$proposed_name); hgsprintf('%s', $proposed_name));
// no error means hg log found a bookmark // no error means hg log found a bookmark
if (!$err) { if (!$err) {
@ -320,12 +320,12 @@ EOTEXT
echo "Updating to the revision's base commit\n"; echo "Updating to the revision's base commit\n";
$repository_api->execPassthru( $repository_api->execPassthru(
'update %s', 'update %s',
hgsprintf('%s', $base_revision)); $base_revision);
} }
$repository_api->execxLocal( $repository_api->execxLocal(
'bookmark %s', 'bookmark %s',
hgsprintf('%s', $branch_name)); $branch_name);
echo phutil_console_format( echo phutil_console_format(
"Created and checked out bookmark %s.\n", "Created and checked out bookmark %s.\n",