Paths

Table of Contentst

Differential D300

branch url query
AbandonedPublic
Actions

Authored by Paladox on Jul 29 2016, 5:38 PM.

Details

Maniphest Tasks: T137354: Unable to browse refs/meta/config in Diffusion
Reviewers: None
Patch without arc: git checkout -b D300 && curl -L https://phabricator.wikimedia.org/D300?download=true | git apply

Summary

This supports having a commit sha backwords compat so you can either
specify branch or branch + commit

Also support for stripping out refs/meta/ from branch url

Example

This is an example with just branch

https://phabricator.wikimedia.org/r/branch/mediawiki/core;master;

This is an example for branch + sha

https://phabricator.wikimedia.org/r/branch/mediawiki/core;master/ebf6c958e4f4deb36dc57c6ba627f15ef2e2dad2

note

Requires https://gerrit.wikimedia.org/r/#/c/301849/ also to be merged at the same time

Bug: T137354
Change-Id: Ic5c8e8c3bde16e62d014065c5814853f5b9c9411

Diff Detail

Repository

rPHEX phabricator-extensions

Branch

wmf/stable

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 719
Build 1069: differential-jessie	Jenkins
Build 1068: arc lint + arc unit

Event Timeline

Paladox updated this revision to Diff 816.Jul 29 2016, 5:38 PM

Paladox retitled this revision from to Support /r/branches query so we can have a branch and a sha.

Paladox updated this object.

Paladox edited the test plan for this revision. (Show Details)

Restricted Application added a reviewer: mmodell. · View Herald TranscriptJul 29 2016, 5:38 PM

Build has FAILED

Link to build: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/36/
See console output for more information: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/36/console

Fix name of $branchs to $branches

Build has FAILED

Link to build: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/37/
See console output for more information: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/37/console

Paladox added a task: T137354: Unable to browse refs/meta/config in Diffusion.Jul 29 2016, 5:41 PM

mmodell added inline comments.Jul 29 2016, 5:42 PM

src/gerrit/GerritApplication.php
46	You use 'branchs' elsewhere but the regexp match will be named `$data['branch']` unless you add the s here: `'/r/(?P<action>[a-z]+)/(?P<gerritProject>[^;]+);(?P<branchs>[^;]+);(?P<sha>[0-9a-z]+)',`

@mmodell will this work for also stripping refs/heads out of the url.

mmodell added inline comments.Jul 29 2016, 5:44 PM

src/gerrit/GerritApplication.php
45	Oops, never mind. It looks like you fixed it at the same time as I commented.

Paladox added a project: Diffusion.Jul 29 2016, 5:44 PM

Paladox added a reviewer: demon.

In D300#6236, @Paladox wrote:

@mmodell will this work for also stripping refs/heads out of the url.

it might work? I'm not sure exactly what you mean.

In D300#6241, @mmodell wrote:

In D300#6236, @Paladox wrote:

@mmodell will this work for also stripping refs/heads out of the url.

it might work? I'm not sure exactly what you mean.

@mmodell Well because $branch is used in getBranchNameFromRef and I'm using $branches I'm not sure if it will work.

Paladox marked 2 inline comments as done.Jul 29 2016, 5:47 PM

Update to remove branches and instead use branch query.

All tested on phab-01.

Backwords compat, more details in commit msg.

Build has FAILED

Link to build: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/39/
See console output for more information: https://integration.wikimedia.org/ci/job/phabricator-jessie-diffs/39/console

Paladox retitled this revision from Support /r/branches query so we can have a branch and a sha to Support commits in /r/branch url query.Jul 29 2016, 10:08 PM

Paladox updated this object.

Paladox mentioned this in D299: Strip refs/meta out of url.

Paladox updated this object.Jul 29 2016, 10:13 PM

Paladox added a reviewer: Dzahn.

Dzahn removed a reviewer: Dzahn.Jul 30 2016, 12:16 AM