Difference between revisions of "ParaView/Git/Develop"

From KitwarePublic
< ParaView‎ | Git
Jump to: navigation, search
(Share a Topic)
(9 intermediate revisions by the same user not shown)
Line 46: Line 46:
  
 
ParaView development uses a [[Git/Workflow/Topic|branchy workflow]] based on topic branches.
 
ParaView development uses a [[Git/Workflow/Topic|branchy workflow]] based on topic branches.
 +
We manage changes to the VTK submodule using an [[ParaView/Git/Develop/PVVTK#Workflow|extended VTK workflow]].
 
Our collaboration workflow consists of three main steps:
 
Our collaboration workflow consists of three main steps:
  
Line 95: Line 96:
 
:<code>$ git pullall</code>
 
:<code>$ git pullall</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 
<br/>
 
<br/>
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
 
<br/>
 
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-pull.html <code>pull</code>] and
+
([http://schacon.github.com/git/git-pull.html <code>pull</code>] and
[http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html <code>submodule</code>] <code>update</code>)
+
[http://schacon.github.com/git/git-submodule.html <code>submodule</code>] <code>update</code>)
 
|}
 
|}
  
Line 119: Line 120:
 
:''(If you are fixing a bug in the latest release then substitute'' <code>origin/release</code> ''for'' <code>origin/master</code>''.<br/>Then run'' <code>git submodule update</code>''.)''
 
:''(If you are fixing a bug in the latest release then substitute'' <code>origin/release</code> ''for'' <code>origin/master</code>''.<br/>Then run'' <code>git submodule update</code>''.)''
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html <code>git help fetch</code>]
+
[http://schacon.github.com/git/git-fetch.html <code>git help fetch</code>]
 
<br/>
 
<br/>
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 
<br/>
 
<br/>
[http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html <code>git help submodule</code>]
+
[http://schacon.github.com/git/git-submodule.html <code>git help submodule</code>]
 
<br/>
 
<br/>
 
[http://progit.org/book/ch3-2.html Pro Git: Basic Branching]
 
[http://progit.org/book/ch3-2.html Pro Git: Basic Branching]
Line 136: Line 137:
 
:<code>$ git commit</code>
 
:<code>$ git commit</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-add.html <code>git help add</code>]
+
[http://schacon.github.com/git/git-add.html <code>git help add</code>]
 
<br/>
 
<br/>
[http://www.kernel.org/pub/software/scm/git/docs/git-commit.html <code>git help commit</code>]
+
[http://schacon.github.com/git/git-commit.html <code>git help commit</code>]
 
<br/>
 
<br/>
 
[http://progit.org/book/ch2-2.html Pro Git: Recording Changes]
 
[http://progit.org/book/ch2-2.html Pro Git: Recording Changes]
Line 156: Line 157:
 
:<code>$ git checkout ''my-topic''</code>
 
:<code>$ git checkout ''my-topic''</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 
|-
 
|-
 
|
 
|
Line 166: Line 167:
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.prepush</code>]
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.prepush</code>]
 
<br/>
 
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-log.html <code>log</code>] <code>origin/master..</code>)
+
([http://schacon.github.com/git/git-log.html <code>log</code>] <code>origin/master..</code>)
 
|-
 
|-
 
|
 
|
Line 177: Line 178:
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.stage-push</code>]
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.stage-push</code>]
 
<br/>
 
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-push.html <code>push</code>] <code>stage HEAD</code>)
+
([http://schacon.github.com/git/git-push.html <code>push</code>] <code>stage HEAD</code>)
 
|}
 
|}
  
Line 194: Line 195:
 
:<code>$ git checkout ''my-topic''</code>
 
:<code>$ git checkout ''my-topic''</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 
|-
 
|-
 
|
 
|
Line 201: Line 202:
 
|-
 
|-
 
|
 
|
 +
:''(If you changed VTK [[ParaView/Git/Develop/PVVTK#Merge_a_Topic_for_Testing|merge the VTK topic]] first.)''
 
:<code>$ git stage-merge</code>
 
:<code>$ git stage-merge</code>
:''(If the automatic merge fails due to conflicts follow the printed instructions to resolve them.)''
+
:''(If the merge conflicts follow the printed instructions to resolve them.)''
 
|align="center"|
 
|align="center"|
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.stage-merge</code>]
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.stage-merge</code>]
 
<br/>
 
<br/>
 
(<code>ssh git@paraview.org stage ParaView merge ''my-topic''</code>)
 
(<code>ssh git@paraview.org stage ParaView merge ''my-topic''</code>)
 +
<br/>
 +
[[Git/Workflow/Topic/Conflicts#Topic-to-Topic|Topic-to-Topic Conflict Resolution]]
 
|}
 
|}
  
Line 223: Line 227:
 
|
 
|
 
:<code>$ git checkout ''my-topic''</code>
 
:<code>$ git checkout ''my-topic''</code>
 +
:<code>$ git submodule update</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 +
<br/>
 +
[http://schacon.github.com/git/git-submodule.html <code>git help submodule</code>]
 
|-
 
|-
 
|
 
|
Line 232: Line 239:
 
:<code>$ edit ''file1'' ''file2'' ''file3''</code>
 
:<code>$ edit ''file1'' ''file2'' ''file3''</code>
 
:<code>$ git add ''file1'' ''file2'' ''file3''</code>
 
:<code>$ git add ''file1'' ''file2'' ''file3''</code>
 +
:''(To fix VTK [[ParaView/Git/Develop/PVVTK#Extend_a_Topic|extend the VTK topic]] and use <code>git add VTK</code>.)''
 
:<code>$ git commit</code>
 
:<code>$ git commit</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-add.html <code>git help add</code>]
+
[http://schacon.github.com/git/git-add.html <code>git help add</code>]
 
<br/>
 
<br/>
[http://www.kernel.org/pub/software/scm/git/docs/git-commit.html <code>git help commit</code>]
+
[http://schacon.github.com/git/git-commit.html <code>git help commit</code>]
 
<br/>
 
<br/>
 
[http://progit.org/book/ch2-2.html Pro Git: Recording Changes]
 
[http://progit.org/book/ch2-2.html Pro Git: Recording Changes]
Line 247: Line 255:
  
 
Only core maintainers have access to merge a topic to '''master'''.
 
Only core maintainers have access to merge a topic to '''master'''.
They meet weekly to evaluate topics in '''next''' based on dashboard results and manual review.
+
They meet weekly to evaluate topics in '''next''' ([[ParaView/Git/Develop/PVVTK#Merge_a_Topic_for_Inclusion|and PVVTK '''pv-next''']]) based on dashboard results and manual review.
 
If your topic is accepted it will be merged to '''master''' for permanent inclusion after which you may [[#Delete_a_Topic|delete it]].
 
If your topic is accepted it will be merged to '''master''' for permanent inclusion after which you may [[#Delete_a_Topic|delete it]].
 
Otherwise the maintainers will contact you with feedback.
 
Otherwise the maintainers will contact you with feedback.
Line 265: Line 273:
 
:<code>$ git pullall</code>
 
:<code>$ git pullall</code>
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html <code>git help checkout</code>]
+
[http://schacon.github.com/git/git-checkout.html <code>git help checkout</code>]
 
<br/>
 
<br/>
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
 
[http://paraview.org/gitweb?p=ParaView.git;a=blob;f=Utilities/Scripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
 
<br/>
 
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-pull.html <code>pull</code>] and
+
([http://schacon.github.com/git/git-pull.html <code>pull</code>] and
[http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html <code>submodule</code>] <code>update</code>)
+
[http://schacon.github.com/git/git-submodule.html <code>submodule</code>] <code>update</code>)
 
|-
 
|-
 
|
 
|
Line 277: Line 285:
 
|
 
|
 
:<code>$ git branch -d ''my-topic''</code>
 
:<code>$ git branch -d ''my-topic''</code>
 +
:''(If you changed VTK [[ParaView/Git/Develop/PVVTK#Delete_a_Topic|delete the VTK topic]].)''
 
|align="center"|
 
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-branch.html <code>git help branch</code>]
+
[http://schacon.github.com/git/git-branch.html <code>git help branch</code>]
 
|-
 
|-
 
|
 
|

Revision as of 10:22, 7 November 2011


This page documents how to develop ParaView through Git. See our table of contents for more information.

Git is an extremely powerful version control tool that supports many different "workflows" for indivudal development and collaboration. Here we document procedures used by the ParaView development community. In the interest of simplicity and brevity we do not provide an explanation of why we use this approach. Furthermore, this is not a Git tutorial. Please see our Git resource links for third-party documentation, such as the ProGit Book.

Setup

Before you begin, perform initial setup:

1. Register Git push access.

2. Follow the download instructions to create a local ParaView clone:

$ git clone --recursive git://paraview.org/ParaView.git

Connection refused?

3. Run the developer setup script to prepare your ParaView work tree and create Git command aliases used below:

$ ./Utilities/SetupForDevelopment.sh

SetupForDevelopment.sh
Pro Git: Setup

Workflow

ParaView development uses a branchy workflow based on topic branches. We manage changes to the VTK submodule using an extended VTK workflow. Our collaboration workflow consists of three main steps:

1. Local Development

2. Testing and Review

3. Integration by Maintainers

Update

Update your local master branch:

$ git checkout master
$ git pullall

git help checkout
alias.pullall
(pull and submodule update)

Create a Topic

All new work must be committed on topic branches. Name topics like you might name functions: concise but precise. A reader should have a general idea of the feature or fix to be developed given just the branch name.

To start a new topic branch:

$ git fetch origin
$ git checkout -b my-topic origin/master
(If you are fixing a bug in the latest release then substitute origin/release for origin/master.
Then run
git submodule update.)

git help fetch
git help checkout
git help submodule
Pro Git: Basic Branching

Edit files and create commits (repeat as needed):

$ edit file1 file2 file3
$ git add file1 file2 file3
(To change VTK create a VTK topic and use git add VTK.)
$ git commit

git help add
git help commit
Pro Git: Recording Changes

Share a Topic

When a topic is ready for testing and review by others, share it by pushing it to the topic stage. Be sure you have registered for Git push access.

Checkout the topic if it is not your current branch:

$ git checkout my-topic

git help checkout

Check what commits will be pushed to the topic stage:

$ git prepush

alias.prepush
(log origin/master..)

Push commits in your topic branch to the topic stage:

(If you changed VTK share the VTK topic first.)
$ git stage-push

alias.stage-push
(push stage HEAD)

The topic is now published on the ParaView Topic Stage and may be (optionally) reviewed by others.

Merge a Topic for Testing

When your topic is ready, merge it to the ParaView next branch for testing.

Checkout the topic if it is not your current branch:

$ git checkout my-topic

git help checkout

Ask the topic stage to automatically merge the topic. It will merge to next by default.

(If you changed VTK merge the VTK topic first.)
$ git stage-merge
(If the merge conflicts follow the printed instructions to resolve them.)

alias.stage-merge
(ssh git@paraview.org stage ParaView merge my-topic)
Topic-to-Topic Conflict Resolution

The topic is now integrated into ParaView's next branch and will be tested by dashboard builds.

Extend a Topic

If your topic runs cleanly after a night of dashboard builds, it is ready for the next step. Otherwise, extend the topic with additional commits to fix the problems.

Checkout the topic if it is not your current branch:

$ git checkout my-topic
$ git submodule update

git help checkout
git help submodule

Edit files and create commits (repeat as needed):

$ edit file1 file2 file3
$ git add file1 file2 file3
(To fix VTK extend the VTK topic and use git add VTK.)
$ git commit

git help add
git help commit
Pro Git: Recording Changes

Return to the earlier step to share the extended topic.

Merge a Topic for Inclusion

Only core maintainers have access to merge a topic to master. They meet weekly to evaluate topics in next (and PVVTK pv-next) based on dashboard results and manual review. If your topic is accepted it will be merged to master for permanent inclusion after which you may delete it. Otherwise the maintainers will contact you with feedback. Respond by returning to the above step to address their concerns.

Delete a Topic

After a topic has been merged upstream, delete your local branch for the topic.

Checkout and update the master branch:

$ git checkout master
$ git pullall

git help checkout
alias.pullall
(pull and submodule update)

Delete the local topic branch:

$ git branch -d my-topic
(If you changed VTK delete the VTK topic.)

git help branch

The branch -d command works only when the topic branch has been correctly merged. Use -D instead of -d to force the deletion of an unmerged topic branch (warning - you could lose commits).