ITK/Git/Develop: Difference between revisions

From KitwarePublic
< ITK‎ | Git
Jump to navigationJump to search
 
(47 intermediate revisions by 8 users not shown)
Line 1: Line 1:
{{ Historical }}
__NOTOC__
__NOTOC__


Line 9: Line 11:
In the interest of simplicity and brevity we do '''not''' provide an explanation of why we use this approach.
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.
Furthermore, this is '''not''' a Git tutorial.
Please see our [[Git/Resources|Git resource links]] for third-party documentation, such as the [http://progit.org/book/ ProGit Book].
Please see our [[Git/Resources|Git resource links]] for third-party documentation, such as the [http://git-scm.com/book/ ProGit Book].
</i>
</i>


Line 44: Line 46:
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/SetupForDevelopment.sh;hb=HEAD <code>SetupForDevelopment.sh</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/SetupForDevelopment.sh;hb=HEAD <code>SetupForDevelopment.sh</code>]
<br/>
<br/>
[http://progit.org/book/ch1-5.html Pro Git: Setup]
[http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup Pro Git: Setup]
|}
|}
Note that if you answer 'y' to the question "Do you want to test push access to itk.org? [y/N]:", you will most likely receive the following error message: "Permission denied (publickey). fatal: Could not read from remote repository.". Only a few experienced contributors have push access. Having push access is not necessary to contribute to ITK.


==Workflow==
==Workflow==
Line 98: Line 101:
:<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://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/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 122:
|
|
:<code>$ git fetch origin</code>
:<code>$ git fetch origin</code>
:{|
|-
|
For new development, start the topic from <code>origin/master</code>:
:<code>$ git checkout -b ''my-topic'' origin/master</code>
:<code>$ git checkout -b ''my-topic'' origin/master</code>
''(If you are fixing a bug in the latest release then substitute'' <code>origin/release</code> ''for'' <code>origin/master</code>''.)''
|-
|
For release branch fixes, start the topic from <code>origin/release</code>, and by convention use a topic name starting in "<code>release-</code>":
:<code>$ git checkout -b ''my-topic'' origin/release</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/>
[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-checkout.html <code>git help checkout</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://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging Pro Git: Basic Branching]
|-
|-
|
|
Edit files and create commits (repeat as needed):
Edit files and create commits (repeat as needed). Add a prefix to your commit message (see below).
|-
|-
|
|
:<code>$ edit ''file1'' ''file2'' ''file3''</code>
:<code>$ edit ''file1'' ''file2'' ''file3''</code>
:''(To add data follow [[ITK/Git/Develop/Data#Add_Data|these instructions]].)''
:<code>$ git add ''file1'' ''file2'' ''file3''</code>
:<code>$ git add ''file1'' ''file2'' ''file3''</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/>
[http://schacon.github.com/git/git-commit.html <code>git help commit</code>]
<br/>
<br/>
[http://www.kernel.org/pub/software/scm/git/docs/git-commit.html <code>git help commit</code>]
[http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository Pro Git: Recording Changes]
|-
|
''(If your change modifies the "<code>Modules/ThirdParty/KWSys/src/KWSys</code>" directory please contribute directly to [https://gitlab.kitware.com/utils/kwsys/blob/master/CONTRIBUTING.rst KWSys] instead.)''
<br/>
<br/>
[http://progit.org/book/ch2-2.html Pro Git: Recording Changes]
''(If your change modifies the "<code>Modules/ThirdParty/MetaIO/src/MetaIO</code>" directory please contribute directly to [https://github.com/Kitware/MetaIO/blob/master/CONTRIBUTING.rst MetaIO] instead.)''
|-
|
Standard prefixes for ITK commit messages :
* BUG: Fix for runtime crash or incorrect result
* COMP: Compiler error or warning fix
* DOC: Documentation change
* ENH: New functionality
* PERF: Performance improvement
* STYLE: No logic impact (indentation, comments)
* WIP: Work In Progress not ready for merge
|
|}
|}


Line 156: Line 186:
:<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 196:
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.prepush</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/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 173: Line 203:
|
|
:<code>$ git gerrit-push</code>
:<code>$ git gerrit-push</code>
:''(If the topic adds data see [[ITK/Git/Develop/Data#Push|this note]].)''
or if you started the topic from the release branch:
:<code>$ git push gerrit HEAD:refs/for/release/''my-topic'' </code>
|align="center"|
|align="center"|
[[ITK/Git/Account#Firewall_blocks_SSH_traffic|Connection refused]]?
<br/>
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.gerrit-push</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.gerrit-push</code>]
<br/>
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-push.html <code>push</code>] <code>gerrit HEAD:refs/for/master/''my-topic''</code>)
([http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/Git/git-gerrit-push;hb=HEAD <code>Utilities/Git/git-gerrit-push</code>])
|}
|}
Find your change in the [http://review.source.kitware.com/p/ITK ITK Gerrit] instance and add [[ITK/Gerrit/Reviewers|reviewers]].


==Revise a Topic==
==Revise a Topic==
Line 192: Line 228:
:<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>]
|-
|
To revise the most recent commit on the topic edit files and add changes normally and then amend the commit:
|-
|
:<code>$ git commit --amend</code>
|align="center"|
[http://schacon.github.com/git/git-commit.html <code>git help commit</code>]
<br/>
[http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-the-Last-Commit Pro Git: Changing the Last Commit]
|-
|-
|
|
To revise the <code>3</code>rd commit back on the topic:
To revise commits further back on the topic, say the <code>3</code>rd commit back:
|-
|-
|
|
Line 204: Line 250:
Preserve the <code>Change-Id:</code> line at the bottom of each commit message.
Preserve the <code>Change-Id:</code> line at the bottom of each commit message.
|align="center"|
|align="center"|
[http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html <code>git help rebase</code>]
[http://schacon.github.com/git/git-rebase.html <code>git help rebase</code>]
<br/>
[http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages Pro Git: Changing Multiple Commits]
<br/>
<br/>
[http://progit.org/book/ch3-6.html Pro Git: Rebasing]
[http://git-scm.com/book/en/Git-Branching-Rebasing Pro Git: Rebasing]
|-
|-
|
|
Return to the [[#Share_a_Topic|previous step]] to share the revised topic.
Return to the [[#Share_a_Topic|previous step]] to share the revised topic.
|}
==Test a Topic==
When a patch is submitted, it is tested across the three major platforms
before being merged and tested on many platforms and configurations on the
[https://open.cdash.org/index.php?project=Insight nightly dashboard].
If tests fail on a submitted topic, see the [[#Revise_a_Topic|previous step]]
on how to submit a revised version. After a topic is merged, please
check the next day's nightly dashboard to ensure there are not any regressions. 
If there are any new warnings or errors, submit a follow-up patch as soon
as possible.
When a patch is submitted, MacOSX-Clang, Windows-MSVC, and Linux-GCC builds will
start. Once they have finished, the build robots will make a comment on the patch
with a link to their results visualized in CDash and mark the patch set as
''Verified +1'' or ''Not Verified -1''. The results are submitted by the
Kitware Build Robot Gerrit user.
Builds can be spawned by adding the following comments to a
patch set in Gerrit.
{| style="width: 100%"
|-
|width=60%|
|-
|
:<code>request build: all</code>
|align="center"|
MacOSX, Linux, Windows
|-
|
:<code>request build: osx</code>
|align="center"|
MacOSX
|-
|
:<code>request build: linux</code>
|align="center"|
Linux
|-
|
:<code>request build: windows</code>
|align="center"|
Windows
|-
|
:<code>request build: python</code>
|align="center"|
Python Wrapping (Linux, MacOSX, Windows)
|-
|
:<code>request build: power8</code>
|align="center"|
[https://en.wikipedia.org/wiki/POWER8 POWER8]
|-
|
:<code>request build: cpp11</code>
|align="center"|
C++11 (Linux, MacOSX, Windows)
|-
|
:<code>request build: cpp14</code>
|align="center"|
C++14 (Linux, MacOSX, Windows)
|-
|
:<code>request build: cpp17</code>
|align="center"|
C++17 (Linux, MacOSX, Windows)
|-
|}
|}


==Merge a Topic==
==Merge a Topic==
After a topic has been reviewed and approved in Gerrit, merge it into the upstream repository.
'''Only authorized developers with [[ITK/Git/Account#Git|Git push access]] to <code>itk.org</code> may perform this step.'''
'''Only authorized developers with [[ITK/Git/Account#Git|Git push access]] to <code>itk.org</code> may perform this step.'''


After a feature topic has been reviewed and approved in Gerrit, merge it into the upstream repository.
{| style="width: 100%"
{| style="width: 100%"
|-
|-
Line 225: Line 343:
:<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>]
|-
|-
|
|
Merge the topic:
Merge the topic, which is originally forked off the master branch, to master branch:
|-
|-
|
|
:<code>$ git gerrit-merge</code>
:<code>$ git gerrit-merge</code>
:''(If the merge conflicts follow the printed instructions to resolve them.)''
|align="center"|
|align="center"|
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.gerrit-merge</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.gerrit-merge</code>]
<br/>
<br/>
([http://www.kernel.org/pub/software/scm/git/docs/git-push.html <code>push</code>] to [[Git/Workflow/Stage|topic stage]] and
([http://schacon.github.com/git/git-push.html <code>push</code>] to [[Git/Workflow/Stage|topic stage]] and
<br/>
<br/>
<code>stage ITK merge ''my-topic''</code>)
<code>stage ITK merge ''my-topic''</code>)
<br/>
[[Git/Workflow/Topic/Conflicts#Branch-to-Topic|Branch-to-Topic Conflict Resolution]]
|}
|}
For bug fixes that are ready to be included in the next patch release, please email the release manager,
[[User:Matt.mccormick| Matt McCormick]], for assistance.
Here are the recommended steps to merge a topic to both release and master branches, assuming the topic
branch is forked off the release branch:
:<code>$ git checkout release</code>
:<code>$ git merge --no-ff ''my-topic''</code>
:<code>$ git push origin release</code>
and do:
:<code>$ git checkout master</code>
:<code>$ git merge --no-ff release</code>
:<code>$ git push origin master</code>
to merge the release branch back to master.


==Delete a Topic==
==Delete a Topic==
Line 253: Line 389:
:<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://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/SetupGitAliases.sh;hb=HEAD <code>alias.pullall</code>]
[http://itk.org/gitweb?p=ITK.git;a=blob;f=Utilities/DevelopmentSetupScripts/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 266: Line 402:
:<code>$ git branch -d ''my-topic''</code>
:<code>$ git branch -d ''my-topic''</code>
|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>]
|-
|-
|
|

Latest revision as of 20:43, 30 November 2017


This page documents how to develop ITK 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 ITK 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 Gerrit access and possibly Git push access.

2. Optionally download our one page PDF desk reference.

3. Follow the download instructions to create a local ITK clone:

$ git clone git://itk.org/ITK.git

Connection refused?

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

$ ./Utilities/SetupForDevelopment.sh

SetupForDevelopment.sh
Pro Git: Setup

Note that if you answer 'y' to the question "Do you want to test push access to itk.org? [y/N]:", you will most likely receive the following error message: "Permission denied (publickey). fatal: Could not read from remote repository.". Only a few experienced contributors have push access. Having push access is not necessary to contribute to ITK.

Workflow

ITK development uses a branchy workflow based on topic branches. Our collaboration workflow consists of three main steps:

1. Local Development

2. Code Review

Gerrit Code Review

3. Integrate Changes

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

For new development, start the topic from origin/master:

$ git checkout -b my-topic origin/master

For release branch fixes, start the topic from origin/release, and by convention use a topic name starting in "release-":

$ git checkout -b my-topic origin/release

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

Edit files and create commits (repeat as needed). Add a prefix to your commit message (see below).

$ edit file1 file2 file3
(To add data follow these instructions.)
$ git add file1 file2 file3
$ git commit

git help add
git help commit
Pro Git: Recording Changes

(If your change modifies the "Modules/ThirdParty/KWSys/src/KWSys" directory please contribute directly to KWSys instead.)
(If your change modifies the "Modules/ThirdParty/MetaIO/src/MetaIO" directory please contribute directly to MetaIO instead.)

Standard prefixes for ITK commit messages :

  • BUG: Fix for runtime crash or incorrect result
  • COMP: Compiler error or warning fix
  • DOC: Documentation change
  • ENH: New functionality
  • PERF: Performance improvement
  • STYLE: No logic impact (indentation, comments)
  • WIP: Work In Progress not ready for merge

Share a Topic

When a topic is ready for review and possible inclusion, share it by pushing to Gerrit. Be sure you have registered for Gerrit 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 Gerrit for review:

$ git prepush

alias.prepush
(log origin/master..)

Push commits in your topic branch for review by the community:

$ git gerrit-push
(If the topic adds data see this note.)

or if you started the topic from the release branch:

$ git push gerrit HEAD:refs/for/release/my-topic

Connection refused?
alias.gerrit-push
(Utilities/Git/git-gerrit-push)

Find your change in the ITK Gerrit instance and add reviewers.

Revise a Topic

If a topic is approved during Gerrit review, skip to the next step. Otherwise, revise the topic and push it back to Gerrit for another review.

Checkout the topic if it is not your current branch:

$ git checkout my-topic

git help checkout

To revise the most recent commit on the topic edit files and add changes normally and then amend the commit:

$ git commit --amend

git help commit
Pro Git: Changing the Last Commit

To revise commits further back on the topic, say the 3rd commit back:

$ git rebase -i HEAD~3

(Substitute the correct number of commits back, as low as 1.)

Follow Git's interactive instructions. Preserve the Change-Id: line at the bottom of each commit message.

git help rebase
Pro Git: Changing Multiple Commits
Pro Git: Rebasing

Return to the previous step to share the revised topic.

Test a Topic

When a patch is submitted, it is tested across the three major platforms before being merged and tested on many platforms and configurations on the nightly dashboard.

If tests fail on a submitted topic, see the previous step on how to submit a revised version. After a topic is merged, please check the next day's nightly dashboard to ensure there are not any regressions. If there are any new warnings or errors, submit a follow-up patch as soon as possible.

When a patch is submitted, MacOSX-Clang, Windows-MSVC, and Linux-GCC builds will start. Once they have finished, the build robots will make a comment on the patch with a link to their results visualized in CDash and mark the patch set as Verified +1 or Not Verified -1. The results are submitted by the Kitware Build Robot Gerrit user.

Builds can be spawned by adding the following comments to a patch set in Gerrit.

request build: all

MacOSX, Linux, Windows

request build: osx

MacOSX

request build: linux

Linux

request build: windows

Windows

request build: python

Python Wrapping (Linux, MacOSX, Windows)

request build: power8

POWER8

request build: cpp11

C++11 (Linux, MacOSX, Windows)

request build: cpp14

C++14 (Linux, MacOSX, Windows)

request build: cpp17

C++17 (Linux, MacOSX, Windows)

Merge a Topic

Only authorized developers with Git push access to itk.org may perform this step.

After a feature topic has been reviewed and approved in Gerrit, merge it into the upstream repository.

Checkout the topic if it is not your current branch:

$ git checkout my-topic

git help checkout

Merge the topic, which is originally forked off the master branch, to master branch:

$ git gerrit-merge
(If the merge conflicts follow the printed instructions to resolve them.)

alias.gerrit-merge
(push to topic stage and
stage ITK merge my-topic)
Branch-to-Topic Conflict Resolution

For bug fixes that are ready to be included in the next patch release, please email the release manager, Matt McCormick, for assistance.

Here are the recommended steps to merge a topic to both release and master branches, assuming the topic branch is forked off the release branch:

$ git checkout release
$ git merge --no-ff my-topic
$ git push origin release

and do:

$ git checkout master
$ git merge --no-ff release
$ git push origin master

to merge the release branch back to master.

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

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).