A good start would be a sidebar block which appears when there are feature branch(es) for it:

This issue has a feature branch:
2659992-no-subsite-registration-login

How to use Feature branches.

This establishes an area of the page for the UI and introduces how to use them. Later, test results for the branch can be added to the same block, or adjacent block.

I could see this going in either project_git_instructions, versioncontrol_project, or drupalorg module. Currently, this is only instructions. I could see a merge button, or number of commits ahead/behind, being added in the future, which would be versioncontrol_project. Testing-related UI would come from project_issue_file_test.

Drupal.org deployment

  1. Update drupalorg, versioncontrol, versioncontrol_git, and versioncontrol_project modules.
  2. Enable the block.
CommentFileSizeAuthor
#2 Screen Shot 2016-05-12 at 2.43.05 PM.png37.47 KBdrumm
#4 add_ui_for_feature-2679132-4.patch3.85 KBmarvil07
#4 versioncontrol_git-0001-Implement-label-support-on-cgit-repository-webviewer.patch4.24 KBmarvil07
#4 versioncontrol-0001-Let-set-a-label-for-repository-webviewer-url-handler.patch2.31 KBmarvil07
#3 2679132.diff3.09 KBdrumm

Comments

drumm created an issue. See original summary.

drumm’s picture

drumm
he/him
Location NY, US
commented
StatusFileSize
new Screen Shot 2016-05-12 at 2.43.05 PM.png37.47 KB

Here’s a screenshot of some work on this:

Screenshot

The info link goes to a page like https://drumm-ck-drupal.dev.devdrupal.org/node/2687441/git-instructions/.... The browse link should go to http://cgit.drupalcode.org/ses_mailer/log/?h=2705213-exception-message, but there isn’t an API for making that link yet.

drumm’s picture

drumm
he/him
Location NY, US
commented
Project: Drupal.org customizations » Version Control / Project* integration
Version: 7.x-3.x-dev » 7.x-1.x-dev
Assigned: Unassigned » drumm
Status: Active » Needs work
StatusFileSize
new 2679132.diff3.09 KB

Attached is my work so far.

marvil07’s picture

marvil07 commented
Status: Needs work » Needs review
StatusFileSize
new versioncontrol-0001-Let-set-a-label-for-repository-webviewer-url-handler.patch2.31 KB
new versioncontrol_git-0001-Implement-label-support-on-cgit-repository-webviewer.patch4.24 KB
new add_ui_for_feature-2679132-4.patch3.85 KB

This looks great, I iterated a little over the code, and I ended up teaching versioncontrol how to get a repository's branch url directly; I implemented cgit as example, but I could not yet try the full patch together.

The main problem I currently have is to support the OR to select the branches, since inside the creation of the conditions, more than one means "AND"; I could be wrong about this (hopefully), so any feedback would be welcome.

I have not yet created two related issues in versioncontrol and versioncontrol_git, so I am attaching the patches here instead.

drumm’s picture

drumm
he/him
Location NY, US
commented

Looks like it would be a good time to clear out some technical debt with the web viewer URLs used on Drupal.org. I tried out:

$conf['versioncontrol_repository_plugin_defaults_git_webviewer_url_handler'] = 'cgit';
$conf['versioncontrol_repository_git_base_url_cgit'] = 'http://drupalcode.org';

This works well for regular projects’ repo URLs. But sandboxes come out as http://cgit.drupalcode.org/1083274 instead of http://cgit.drupalcode.org/sandbox-berliner-1083274. We probably need a subclass that can use the repository path. (I don’t know how standard our cgit configuration is here.)

I didn’t get into testing other URLs, like URLs for commits.

drumm’s picture

drumm
he/him
Location NY, US
commented

Added #2747961: Replace drupalcode.org GitWeb links with cgit to pay down our web viewer URL technical debt.

drumm’s picture

drumm
he/him
Location NY, US
commented

The versioncontrol* patches look good to me. Please go ahead and commit those. (Drupal.org wouldn't miss anything other than cgit if those other view URL handlers aren't updated.)

I have a little change for add_ui_for_feature-2679132-4.patch.

drumm’s picture

drumm
he/him
Location NY, US
commented
Issue summary: View changes

  • drumm committed 4306d62 on 7.x-1.x 
    Issue #2679132 by marvil07, drumm: Add UI for feature branches
drumm’s picture

drumm
he/him
Location NY, US
commented
Issue summary: View changes
Status: Needs review » Fixed
Issue tags: +needs drupal.org deployment

I'm testing this all together at https://drumm-drupal.dev.devdrupal.org/node/2726761, it looks good.

I made a couple small UI changes - put “Git” in the block title, put the “browse” link first, put the links on their own line.

I replaced the call to versioncontrol_project_repository_load(), since hook_node_load() for the project already loads it. We don't want to load it twice.

marvil07’s picture

marvil07 commented

/me hides for not creating two issue in versioncontrol* queues

Changes added to versioncontrol and versioncontro_git.

@drumm: It looks good in the test site, thanks!

drumm’s picture

drumm
he/him
Location NY, US
commented
Issue tags: -needs drupal.org deployment

Thanks! This has been deployed to Drupal.org.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.