From d025016b3c07b99162b09c6676764d2fc48e623c Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 15 Jul 2011 17:09:37 -0500 Subject: [PATCH] DOC: Update gitwash generated docs. --- doc/source/gitwash/branch_dropdown.png | Bin 0 -> 16311 bytes doc/source/gitwash/branch_list.png | Bin 13361 -> 0 bytes doc/source/gitwash/branch_list_compare.png | Bin 10679 -> 0 bytes doc/source/gitwash/configure_git.txt | 175 +++++--- doc/source/gitwash/development_workflow.txt | 406 +++++++++++++----- doc/source/gitwash/dot2_dot3.txt | 28 -- doc/source/gitwash/following_latest.txt | 4 +- doc/source/gitwash/forking_hell.txt | 24 +- doc/source/gitwash/git_development.txt | 2 +- doc/source/gitwash/git_install.txt | 6 +- doc/source/gitwash/git_intro.txt | 10 +- .../gitwash/{git_links.txt => git_links.inc} | 39 +- doc/source/gitwash/git_resources.txt | 24 +- doc/source/gitwash/index.txt | 2 +- doc/source/gitwash/known_projects.inc | 41 ++ doc/source/gitwash/links.inc | 4 + doc/source/gitwash/maintainer_workflow.txt | 96 +++++ doc/source/gitwash/patching.txt | 65 +-- doc/source/gitwash/set_up_fork.txt | 8 +- doc/source/gitwash/this_project.inc | 5 + 20 files changed, 656 insertions(+), 283 deletions(-) create mode 100644 doc/source/gitwash/branch_dropdown.png delete mode 100644 doc/source/gitwash/branch_list.png delete mode 100644 doc/source/gitwash/branch_list_compare.png delete mode 100644 doc/source/gitwash/dot2_dot3.txt rename doc/source/gitwash/{git_links.txt => git_links.inc} (77%) create mode 100644 doc/source/gitwash/known_projects.inc create mode 100644 doc/source/gitwash/links.inc create mode 100644 doc/source/gitwash/maintainer_workflow.txt create mode 100644 doc/source/gitwash/this_project.inc diff --git a/doc/source/gitwash/branch_dropdown.png b/doc/source/gitwash/branch_dropdown.png new file mode 100644 index 0000000000000000000000000000000000000000..1bb7a577732c91ee6aa31de8f81045b5622126b2 GIT binary patch literal 16311 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

_7R111LPD;|HP^UiQJ< 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 VTJiw>+XDn7B_=Og{lhTu{{jB^XlDQb diff --git a/doc/source/gitwash/branch_list_compare.png b/doc/source/gitwash/branch_list_compare.png deleted file mode 100644 index 336afa3746040f118c073e7d02a5843bc8eed152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10679 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 1.7 you can ensure that the link is correctly set by using the +``--set-upstream`` option:: + + git push --set-upstream origin my-new-feature + +From now on git will know that ``my-new-feature`` is related to the +``my-new-feature`` branch in the github repo. + +.. _edit-flow: The editing workflow ==================== @@ -78,101 +133,46 @@ In more detail #. Check what the actual changes are with ``git diff`` (`git diff`_). #. Add any new files to version control ``git add new_file_name`` (see - `git add`_). + `git add`_). #. To commit all modified files into the local copy of your repo,, do ``git commit -am 'A commit message'``. Note the ``-am`` options to ``commit``. The ``m`` flag just signals that you're going to type a - message on the command line. The ``a`` flag - you can just take on - faith - or see `why the -a flag?`_. See also the `git commit`_ manual - page. -#. To push the changes up to your forked repo on github_, do a ``git - push`` (see `git push`). + message on the command line. The ``a`` flag |emdash| you can just take on + faith |emdash| or see `why the -a flag?`_ |emdash| and the helpful use-case + description in the `tangled working copy problem`_. The `git commit`_ manual + page might also be useful. +#. To push the changes up to your forked repo on github, do a ``git + push`` (see `git push`_). -Asking for code review -====================== +Ask for your changes to be reviewed or merged +============================================= -#. Go to your repo URL - e.g. ``http://github.com/your-user-name/scikits.image``. -#. Click on the *Branch list* button: - - .. image:: branch_list.png - -#. Click on the *Compare* button for your feature branch - here ``my-new-feature``: - - .. image:: branch_list_compare.png - -#. If asked, select the *base* and *comparison* branch names you want to - compare. Usually these will be ``master`` and ``my-new-feature`` - (where that is your feature branch name). -#. At this point you should get a nice summary of the changes. Copy the - URL for this, and post it to the `scikits.image mailing list`_, asking for - review. The URL will look something like: - ``http://github.com/your-user-name/scikits.image/compare/master...my-new-feature``. - There's an example at - http://github.com/matthew-brett/nipy/compare/master...find-install-data - See: http://github.com/blog/612-introducing-github-compare-view for - more detail. - -The generated comparison, is between your feature branch -``my-new-feature``, and the place in ``master`` from which you branched -``my-new-feature``. In other words, you can keep updating ``master`` -without interfering with the output from the comparison. More detail? -Note the three dots in the URL above (``master...my-new-feature``) and -see :ref:`dot2-dot3`. - -Asking for your changes to be merged with the main repo -======================================================= - -When you are ready to ask for the merge of your code: +When you are ready to ask for someone to review your code and consider a merge: #. Go to the URL of your forked repo, say - ``http://github.com/your-user-name/scikits.image.git``. + ``http://github.com/your-user-name/scikits.image``. +#. Use the 'Switch Branches' dropdown menu near the top left of the page to + select the branch with your changes: + + .. image:: branch_dropdown.png + #. Click on the 'Pull request' button: .. image:: pull_button.png - Enter a message; we suggest you select only ``scikits.image`` as the - recipient. The message will go to the `scikits.image mailing list`_. Please - feel free to add others from the list as you like. + Enter a title for the set of changes, and some explanation of what you've + done. Say if there is anything you'd like particular attention for - like a + complicated change or some code you are not happy with. -Merging from trunk -================== + If you don't think your request is ready to be merged, just say so in your + pull request message. This is still a good way of getting some preliminary + code review. -This updates your code from the upstream `scikits.image github`_ repo. +Some other things you might want to do +====================================== -Overview --------- - -:: - - # go to your master branch - git checkout master - # pull changes from github - git fetch upstream - # merge from upstream - git merge upstream master - -In detail ---------- - -We suggest that you do this only for your ``master`` branch, and leave -your 'feature' branches unmerged, to keep their history as clean as -possible. This makes code review easier:: - - git checkout master - -Make sure you have done :ref:`linking-to-upstream`. - -Merge the upstream code into your current development by first pulling -the upstream repo to a copy on your local machine:: - - git fetch upstream - -then merging into your current branch:: - - git merge upstream/master - -Deleting a branch on github_ -============================ +Delete a branch on github +------------------------- :: @@ -186,11 +186,11 @@ Deleting a branch on github_ http://github.com/guides/remove-a-remote-branch Several people sharing a single repository -========================================== +------------------------------------------ If you want to work on some stuff with other people, where you are all committing into the same repository, or even the same branch, then just -share it via github_. +share it via github. First fork scikits.image into your account, as from :ref:`forking`. @@ -215,8 +215,8 @@ usual:: git commit -am 'ENH - much better code' git push origin master # pushes directly into your repo -Exploring your repository -========================= +Explore your repository +----------------------- To see a graphical representation of the repository branches and commits:: @@ -227,7 +227,189 @@ To see a linear list of commits for this branch:: git log -You can also look at the `network graph visualizer`_ for your github_ +You can also look at the `network graph visualizer`_ for your github repo. -.. include:: git_links.txt +Finally the :ref:`fancy-log` ``lg`` alias will give you a reasonable text-based +graph of the repository. + +.. _rebase-on-trunk: + +Rebasing on trunk +----------------- + +Let's say you thought of some work you'd like to do. You +:ref:`update-mirror-trunk` and :ref:`make-feature-branch` called +``cool-feature``. At this stage trunk is at some commit, let's call it E. Now +you make some new commits on your ``cool-feature`` branch, let's call them A, B, +C. Maybe your changes take a while, or you come back to them after a while. In +the meantime, trunk has progressed from commit E to commit (say) G:: + + A---B---C cool-feature + / + D---E---F---G trunk + +At this stage you consider merging trunk into your feature branch, and you +remember that this here page sternly advises you not to do that, because the +history will get messy. Most of the time you can just ask for a review, and not +worry that trunk has got a little ahead. But sometimes, the changes in trunk +might affect your changes, and you need to harmonize them. In this situation +you may prefer to do a rebase. + +rebase takes your changes (A, B, C) and replays them as if they had been made to +the current state of ``trunk``. In other words, in this case, it takes the +changes represented by A, B, C and replays them on top of G. After the rebase, +your history will look like this:: + + A'--B'--C' cool-feature + / + D---E---F---G trunk + +See `rebase without tears`_ for more detail. + +To do a rebase on trunk:: + + # Update the mirror of trunk + git fetch upstream + # go to the feature branch + git checkout cool-feature + # make a backup in case you mess up + git branch tmp cool-feature + # rebase cool-feature onto trunk + git rebase --onto upstream/master upstream/master cool-feature + +In this situation, where you are already on branch ``cool-feature``, the last +command can be written more succinctly as:: + + git rebase upstream/master + +When all looks good you can delete your backup branch:: + + git branch -D tmp + +If it doesn't look good you may need to have a look at +:ref:`recovering-from-mess-up`. + +If you have made changes to files that have also changed in trunk, this may +generate merge conflicts that you need to resolve - see the `git rebase`_ man +page for some instructions at the end of the "Description" section. There is +some related help on merging in the git user manual - see `resolving a merge`_. + +.. _recovering-from-mess-up: + +Recovering from mess-ups +------------------------ + +Sometimes, you mess up merges or rebases. Luckily, in git it is +relatively straightforward to recover from such mistakes. + +If you mess up during a rebase:: + + git rebase --abort + +If you notice you messed up after the rebase:: + + # reset branch back to the saved point + git reset --hard tmp + +If you forgot to make a backup branch:: + + # look at the reflog of the branch + git reflog show cool-feature + + 8630830 cool-feature@{0}: commit: BUG: io: close file handles immediately + 278dd2a cool-feature@{1}: rebase finished: refs/heads/my-feature-branch onto 11ee694744f2552d + 26aa21a cool-feature@{2}: commit: BUG: lib: make seek_gzip_factory not leak gzip obj + ... + + # reset the branch to where it was before the botched rebase + git reset --hard cool-feature@{2} + +.. _rewriting-commit-history: + +Rewriting commit history +------------------------ + +.. note:: + + Do this only for your own feature branches. + +There's an embarassing typo in a commit you made? Or perhaps the you +made several false starts you would like the posterity not to see. + +This can be done via *interactive rebasing*. + +Suppose that the commit history looks like this:: + + git log --oneline + eadc391 Fix some remaining bugs + a815645 Modify it so that it works + 2dec1ac Fix a few bugs + disable + 13d7934 First implementation + 6ad92e5 * masked is now an instance of a new object, MaskedConstant + 29001ed Add pre-nep for a copule of structured_array_extensions. + ... + +and ``6ad92e5`` is the last commit in the ``cool-feature`` branch. Suppose we +want to make the following changes: + +* Rewrite the commit message for ``13d7934`` to something more sensible. +* Combine the commits ``2dec1ac``, ``a815645``, ``eadc391`` into a single one. + +We do as follows:: + + # make a backup of the current state + git branch tmp HEAD + # interactive rebase + git rebase -i 6ad92e5 + +This will open an editor with the following text in it:: + + pick 13d7934 First implementation + pick 2dec1ac Fix a few bugs + disable + pick a815645 Modify it so that it works + pick eadc391 Fix some remaining bugs + + # Rebase 6ad92e5..eadc391 onto 6ad92e5 + # + # Commands: + # p, pick = use commit + # r, reword = use commit, but edit the commit message + # e, edit = use commit, but stop for amending + # s, squash = use commit, but meld into previous commit + # f, fixup = like "squash", but discard this commit's log message + # + # If you remove a line here THAT COMMIT WILL BE LOST. + # However, if you remove everything, the rebase will be aborted. + # + +To achieve what we want, we will make the following changes to it:: + + r 13d7934 First implementation + pick 2dec1ac Fix a few bugs + disable + f a815645 Modify it so that it works + f eadc391 Fix some remaining bugs + +This means that (i) we want to edit the commit message for +``13d7934``, and (ii) collapse the last three commits into one. Now we +save and quit the editor. + +Git will then immediately bring up an editor for editing the commit +message. After revising it, we get the output:: + + [detached HEAD 721fc64] FOO: First implementation + 2 files changed, 199 insertions(+), 66 deletions(-) + [detached HEAD 0f22701] Fix a few bugs + disable + 1 files changed, 79 insertions(+), 61 deletions(-) + Successfully rebased and updated refs/heads/my-feature-branch. + +and the history looks now like this:: + + 0f22701 Fix a few bugs + disable + 721fc64 ENH: Sophisticated feature + 6ad92e5 * masked is now an instance of a new object, MaskedConstant + +If it went wrong, recovery is again possible as explained :ref:`above +`. + +.. include:: links.inc diff --git a/doc/source/gitwash/dot2_dot3.txt b/doc/source/gitwash/dot2_dot3.txt deleted file mode 100644 index 7759e2e6..00000000 --- a/doc/source/gitwash/dot2_dot3.txt +++ /dev/null @@ -1,28 +0,0 @@ -.. _dot2-dot3: - -======================================== - Two and three dots in difference specs -======================================== - -Thanks to Yarik Halchenko for this explanation. - -Imagine a series of commits A, B, C, D... Imagine that there are two -branches, *topic* and *master*. You branched *topic* off *master* when -*master* was at commit 'E'. The graph of the commits looks like this:: - - - A---B---C topic - / - D---E---F---G master - -Then:: - - git diff master..topic - -will output the difference from G to C (i.e. with effects of F and G), -while:: - - git diff master...topic - -would output just differences in the topic branch (i.e. only A, B, and -C). diff --git a/doc/source/gitwash/following_latest.txt b/doc/source/gitwash/following_latest.txt index 6a7b3e11..bdf07f4a 100644 --- a/doc/source/gitwash/following_latest.txt +++ b/doc/source/gitwash/following_latest.txt @@ -10,7 +10,7 @@ These are the instructions if you just want to follow the latest The steps are: * :ref:`install-git` -* get local copy of the git repository from github_ +* get local copy of the git repository from github * update local copy from time to time Get the local copy of the code @@ -33,4 +33,4 @@ From time to time you may want to pull down the latest code. Do this with:: The tree in ``scikits.image`` will now have the latest changes from the initial repository. -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/forking_hell.txt b/doc/source/gitwash/forking_hell.txt index 8ef86ffc..f6f3ff29 100644 --- a/doc/source/gitwash/forking_hell.txt +++ b/doc/source/gitwash/forking_hell.txt @@ -1,26 +1,26 @@ .. _forking: -============================================ +========================================== Making your own copy (fork) of scikits.image -============================================ +========================================== You need to do this only once. The instructions here are very similar -to the instructions at http://help.github.com/forking/ - please see that -page for more detail. We're repeating some of it here just to give the +to the instructions at http://help.github.com/forking/ |emdash| please see +that page for more detail. We're repeating some of it here just to give the specifics for the scikits.image_ project, and to suggest some default names. -Set up and configure a github_ account -====================================== +Set up and configure a github account +===================================== -If you don't have a github_ account, go to the github_ page, and make one. +If you don't have a github account, go to the github page, and make one. -You then need to configure your account to allow write access - see the -``Generating SSH keys`` help on `github help`_. +You then need to configure your account to allow write access |emdash| see +the ``Generating SSH keys`` help on `github help`_. Create your own forked copy of scikits.image_ -============================================= +=========================================== -#. Log into your github_ account. +#. Log into your github account. #. Go to the scikits.image_ github home at `scikits.image github`_. #. Click on the *fork* button: @@ -29,5 +29,5 @@ Create your own forked copy of scikits.image_ Now, after a short pause and some 'Hardcore forking action', you should find yourself at the home page for your own forked copy of scikits.image_. -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/git_development.txt b/doc/source/gitwash/git_development.txt index 64522c65..c5b910d8 100644 --- a/doc/source/gitwash/git_development.txt +++ b/doc/source/gitwash/git_development.txt @@ -13,4 +13,4 @@ Contents: set_up_fork configure_git development_workflow - + maintainer_workflow diff --git a/doc/source/gitwash/git_install.txt b/doc/source/gitwash/git_install.txt index 6c6a57c0..72a6b911 100644 --- a/doc/source/gitwash/git_install.txt +++ b/doc/source/gitwash/git_install.txt @@ -17,10 +17,10 @@ OS X Use the git-osx-installer_ In detail ========= -See the git_ page for the most recent information. +See the git page for the most recent information. -Have a look at the github_ install help pages available from `github help`_ +Have a look at the github install help pages available from `github help`_ There are good instructions here: http://book.git-scm.com/2_installing_git.html -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/git_intro.txt b/doc/source/gitwash/git_intro.txt index f3bfc6fc..47c97102 100644 --- a/doc/source/gitwash/git_intro.txt +++ b/doc/source/gitwash/git_intro.txt @@ -8,11 +8,11 @@ project. There are several different workflows here, for different ways of working with *scikits.image*. -This is not a comprehensive git_ reference, it's just a workflow for our -own project. It's tailored to the github_ hosting service. You may well -find better or quicker ways of getting stuff done with git_, but these +This is not a comprehensive git reference, it's just a workflow for our +own project. It's tailored to the github hosting service. You may well +find better or quicker ways of getting stuff done with git, but these should get you started. -For general resources for learning git_ see :ref:`git-resources`. +For general resources for learning git, see :ref:`git-resources`. -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/git_links.txt b/doc/source/gitwash/git_links.inc similarity index 77% rename from doc/source/gitwash/git_links.txt rename to doc/source/gitwash/git_links.inc index 27eb2be1..3822fd9d 100644 --- a/doc/source/gitwash/git_links.txt +++ b/doc/source/gitwash/git_links.inc @@ -2,35 +2,12 @@ and name substitutions. It may be included in many files, therefore it should only contain link targets and name substitutions. Try grepping for "^\.\. _" to find plausible - candidates for this list. + candidates for this list. .. NOTE: reST targets are __not_case_sensitive__, so only one target definition is needed for nipy, NIPY, Nipy, etc... -.. scikits.image - -.. _`scikits.image`: http://stefanv.github.com/scikits.image - -.. _`scikits.image github`: http://github.com/stefanv/scikits.image - -.. _`scikits.image mailing list`: http://groups.google.com/group/scikits-image - -.. PROJECTNAME placeholders -.. _PROJECTNAME: http://neuroimaging.scipy.org -.. _`PROJECTNAME github`: http://github.com/nipy -.. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel - -.. nipy -.. _nipy: http://neuroimaging.scipy.org -.. _`nipy github`: http://github.com/nipy -.. _`nipy mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel - -.. ipython -.. _ipython: http://ipython.scipy.org -.. _`ipython github`: http://github.com/ipython -.. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev - .. git stuff .. _git: http://git-scm.com/ .. _github: http://github.com @@ -62,9 +39,23 @@ .. _git log: http://www.kernel.org/pub/software/scm/git/docs/git-log.html .. _git branch: http://www.kernel.org/pub/software/scm/git/docs/git-branch.html .. _git remote: http://www.kernel.org/pub/software/scm/git/docs/git-remote.html +.. _git rebase: http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html .. _git config: http://www.kernel.org/pub/software/scm/git/docs/git-config.html .. _why the -a flag?: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html .. _git staging area: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html +.. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git .. _git management: http://kerneltrap.org/Linux/Git_Management .. _linux git workflow: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html .. _git parable: http://tom.preston-werner.com/2009/05/19/the-git-parable.html +.. _git foundation: http://matthew-brett.github.com/pydagogue/foundation.html +.. _deleting master on github: http://matthew-brett.github.com/pydagogue/gh_delete_master.html +.. _rebase without tears: http://matthew-brett.github.com/pydagogue/rebase_without_tears.html +.. _resolving a merge: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving-a-merge +.. _ipython git workflow: http://mail.scipy.org/pipermail/ipython-dev/2010-October/006746.html + +.. other stuff +.. _python: http://www.python.org + +.. |emdash| unicode:: U+02014 + +.. vim: ft=rst diff --git a/doc/source/gitwash/git_resources.txt b/doc/source/gitwash/git_resources.txt index 69e344ec..ba7b275e 100644 --- a/doc/source/gitwash/git_resources.txt +++ b/doc/source/gitwash/git_resources.txt @@ -1,8 +1,8 @@ .. _git-resources: -================ - git_ resources -================ +============= +git resources +============= Tutorials and summaries ======================= @@ -14,18 +14,20 @@ Tutorials and summaries * The `git user manual`_ * The `git tutorial`_ * The `git community book`_ -* `git ready`_ - a nice series of tutorials -* `git casts`_ - video snippets giving git how-tos. -* `git magic`_ - extended introduction with intermediate detail -* Fernando Perez' git page - `Fernando's git page`_ - many links and tips +* `git ready`_ |emdash| a nice series of tutorials +* `git casts`_ |emdash| video snippets giving git how-tos. +* `git magic`_ |emdash| extended introduction with intermediate detail +* The `git parable`_ is an easy read explaining the concepts behind git. +* `git foundation`_ expands on the `git parable`_. +* Fernando Perez' git page |emdash| `Fernando's git page`_ |emdash| many + links and tips * A good but technical page on `git concepts`_ -* Th `git parable`_ is an easy read explaining the concepts behind git. -* `git svn crash course`_: git_ for those of us used to subversion_ +* `git svn crash course`_: git for those of us used to subversion_ Advanced git workflow ===================== -There are many ways of working with git_; here are some posts on the +There are many ways of working with git; here are some posts on the rules of thumb that other projects have come up with: * Linus Torvalds on `git management`_ @@ -54,4 +56,4 @@ online manual pages for some common commands: * `git remote`_ * `git status`_ -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/index.txt b/doc/source/gitwash/index.txt index 0acb8fb9..c67e629f 100644 --- a/doc/source/gitwash/index.txt +++ b/doc/source/gitwash/index.txt @@ -1,7 +1,7 @@ .. _using-git: Working with *scikits.image* source code -======================================== +====================================== Contents: diff --git a/doc/source/gitwash/known_projects.inc b/doc/source/gitwash/known_projects.inc new file mode 100644 index 00000000..29723528 --- /dev/null +++ b/doc/source/gitwash/known_projects.inc @@ -0,0 +1,41 @@ +.. Known projects + +.. PROJECTNAME placeholders +.. _PROJECTNAME: http://neuroimaging.scipy.org +.. _`PROJECTNAME github`: http://github.com/nipy +.. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel + +.. numpy +.. _numpy: hhttp://numpy.scipy.org +.. _`numpy github`: http://github.com/numpy/numpy +.. _`numpy mailing list`: http://mail.scipy.org/mailman/listinfo/numpy-discussion + +.. scipy +.. _scipy: http://www.scipy.org +.. _`scipy github`: http://github.com/scipy/scipy +.. _`scipy mailing list`: http://mail.scipy.org/mailman/listinfo/scipy-dev + +.. nipy +.. _nipy: http://nipy.org/nipy +.. _`nipy github`: http://github.com/nipy/nipy +.. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel + +.. ipython +.. _ipython: http://ipython.scipy.org +.. _`ipython github`: http://github.com/ipython/ipython +.. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev + +.. dipy +.. _dipy: http://nipy.org/dipy +.. _`dipy github`: http://github.com/Garyfallidis/dipy +.. _`dipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel + +.. nibabel +.. _nibabel: http://nipy.org/nibabel +.. _`nibabel github`: http://github.com/nipy/nibabel +.. _`nibabel mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel + +.. marsbar +.. _marsbar: http://marsbar.sourceforge.net +.. _`marsbar github`: http://github.com/matthew-brett/marsbar +.. _`MarsBaR mailing list`: https://lists.sourceforge.net/lists/listinfo/marsbar-users diff --git a/doc/source/gitwash/links.inc b/doc/source/gitwash/links.inc new file mode 100644 index 00000000..20f4dcff --- /dev/null +++ b/doc/source/gitwash/links.inc @@ -0,0 +1,4 @@ +.. compiling links file +.. include:: known_projects.inc +.. include:: this_project.inc +.. include:: git_links.inc diff --git a/doc/source/gitwash/maintainer_workflow.txt b/doc/source/gitwash/maintainer_workflow.txt new file mode 100644 index 00000000..64a12d99 --- /dev/null +++ b/doc/source/gitwash/maintainer_workflow.txt @@ -0,0 +1,96 @@ +.. _maintainer-workflow: + +################### +Maintainer workflow +################### + +This page is for maintainers |emdash| those of us who merge our own or other +peoples' changes into the upstream repository. + +Being as how you're a maintainer, you are completely on top of the basic stuff +in :ref:`development-workflow`. + +The instructions in :ref:`linking-to-upstream` add a remote that has read-only +access to the upstream repo. Being a maintainer, you've got read-write access. + +It's good to have your upstream remote have a scary name, to remind you that +it's a read-write remote:: + + git remote add upstream-rw git@github.com:scikits.image/scikits.image.git + git fetch upstream-rw + +******************* +Integrating changes +******************* + +Let's say you have some changes that need to go into trunk +(``upstream-rw/master``). + +The changes are in some branch that you are currently on. For example, you are +looking at someone's changes like this:: + + git remote add someone git://github.com/someone/scikits.image.git + git fetch someone + git branch cool-feature --track someone/cool-feature + git checkout cool-feature + +So now you are on the branch with the changes to be incorporated upstream. The +rest of this section assumes you are on this branch. + +A few commits +============= + +If there are only a few commits, consider rebasing to upstream:: + + # Fetch upstream changes + git fetch upstream-rw + # rebase + git rebase upstream-rw/master + +Remember that, if you do a rebase, and push that, you'll have to close any +github pull requests manually, because github will not be able to detect the +changes have already been merged. + +A long series of commits +======================== + +If there are a longer series of related commits, consider a merge instead:: + + git fetch upstream-rw + git merge --no-ff upstream-rw/master + +The merge will be detected by github, and should close any related pull requests +automatically. + +Note the ``--no-ff`` above. This forces git to make a merge commit, rather than +doing a fast-forward, so that these set of commits branch off trunk then rejoin +the main history with a merge, rather than appearing to have been made directly +on top of trunk. + +Check the history +================= + +Now, in either case, you should check that the history is sensible and you have +the right commits:: + + git log --oneline --graph + git log -p upstream-rw/master.. + +The first line above just shows the history in a compact way, with a text +representation of the history graph. The second line shows the log of commits +excluding those that can be reached from trunk (``upstream-rw/master``), and +including those that can be reached from current HEAD (implied with the ``..`` +at the end). So, it shows the commits unique to this branch compared to trunk. +The ``-p`` option shows the diff for these commits in patch form. + +Push to trunk +============= + +:: + + git push upstream-rw my-new-feature:master + +This pushes the ``my-new-feature`` branch in this repository to the ``master`` +branch in the ``upstream-rw`` repository. + +.. include:: links.inc diff --git a/doc/source/gitwash/patching.txt b/doc/source/gitwash/patching.txt index bdc64b5f..110666aa 100644 --- a/doc/source/gitwash/patching.txt +++ b/doc/source/gitwash/patching.txt @@ -2,16 +2,18 @@ Making a patch ================ -You've discovered a bug or something else you want to change in scikits.image_ - excellent! +You've discovered a bug or something else you want to change +in scikits.image_ .. |emdash| excellent! -You've worked out a way to fix it - even better! +You've worked out a way to fix it |emdash| even better! -You want to tell us about it - best of all! +You want to tell us about it |emdash| best of all! -The easiest way is to make a *patch* or set of patches. Here we explain -how. Making a patch is the simplest and quickest, but if you're going -to be doing anything more than simple quick things, please consider -following the :ref:`git-development` model instead. +The easiest way is to make a *patch* or set of patches. Here +we explain how. Making a patch is the simplest and quickest, +but if you're going to be doing anything more than simple +quick things, please consider following the +:ref:`git-development` model instead. .. _making-patches: @@ -42,24 +44,28 @@ Overview # make the patch files git format-patch -M -C master -Then, send the generated patch files to the `scikits.image mailing list`_ - where we will thank you warmly. +Then, send the generated patch files to the `scikits.image +mailing list`_ |emdash| where we will thank you warmly. In detail --------- -#. Tell git_ who you are so it can label the commits you've made:: +#. Tell git who you are so it can label the commits you've + made:: git config --global user.email you@yourdomain.example.com git config --global user.name "Your Name Comes Here" -#. If you don't already have one, clone a copy of the scikits.image_ repository:: +#. If you don't already have one, clone a copy of the + scikits.image_ repository:: git clone git://github.com/scikits.image/scikits.image.git cd scikits.image -#. Make a 'feature branch'. This will be where you work on your bug - fix. It's nice and safe and leaves you with access to an unmodified - copy of the code in the main branch:: +#. Make a 'feature branch'. This will be where you work on + your bug fix. It's nice and safe and leaves you with + access to an unmodified copy of the code in the main + branch:: git branch the-fix-im-thinking-of git checkout the-fix-im-thinking-of @@ -74,16 +80,18 @@ In detail # hack hack, hack git commit -am 'BF - added fix for Funny bug' - Note the ``-am`` options to ``commit``. The ``m`` flag just signals - that you're going to type a message on the command line. The ``a`` - flag - you can just take on faith - or see `why the -a flag?`_. + Note the ``-am`` options to ``commit``. The ``m`` flag just + signals that you're going to type a message on the command + line. The ``a`` flag |emdash| you can just take on faith |emdash| + or see `why the -a flag?`_. -#. When you have finished, check you have committed all your changes:: +#. When you have finished, check you have committed all your + changes:: git status -#. Finally, make your commits into patches. You want all the commits - since you branched from the ``master`` branch:: +#. Finally, make your commits into patches. You want all the + commits since you branched from the ``master`` branch:: git format-patch -M -C master @@ -94,19 +102,21 @@ In detail Send these files to the `scikits.image mailing list`_. -When you are done, to switch back to the main copy of the code, just -return to the ``master`` branch:: +When you are done, to switch back to the main copy of the +code, just return to the ``master`` branch:: git checkout master Moving from patching to development =================================== -If you find you have done some patches, and you have one or more feature -branches, you will probably want to switch to development mode. You can -do this with the repository you have. +If you find you have done some patches, and you have one or +more feature branches, you will probably want to switch to +development mode. You can do this with the repository you +have. -Fork the scikits.image_ repository on github_ - :ref:`forking`. Then:: +Fork the scikits.image_ repository on github |emdash| :ref:`forking`. +Then:: # checkout and refresh master branch from main repo git checkout master @@ -118,6 +128,7 @@ Fork the scikits.image_ repository on github_ - :ref:`forking`. Then:: # push up any branches you've made and want to keep git push origin the-fix-im-thinking-of -Then you can, if you want, follow the :ref:`development-workflow`. +Then you can, if you want, follow the +:ref:`development-workflow`. -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/set_up_fork.txt b/doc/source/gitwash/set_up_fork.txt index 395fa130..fe4a7684 100644 --- a/doc/source/gitwash/set_up_fork.txt +++ b/doc/source/gitwash/set_up_fork.txt @@ -4,14 +4,14 @@ Set up your fork ================== -First you follow the instructions for :ref:`forking`. +First you follow the instructions for :ref:`forking`. Overview ======== :: - git clone git@github.com/your-user-name/scikits.image.git + git clone git@github.com:your-user-name/scikits.image.git cd scikits.image git remote add upstream git://github.com/scikits.image/scikits.image.git @@ -33,7 +33,7 @@ Clone your fork This tells you that you are currently on the ``master`` branch, and that you also have a ``remote`` connection to ``origin/master``. What remote repository is ``remote/origin``? Try ``git remote -v`` to - see the URLs for the remote. They will point to your github_ fork. + see the URLs for the remote. They will point to your github fork. Now you want to connect to the upstream `scikits.image github`_ repository, so you can merge in changes from trunk. @@ -64,5 +64,5 @@ Just for your own satisfaction, show yourself that you now have a new origin git@github.com:your-user-name/scikits.image.git (fetch) origin git@github.com:your-user-name/scikits.image.git (push) -.. include:: git_links.txt +.. include:: links.inc diff --git a/doc/source/gitwash/this_project.inc b/doc/source/gitwash/this_project.inc new file mode 100644 index 00000000..f7c01aa2 --- /dev/null +++ b/doc/source/gitwash/this_project.inc @@ -0,0 +1,5 @@ +.. scikits.image +.. _scikits.image: http://scikits-image.org +.. _`scikits.image github`: http://github.com/scikits.image/scikits.image + +.. _`scikits.image mailing list`: http://groups.google.com/group/scikits-image