mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 06:42:41 +01:00
No description
9963323b91
Summary: Adds error handling for several kinds of failure in arc land for mercurial. Previously it would often leave the repo in a confusing state if something failed. - Aborts the land if pull brings in a diverged 'onto' branch. - Aborts the rebase if there is a conflict. This leaves the repo exactly as it was before, so the user is not left with a half finished rebase. - Don't delete the original non-squashed branch until the push succeeds. - If the push fails, strip the temporary squashed commit. This leaves the 'onto' branch back on the latest commit from the server, and leaves the users original nonsquashed branch around. - Always leave the user back on their original branch after an error. Test Plan: Ran arc land: - with pull causing a diverged 'onto' bookmark - with the 'onto' bookmark already diverged - with the rebase causing conflicts - with a push that failed due to a commit hook - with a successful land - with a successful collapse and land In all failure cases the repo was left exactly as it was before arc land, except for the push-failed case, where the only change was that the branch was correctly on top of the destination branch due to a successful rebase. Used bookmark name "foo bar-gah" to test that crazy bookmark names still work. Reviewers: epriestley, dschleimer, sid0 Reviewed By: epriestley CC: nh, wez, bos, aran, Korvin Differential Revision: https://secure.phabricator.com/D5394 |
||
|---|---|---|
| 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.