@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Bring old repository instructions and guidance forward to new UI

Summary:
Ref T10923. Fixes T10406. This brings most of the guidance/instructions forward:

- Some remained as instructions.
- Some moved to documentation.

Test Plan: Went through all of the sections and hit the help.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10406, T10923

Differential Revision: https://secure.phabricator.com/D15873

+113 -3
+4 -1
src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php
··· 40 40 41 41 if ($repository->isTracked()) { 42 42 $title = pht('Deactivate Repository'); 43 - $body = pht('Deactivate this repository?'); 43 + $body = pht( 44 + 'If you deactivate this repository, it will no longer be updated. '. 45 + 'Observation and mirroring will cease, and pushing and pulling will '. 46 + 'be disabled. You can reactivate the repository later.'); 44 47 $submit = pht('Deactivate Repository'); 45 48 } else { 46 49 $title = pht('Activate Repository');
+20 -2
src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
··· 208 208 $autoclose_value = $object->getDetail('close-commits-filter', array()); 209 209 $autoclose_value = array_keys($autoclose_value); 210 210 211 + $automation_instructions = pht( 212 + "Configure **Repository Automation** to allow Phabricator to ". 213 + "write to this repository.". 214 + "\n\n". 215 + "IMPORTANT: This feature is new, experimental, and not supported. ". 216 + "Use it at your own risk."); 217 + 218 + $staging_instructions = pht( 219 + "To make it easier to run integration tests and builds on code ". 220 + "under review, you can configure a **Staging Area**. When `arc` ". 221 + "creates a diff, it will push a copy of the changes to the ". 222 + "configured staging area with a corresponding tag.". 223 + "\n\n". 224 + "IMPORTANT: This feature is new, experimental, and not supported. ". 225 + "Use it at your own risk."); 226 + 211 227 return array( 212 228 id(new PhabricatorSelectEditField()) 213 229 ->setKey('vcs') ··· 329 345 ->setDescription(pht('Staging area URI.')) 330 346 ->setConduitDescription(pht('Set the staging area URI.')) 331 347 ->setConduitTypeDescription(pht('New staging area URI.')) 332 - ->setValue($object->getStagingURI()), 348 + ->setValue($object->getStagingURI()) 349 + ->setControlInstructions($staging_instructions), 333 350 id(new PhabricatorDatasourceEditField()) 334 351 ->setKey('automationBlueprintPHIDs') 335 352 ->setLabel(pht('Use Blueprints')) ··· 340 357 ->setDescription(pht('Automation blueprints.')) 341 358 ->setConduitDescription(pht('Change automation blueprints.')) 342 359 ->setConduitTypeDescription(pht('New blueprint PHIDs.')) 343 - ->setValue($object->getAutomationBlueprintPHIDs()), 360 + ->setValue($object->getAutomationBlueprintPHIDs()) 361 + ->setControlInstructions($automation_instructions), 344 362 id(new PhabricatorStringListEditField()) 345 363 ->setKey('symbolLanguages') 346 364 ->setLabel(pht('Languages'))
+37
src/applications/diffusion/editor/DiffusionURIEditEngine.php
··· 105 105 } else { 106 106 $is_builtin = false; 107 107 $uri_value = $object->getURI(); 108 + 109 + if ($object->getRepositoryPHID()) { 110 + $repository = $object->getRepository(); 111 + if ($repository->isGit()) { 112 + $uri_instructions = pht( 113 + "Provide the URI of a Git repository. It should usually look ". 114 + "like one of these examples:\n". 115 + "\n". 116 + "| Example Git URIs\n". 117 + "| -----------------------\n". 118 + "| `git@github.com:example/example.git`\n". 119 + "| `ssh://user@host.com/git/example.git`\n". 120 + "| `https://example.com/repository.git`"); 121 + } else if ($repository->isHg()) { 122 + $uri_instructions = pht( 123 + "Provide the URI of a Mercurial repository. It should usually ". 124 + "look like one of these examples:\n". 125 + "\n". 126 + "| Example Mercurial URIs\n". 127 + "|-----------------------\n". 128 + "| `ssh://hg@bitbucket.org/example/repository`\n". 129 + "| `https://bitbucket.org/example/repository`"); 130 + } else if ($repository->isSVN()) { 131 + $uri_instructions = pht( 132 + "Provide the **Repository Root** of a Subversion repository. ". 133 + "You can identify this by running `svn info` in a working ". 134 + "copy. It should usually look like one of these examples:\n". 135 + "\n". 136 + "| Example Subversion URIs\n". 137 + "|-----------------------\n". 138 + "| `http://svn.example.org/svnroot/`\n". 139 + "| `svn+ssh://svn.example.com/svnroot/`\n". 140 + "| `svn://svn.example.net/svnroot/`\n\n". 141 + "You **MUST** specify the root of the repository, not a ". 142 + "subdirectory."); 143 + } 144 + } 108 145 } 109 146 110 147 return array(
+9
src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php
··· 500 500 return $messages; 501 501 } 502 502 503 + private function getEnvConfigLink() { 504 + $config_href = '/config/edit/environment.append-paths/'; 505 + return phutil_tag( 506 + 'a', 507 + array( 508 + 'href' => $config_href, 509 + ), 510 + 'environment.append-paths'); 511 + } 503 512 504 513 }
+43
src/docs/user/userguide/diffusion_managing.diviner
··· 236 236 These options are covered in detail in @{article:Diffusion User Guide: URIs}. 237 237 238 238 239 + Branches 240 + ======== 241 + 242 + The **Branches** panel allows you to configure how Phabricator interacts with 243 + branches. 244 + 245 + This panel is not available for Subversion repositories, because Subversion 246 + does not have formal branches. 247 + 248 + You can configure **Default Branch**. This controls which branch is shown by 249 + default in the UI. If no branch is provided, Phabricator will use `master` in 250 + Git and `default` in Mercurial. 251 + 252 + If you want Diffusion to ignore some branches in the repository, you can 253 + configure **Track Only**. Other branches will be ignored. If you do not specify 254 + any branches, all branches are tracked. 255 + 256 + When specifying branches, you should enter one branch name per line. You can 257 + use regular expressions to match branches by wrapping an expression in 258 + `regexp(...)`. For example: 259 + 260 + | Example | Effect | 261 + |---------|--------| 262 + | `master` | Track only `master`. 263 + | `regexp(/^release-/)` | Track all branches which start with `release-`. 264 + | `regexp(/^(?!temp-)/)` | Do not track branches which start with `temp-`. 265 + 266 + 267 + Actions 268 + ====== 269 + 270 + The **Actions** panel can configure notifications and publishing behavior. 271 + 272 + Normally, Phabricator publishes notifications when it discovers new commits. 273 + You can disable publishing for a repository by turning off **Publish/Noitfy**. 274 + This will disable notifications, feed, and Herald (including audits and build 275 + plans) for this repository. 276 + 277 + When Phabricator discovers a new commit, it can automatically close associated 278 + revisions and tasks. If you don't want Phabricator to close objects when it 279 + discovers new commits, disable **Autoclose** for the repository. 280 + 281 + 239 282 Repository Identifiers and Names 240 283 ================================ 241 284