1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-28 08:20:56 +01:00
No description
Find a file
Joseph Battelle bb6d11b732 Use GIT tracked branches for arc land targets when reasonable
Summary:
See T5690.
-arc land now respects tracked branch when choosing 'onto'; '--onto' option remains as an override.
-arc land now respects tracked branch when choosing a remote; the remote is taken from 'onto's upstream unless the '--remote' option is present; when 'onto' branch has no upstream the '--remote' option must be provided as before.

Since 'arc feature' branches are (already) created as tracking branches, 'arc.land.onto.default' if present, is only used as the default when a non-tracking branch created by some other means is landed with out explicit '--onto'.  This may be surprising but is probably the correct go-forward behavior and is inline with the description in T5690.

Test Plan:
-checked having no arc.land.onto.default still assumes 'master'
-checked 'arc.land.onto.default' still overrides 'master'
-checked upstream branch (of feature branch) overrides 'master' and 'arc.land.onto.default'
-checked '--onto' overrides all
-checked origin is default for non-tracking branches
-checked the land onto branch's upstream remote is used instead of 'origin'
-checked '--remote' overrides 'origin' and the tracked upstream
-tested several crazy branch names including 'something/like/this' for both the upstream and tracking branches
-tested on linux and OS X
-rinse and repeat on Windows

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Maniphest Tasks: T5690

Differential Revision: https://secure.phabricator.com/D10058
2014-07-28 16:22:09 -07:00
bin Added ArcanistTextLinter::LINT_BOF_WHITESPACE and ArcanistTextLinter::LINT_EOF_WHITESPACE 2014-01-13 18:05:42 -08:00
externals Add a newline to externals/includes/README 2014-07-16 22:11:52 +10:00
resources Move PhutilLibraryMapBuilder to libphutil 2014-07-05 17:01:36 +10:00
scripts Fix various spelling mistakes 2014-07-13 00:45:38 +10:00
src Use GIT tracked branches for arc land targets when reasonable 2014-07-28 16:22:09 -07:00
.arcconfig Use the ArcanistConfigurationDrivenLintEngine as a linting engine. 2014-05-11 19:33:40 -07:00
.arclint Move ArcanistSpellingDefaultData into a configurable JSON file 2014-07-04 08:18:33 +10:00
.editorconfig Apply various linter fixes. 2014-06-10 11:02:42 -07:00
.gitignore Update .gitignore. 2014-06-14 11:44:38 -07:00
LICENSE Delete license headers from files 2012-11-05 11:16:24 -08:00
NOTICE Remove duplicate newline 2014-07-17 08:25:22 +10:00
README Reformat README as Remarkup 2014-07-16 22:11:10 +10:00

= WHAT IS ARCANIST? =

Arcanist is the command-line tool for [[http://phabricator.org/ | 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
[[http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html |
here]].

For more information about Phabricator, see http://phabricator.org/.

= LICENSE =
Arcanist is released under the Apache 2.0 license except as otherwise noted.