mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 14:52:40 +01:00
No description
0e254f769d
Summary: Changes message for `arc land` that displays current branch or bookmark (if none is specified) to appropriately use the term 'bookmark' when on a bookmark in an hg repository. Test Plan: Ran `arc land` on new git and hg repositories, checking for correct identification of 'branch' or 'bookmark'. ~/test$ mkdir hg-test ~/test$ mkdir git-test ~/test$ cd hg-test ~/test/hg-test$ hg init ~/test/hg-test$ hg branch default ~/test/hg-test$ hg bookmarks no bookmarks set ~/test/hg-test$ arc land Landing current branch 'default'. Usage Exception: You can not land a branch onto itself -- you are trying to land 'default' onto 'default'. For more information on how to push changes, see 'Pushing and Closing Revisions' in 'Arcanist User Guide: arc diff' in the documentation. You may be able to 'arc amend' instead. ~/test/hg-test$ hg bookmark testmark ~/test/hg-test$ hg bookmarks * testmark -1:000000000000 ~/test/hg-test$ hg branch default ~/test/hg-test$ arc land Landing current bookmark 'testmark'. Usage Exception: Source testmark is a bookmark but destination default is not a bookmark. When landing a bookmark, the destination must also be a bookmark. Use --onto to specify a bookmark, or set arc.land.onto.default in .arcconfig. Confirm still works on a git branch: ~/test/hg-test$ cd ../git-test/ ~/test/git-test$ ls ~/test/git-test$ git init Initialized empty Git repository in ~/test/git-test/.git/ ~/test/git-test$ touch testfile ~/test/git-test$ git commit -am 'Test file' ~/test/git-test$ git branch * master ~/test/git-test$ arc land Landing current branch 'master'. Usage Exception: You can not land a branch onto itself -- you are trying to land 'master' onto 'master'. For more information on how to push changes, see 'Pushing and Closing Revisions' in 'Arcanist User Guide: arc diff' in the documentation. You may be able to 'arc amend' instead. Reviewers: DurhamGoode, epriestley Reviewed By: DurhamGoode CC: aran, epriestley, Korvin Differential Revision: https://secure.phabricator.com/D5163 |
||
|---|---|---|
| bin | ||
| externals | ||
| resources | ||
| scripts | ||
| src | ||
| .arcconfig | ||
| .divinerconfig | ||
| .editorconfig | ||
| .gitignore | ||
| LICENSE | ||
| NOTICE | ||
| README | ||
WHAT IS ARCANIST? Arcanist is the command-line tool for Phabricator. It allows you to interact with Phabricator installs to send code for review, download patches, transfer files, view status, make API calls, and various other things. You can find a complete user guide here: http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html For more information about Phabricator, see: http://phabricator.org/ LICENSE Arcanist is released under the Apache 2.0 license except as otherwise noted.