| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
|
#acl LcnGroup:read,write,delete,revert All:read <<TableOfContents>> This page describes how one would go about contributing changes to the freesurfer source code repository on github. The official freesurfer github can be found here: https://github.com/freesurfer/freesurfer == Initial Setup == The initial setup for contributing to the freesurfer repository involves the user forking off the freesurfer !GitHub repo, cloning the users fork into a local repository, then adding the freesurfer repository as an upstream remote. This setup is illustrated below, followed by a more detailed description of the steps involved: {{attachment:github_workflow6.jpeg}} 1. Sign up for a [[https://github.com/|github]] account if you don't already have one. When creating an account, you can use any email you want, but developers at the Martinos Center should eventually link their <username>@mgh.harvard.edu email to their !GitHub account. This can be done after the account is created. 2. From your !GitHub account, fork the [[https://github.com/freesurfer/freesurfer|freesurfer project repository]] by clicking on the 'Fork' button near the top right-hand of the page. This creates a copy of the freesurfer code base under your account on the !GitHub server. {{attachment:fork.jpeg}} 3. On your local machine, make a clone of your freesurfer repository (the one you forked): {{{ git clone git@github.com:<git_username>/freesurfer.git }}} 4. Add the main freesurfer repository as a remote to the local clone you already have on your local disk, and set it as the '''upstream''' remote: {{{ git remote add upstream git@github.com:freesurfer/freesurfer.git }}} 5. Type the following command to make sure you have the proper setup: {{{ git remote -v origin git@github.com:zkaufman/freesurfer.git (fetch) origin git@github.com:zkaufman/freesurfer.git (push) upstream git@github.com:freesurfer/freesurfer.git (fetch) upstream git@github.com:freesurfer/freesurfer.git (push) }}} == Committing Changes == To contribute the the freesurfer code base, users should create a new branch off the {{{dev}}} branch, push the branch to their fork ({{{origin}}}), then submit '''Pull requests''' into {{{freesurfer/dev}}} to get those changes into the freesurfer code base. This workflow is illustrated below, followed by a more detailed description of the steps involved: {{attachment:github_workflow5.JPG}} 1. When you start to make changes, the first thing to do is make sure you are in the dev branch and everything is up to date with the upstream repo: {{{ git branch * dev }}} {{{ git pull upstream dev }}} 2. Then create a new branch (off {{{dev}}}) to hold your work and start making changes. Ideally, use a prefix signaling the purpose of the branch: {{{ git checkout -b nf-my-feature }}} * {{{nf-}}} for new features * {{{bf-}}} for bug fixes * {{{rf-}}} for refactoring * {{{doc-}}} for documentations contributions. * {{{test-}}} for test related contributions. 3. Work on this copy on your computer using Git to do the version control. When you're done editing, commit the files to the local branch and push the branch to {{{origin}}} (your personal !GitHub account): {{{ git add <modified_files> git commit -m "Commit message" git push origin nf-my-feature }}} 4. Finally, go to the !GitHub web page of your fork of the freesurfer repo, and click '''Pull request''' to send your changes to the maintainers for review. Make sure you are submitting your newly created branch into the {{{freesurfer/dev}}}. This will send an email to the committers. You can commit new changes to this branch and keep pushing to your remote -- github automagically adds them to your previously opened Pull request. {{attachment:new_pull_request.JPG}} {{attachment:compare_changes.jpeg}} 5. Once you have submitted your pull request for the {{{nf-my-feature}}}, it is best practice to switch back into {{{dev}}} and do an update. You are then free to start the process anew (i.e. create a new branch, commit changes, submit pull request): {{{ git checkout dev git pull upstream dev }}} === Cleanup steps (Optional) === 6. Once your pull request is accepted (you should get an email), feel free to delete the branch you created: {{{ git branch -D nf-my-feature }}} == Developing == Instructions on how to further work with the freesurfer source code, including building, testing, and adding a binary to the tree, should consult the Freesurfer Developers Guide: https://surfer.nmr.mgh.harvard.edu/fswiki/DevelopersGuide_git == Data files == Data files represent a special case for source code repositories and generally speaking data files should not be stored in a source code repo. Rather they should be stored in a separate storage area, reserved for times when retrieval is required (e.g. updating test data, performing local installations, etc). Think of "source code" as files which are made up of text, are required for compilation, and can be easily inspected by the human eye (and diff'ed by the '''diff''' program). Think of "data files" as files stored as binary and not required for compilation. A default clone of the repo will only give the user source code. Data files are stored in git annex, exist as broken symlinks by default, and need to be specially requested. To request a datafile, first add the remote repository that stores all the freesurfer data files: {{{ (Users outside the Center) git remote add datasrc https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/repo/annex.git git fetch datasrc (Users within the Center) git remote add datasrc file:///space/freesurfer/repo/annex.git git fetch datasrc }}} Your list of remote repositories should now look something like this: {{{ git remote -v datasrc https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/repo/annex.git (fetch) datasrc https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/repo/annex.git (push) origin git@github.com:zkaufman/freesurfer.git (fetch) origin git@github.com:zkaufman/freesurfer.git (push) upstream git@github.com:freesurfer/freesurfer.git (fetch) upstream git@github.com:freesurfer/freesurfer.git (push) }}} Then you can just specifically request whatever datafile you need: {{{ git annex get GEMS2/Testing/test.txt.gz ######################################################################## 100.0% (checksum...) ok (recording state in git...) }}} Or just get everything (Not recommended): {{{ git annex get . }}} ## This page is provided for !FreeSurfer developers to assist in the CVS -> git transition. ##This page is not meant to be a comprehensive guide for using git. Git is a feature loaded version control system which at times can be a bit of a hurdle to learn. However, when used in its simplest form, it can be very similar to most all other version control systems, including CVS. Below are many of the basic CVS commands used by !FreeSurfer developers the git equivalent of that command. ##The following sites are great resources for those who want to dig deeper and and learn more about git and its features. ## * [[https://www.atlassian.com/git/tutorials/what-is-git|Atlassian]] ## * [[https://git-scm.com/doc|git-scm]] |
- Diff for "Freesurfer_git"