Fix escaping of bookmarknames properly for `arc patch`
ClosedPublic
Actions

Authored by epriestley on Apr 1 2014, 3:05 PM.

Details

Reviewers

btrahan
durham
• rvanvelzen

Maniphest Tasks

T4596: arc patch should use hgsprintf for bookmarks

Commits

rARC11e2c1688fef: Fix escaping of bookmarknames properly for `arc patch`

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.

Diff Detail

Repository

rARC Arcanist

Branch

hgsprintf

Lint

Lint Passed

Unit

No Test Coverage

Event Timeline

epriestley updated this revision to Diff 20539.Apr 1 2014, 3:05 PM

epriestley retitled this revision from to Fix escaping of bookmarknames properly for `arc patch`.

epriestley updated this object.

epriestley edited the test plan for this revision. (Show Details)

epriestley added reviewers: btrahan, durham, • rvanvelzen.

epriestley added a task: T4596: arc patch should use hgsprintf for bookmarks.

Herald added a subscriber: epriestley.Apr 1 2014, 3:05 PM

$ arc patch D1034
Bookmark name arcpatch-D1034 already exists; trying a new name.
Bookmark name arcpatch-D1034-1 already exists; trying a new name.
Updating to the revision's base commit
2 files updated, 0 files merged, 6 files removed, 0 files unresolved
Created and checked out bookmark arcpatch-D1034-2.
Downloading binary data for 'derpy.jpg'...
 OKAY  Successfully committed patch.

$ hg bookmark
   'arcpatch-D1034'          33:d84d423cbe25
   'arcpatch-D615'           33:d84d423cbe25
   a                         16:68dc5c265a92
   arcpatch-D1034-1          34:53efceff16a1
 * arcpatch-D1034-2          35:48e688704165
   ...

shipitquick

This revision is now accepted and ready to land.Apr 1 2014, 3:19 PM

Closed by commit rARC11e2c1688fef (authored by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

workflow/

ArcanistPatchWorkflow.php

6 lines

Diff 20539

View Options

src/workflow/ArcanistPatchWorkflow.php

Fix escaping of bookmarknames properly for `arc patch`ClosedPublicActions