Skip to main content

Tuleap Community Edition development and releases are no longer public. You have until September 30th to download packages and sources in Tuleap project. You can contact the team if you need further assistance.

Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

  •  
     
    story #11477 have a dedicated reference for pullrequests
Summary
Empty
have a dedicated reference for pullrequests

I can manage branch deletion, continuous integration, etc

Functional overview

As it's mainly an internal refactoring, there are very few functional changes. However the following things will change:

  • Continuous integration can be more reliably associated with the PR (as the verification of the PR will be defined in the target repository, not in the source as of today)
  • It will be possible to browse PR associated to a deleted source branch (not possible today)
  • Better performances for merge

Technical changes

At pullrequest creation, a new reference will be created in the target repository. The namespace will be refs/tlpr/ and the PR will be numbered starting at 1:

  • First pullrequest will create refs/tlpr/1/head
  • Second will create refs/tlpr/2/head
  • etc

A new commit in the source branch will automatically update the reference (not create a new PR). Hence the target namepace will be "rewindable" that is to say that refs/pr/1/head history can be rewritten if source repository was rewritten.

The intermediate repository for merge will no longer be used.

Todo

  • forgeupgrade bucket to assign a PR id per repository starting 1 for each PR / repo.
  • a new PR will create a new reference in refs/tlpr namespace
  • a push in source branch of a PR (as long as the PR is open) generates a push --force in corresponding refs/tlpr/X/head
  • a merge of PR is merge of refs/tlpr/X/head in the target branch
    • As result refs/tlpr/X/head is no longer updated
  • at repository fork (in project or across projects) doesn't clone refs/tlpr namespace
  • pullrequests backend (REST) updates
    • diff generation
    • merge
  • pullrequests UI updates
    • Add info in the UI "how to fetch PR locally?"
  • pullrequests Continuous Integration updates
    • CI now targets the pr itself (must be configured in target repo)
    • Snippet to be deployed on jenkins is updated
  • git/gitolite backend updates
    • refs/tlpr namespace is Readonly
  • all existing PR are converted to refs/tlpr/X/head
    • there is an async job (root_daily to do it in background)
    • when someone access a given PR there is a conversion step first before they can go to the PR
  • xml import/export
    • nothing is done but code should be able to manage that a given pr cannot be created because the ref already exists
By Thomas Gerbet (tgerbet)
(25 kB)
checkout_pr_instructions_1.jpg
By Thomas Gerbet (tgerbet)
(32 kB)
checkout_pr_instructions_2.jpg
Empty
Status
Empty
Done
Development
  • [ ] Does it involves User Interface? 
  • [ ] Are there any mockups?
  • [ ] Are permissions checked?
  • [ ] Does it need Javascript development?
  • [ ] Does it need a forge upgrade bucket?
  • [ ] Does it need to execute things in system events?
  • [ ] Does it impact project creation (templates)?
  • [ ] Is it exploratory?
Empty
Details
#11477
Manuel Vacelet (vaceletm)
2018-06-21 16:33
2018-05-14 15:48
11796

References
Referencing story #11477

Artifact

rel #11440 10.2
request #11656 Pull request plugin depends on Git 2.9+
epic #8818 Pull Requests v1
Display settings

Follow-ups

User avatar
Manon Midy (mmidy)2018-06-21 16:33
  • I want to
    -have a dedicated references for pullrequests 
    +have a dedicated reference for pullrequests 
  • Category set to
User avatar
Thomas Gerbet (tgerbet)2018-06-06 13:47
  • Acceptance criteria
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes
User avatar
Manuel Vacelet (vaceletm)2018-05-21 15:23
  • Acceptance criteria
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes
User avatar
Manuel Vacelet (vaceletm)2018-05-14 15:49
  • So that
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes
  • Acceptance criteria
    Something went wrong, the follow up content couldn't be loaded
    Only formatting have been changed, you should switch to markup to see the changes