[yt-svn] commit/yt: 10 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Sep 30 12:16:14 PDT 2014
10 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/a604c0a2ac82/
Changeset: a604c0a2ac82
Branch: yt
User: ChrisMalone
Date: 2014-09-29 18:55:04+00:00
Summary: update to show we need bootstrap theme
Affected #: 1 file
diff -r 90dad9d0c93ba29a7ce3ed072c09a391d758fdf1 -r a604c0a2ac821c979d5b2e9569c1a4b5da7f9e39 doc/source/developing/building_the_docs.rst
--- a/doc/source/developing/building_the_docs.rst
+++ b/doc/source/developing/building_the_docs.rst
@@ -105,7 +105,10 @@
You will need to have the yt repository available on your computer, which
is done by default if you have yt installed. In addition, you need a
-current version of Sphinx_ (1.1.3) documentation software installed.
+current version of Sphinx_ (1.1.3) documentation software installed, as
+well as the Sphinx
+`Bootstrap theme <https://pypi.python.org/pypi/sphinx-bootstrap-theme/>`_,
+which can be installed via ``pip install sphinx_bootstrap_theme``.
In order to tell sphinx not to do all of the dynamical building, you must
set the ``$READTHEDOCS`` environment variable to be True by typing this at
https://bitbucket.org/yt_analysis/yt/commits/1f91f19abb53/
Changeset: 1f91f19abb53
Branch: yt
User: ChrisMalone
Date: 2014-09-29 19:51:58+00:00
Summary: add note about multiple PRs
Affected #: 1 file
diff -r a604c0a2ac821c979d5b2e9569c1a4b5da7f9e39 -r 1f91f19abb53c6d64dfc75a9b7c646f5fd45bcfd doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -173,7 +173,7 @@
If you plan to develop yt on Windows, it is necessary to use the `MinGW
<http://www.mingw.org/>`_ gcc compiler that can be installed using the `Anaconda
Python Distribution <https://store.continuum.io/cshop/anaconda/>`_. The libpython package must be
- installed from Anaconda as well. These can both be installed with a single command:
+installed from Anaconda as well. These can both be installed with a single command:
.. code-block:: bash
@@ -246,6 +246,75 @@
#. Your pull request will be automatically updated.
+.. _multiple-PRs:
+
+Working with Multiple BitBucket Pull Requests
++++++++++++++++++++++++++++++++++++++++++++++
+
+Once you become active developing for yt, you may be working on various aspects
+of the code or bugfixes at the same time. Currently, BitBucket's *modus operandi*
+for pull requests automatically updates your active pull request with every
+``hg push`` to your fork. This means that if you have an active pull request,
+make some changes locally for, say, an unrelated bugfix, then push
+those changes back to your fork in the hopes of creating a *new* pull request,
+you'll actually end up updating your current pull request!
+
+There are a few ways around this feature of BitBucket that will allow for
+multiple pull requests to coexist; we outline two such methods below, although
+they are similar in spirit. We assume that you have a fork of yt at
+``http://bitbucket.org/YourUsername/Your_yt`` (see :ref:`sharing-changes` for
+instructions on creating a fork) and that you have an active pull request to the
+main repository.
+
+The main issue with starting another pull request is to make sure that your
+push back to BitBucket doesn't go to the same head as your existing pull request
+and trigger BitBucket's auto-update feature. Here's how to get your local repository
+away from your current pull request head:
+
+#. Using yt tip on the BitBucket Website
+
+ #. Take a look at https://bitbucket.org/yt_analysis/yt/commits/branch/yt and
+ find the commit hash of the current tip of the yt branch, for example
+ f633cb9.
+ #. Update your local copy to that commit:
+
+ .. code-block:: bash
+
+ $ hg pull https://bitbucket.org/yt_analysis/yt
+ $ hg update f633cb9
+
+#. Using `revsets <http://www.selenic.com/hg/help/revsets>`_ and Your ``hgrc`` File
+
+ #. Set up a Mercurial path for the main yt repository (note this is a convenience
+ step and only needs to be done once). Add the following to your
+ ``Your_yt/.hg/hgrc``::
+
+ [paths]
+ upstream = https://bitbucket.org/yt_analysis/yt
+
+ This will create a path called ``upstream`` that is aliased to the URL of the
+ main yt repository.
+ #. Now we'll use revsets_ to update your local repository to the tip of the
+ ``upstream`` path:
+
+ .. code-block:: bash
+
+ $ hg pull
+ $ hg update -r "remote(tip,'upstream')"
+
+After the above steps, your local repository should be at the tip of the main yt
+repository. You can then make changes and ``hg commit`` them. To push back to
+your fork on BitBucket you issue the following:
+
+.. code-block:: bash
+
+ $ hg push -r . -f https://bitbucket.org/YourUsername/Your_yt
+
+The ``-r .`` means "push only the commit I'm standing on and any ancestors." The
+``-f`` is to force Mecurial to do the push since we are creating a new remote head.
+You can then go to the BitBucket interface and issue a new pull request based on
+your last changes, as usual.
+
How To Get The Source Code For Editing
--------------------------------------
https://bitbucket.org/yt_analysis/yt/commits/375f785fdc53/
Changeset: 375f785fdc53
Branch: yt
User: ChrisMalone
Date: 2014-09-29 21:13:30+00:00
Summary: address some of Nathan's comments
Affected #: 1 file
diff -r 1f91f19abb53c6d64dfc75a9b7c646f5fd45bcfd -r 375f785fdc535d0298088a036fbea2306d3aebe9 doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -251,60 +251,59 @@
Working with Multiple BitBucket Pull Requests
+++++++++++++++++++++++++++++++++++++++++++++
-Once you become active developing for yt, you may be working on various aspects
-of the code or bugfixes at the same time. Currently, BitBucket's *modus operandi*
-for pull requests automatically updates your active pull request with every
-``hg push`` to your fork. This means that if you have an active pull request,
-make some changes locally for, say, an unrelated bugfix, then push
-those changes back to your fork in the hopes of creating a *new* pull request,
-you'll actually end up updating your current pull request!
+Once you become active developing for yt, you may be working on
+various aspects of the code or bugfixes at the same time. Currently,
+BitBucket's *modus operandi* for pull requests automatically updates
+your active pull request with every ``hg push`` of commits that are a
+descendant of the head of your pull request. In a normal workflow,
+this means that if you have an active pull request, make some changes
+locally for, say, an unrelated bugfix, then push those changes back to
+your fork in the hopes of creating a *new* pull request, you'll
+actually end up updating your current pull request!
-There are a few ways around this feature of BitBucket that will allow for
-multiple pull requests to coexist; we outline two such methods below, although
-they are similar in spirit. We assume that you have a fork of yt at
-``http://bitbucket.org/YourUsername/Your_yt`` (see :ref:`sharing-changes` for
-instructions on creating a fork) and that you have an active pull request to the
-main repository.
+There are a few ways around this feature of BitBucket that will allow
+for multiple pull requests to coexist; we outline one such method
+below. We assume that you have a fork of yt at
+``http://bitbucket.org/YourUsername/Your_yt`` (see
+:ref:`sharing-changes` for instructions on creating a fork) and that
+you have an active pull request to the main repository.
-The main issue with starting another pull request is to make sure that your
-push back to BitBucket doesn't go to the same head as your existing pull request
-and trigger BitBucket's auto-update feature. Here's how to get your local repository
-away from your current pull request head:
+The main issue with starting another pull request is to make sure that
+your push to BitBucket doesn't go to the same head as your
+existing pull request and trigger BitBucket's auto-update feature.
+Here's how to get your local repository away from your current pull
+request head using `revsets <http://www.selenic.com/hg/help/revsets>`_
+and your ``hgrc`` file:
+
+#. Set up a Mercurial path for the main yt repository (note this is a convenience
+ step and only needs to be done once). Add the following to your
+ ``Your_yt/.hg/hgrc``::
-#. Using yt tip on the BitBucket Website
-
- #. Take a look at https://bitbucket.org/yt_analysis/yt/commits/branch/yt and
- find the commit hash of the current tip of the yt branch, for example
- f633cb9.
- #. Update your local copy to that commit:
+ [paths]
+ upstream = https://bitbucket.org/yt_analysis/yt
- .. code-block:: bash
-
- $ hg pull https://bitbucket.org/yt_analysis/yt
- $ hg update f633cb9
+ This will create a path called ``upstream`` that is aliased to the URL of the
+ main yt repository.
+#. Now we'll use revsets_ to update your local repository to the tip of the
+ ``upstream`` path:
-#. Using `revsets <http://www.selenic.com/hg/help/revsets>`_ and Your ``hgrc`` File
-
- #. Set up a Mercurial path for the main yt repository (note this is a convenience
- step and only needs to be done once). Add the following to your
- ``Your_yt/.hg/hgrc``::
+ .. code-block:: bash
- [paths]
- upstream = https://bitbucket.org/yt_analysis/yt
+ $ hg pull
+ $ hg update -r "remote(tip,'upstream')"
- This will create a path called ``upstream`` that is aliased to the URL of the
- main yt repository.
- #. Now we'll use revsets_ to update your local repository to the tip of the
- ``upstream`` path:
+After the above steps, your local repository should be at the tip of
+the main yt repository. If you find yourself doing this a lot, it may
+be worth `aliasing`_ this task in your ``hgrc`` file by adding something like::
- .. code-block:: bash
+ [alias]
+ myupdate = update -r "remote(tip,'upstream')
- $ hg pull
- $ hg update -r "remote(tip,'upstream')"
+And then you can just issue ``hg myupdate`` to get at the tip of the yt
+branch of the main yt repository.
-After the above steps, your local repository should be at the tip of the main yt
-repository. You can then make changes and ``hg commit`` them. To push back to
-your fork on BitBucket you issue the following:
+You can then make changes and ``hg commit`` them. To push to your
+fork on BitBucket you issue the following:
.. code-block:: bash
@@ -315,6 +314,8 @@
You can then go to the BitBucket interface and issue a new pull request based on
your last changes, as usual.
+.. _aliasing: http://mercurial.selenic.com/wiki/AliasExtension
+
How To Get The Source Code For Editing
--------------------------------------
https://bitbucket.org/yt_analysis/yt/commits/4fe936fef667/
Changeset: 4fe936fef667
Branch: yt
User: ChrisMalone
Date: 2014-09-29 21:55:25+00:00
Summary: bookmarks update
Affected #: 1 file
diff -r 375f785fdc535d0298088a036fbea2306d3aebe9 -r 4fe936fef6676c6832b2009612cf6ba61505b425 doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -302,8 +302,12 @@
And then you can just issue ``hg myupdate`` to get at the tip of the yt
branch of the main yt repository.
-You can then make changes and ``hg commit`` them. To push to your
-fork on BitBucket you issue the following:
+You can then make changes and ``hg commit`` them. If you prefer
+working with `bookmarks <http://mercurial.selenic.com/wiki/Bookmarks>`_, you may
+want to make a bookmark before committing your changes, such as
+``hg bookmark mybookmark``.
+
+To push to your fork on BitBucket if you didn't use a bookmark, you issue the following:
.. code-block:: bash
@@ -311,6 +315,15 @@
The ``-r .`` means "push only the commit I'm standing on and any ancestors." The
``-f`` is to force Mecurial to do the push since we are creating a new remote head.
+
+Note that if you *did* use bookmarks, you don't have to force the push, but you do
+need to push the bookmark; in otherwords do the following instead of the above:
+
+.. code-block:: bash
+ $ hg push -B mybookmark https://bitbucket.org/YourUsername/Your_yt
+
+The ``-B`` means "publish my bookmark and any relevant changesets to the remote server."
+
You can then go to the BitBucket interface and issue a new pull request based on
your last changes, as usual.
https://bitbucket.org/yt_analysis/yt/commits/85d7a9c48846/
Changeset: 85d7a9c48846
Branch: yt
User: ChrisMalone
Date: 2014-09-29 21:59:49+00:00
Summary: remove aliasing link
Affected #: 1 file
diff -r 4fe936fef6676c6832b2009612cf6ba61505b425 -r 85d7a9c48846ca10882a344ae004286fbae4f88c doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -294,7 +294,7 @@
After the above steps, your local repository should be at the tip of
the main yt repository. If you find yourself doing this a lot, it may
-be worth `aliasing`_ this task in your ``hgrc`` file by adding something like::
+be worth aliasing this task in your ``hgrc`` file by adding something like::
[alias]
myupdate = update -r "remote(tip,'upstream')
@@ -327,8 +327,6 @@
You can then go to the BitBucket interface and issue a new pull request based on
your last changes, as usual.
-.. _aliasing: http://mercurial.selenic.com/wiki/AliasExtension
-
How To Get The Source Code For Editing
--------------------------------------
https://bitbucket.org/yt_analysis/yt/commits/5d06656ee558/
Changeset: 5d06656ee558
Branch: yt
User: ChrisMalone
Date: 2014-09-29 22:29:23+00:00
Summary: typo
Affected #: 1 file
diff -r 85d7a9c48846ca10882a344ae004286fbae4f88c -r 5d06656ee558710cade4b62562927314f560b58d doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -297,7 +297,7 @@
be worth aliasing this task in your ``hgrc`` file by adding something like::
[alias]
- myupdate = update -r "remote(tip,'upstream')
+ myupdate = update -r "remote(tip,'upstream')"
And then you can just issue ``hg myupdate`` to get at the tip of the yt
branch of the main yt repository.
https://bitbucket.org/yt_analysis/yt/commits/9a71c2cd57ac/
Changeset: 9a71c2cd57ac
Branch: yt
User: ChrisMalone
Date: 2014-09-29 22:33:15+00:00
Summary: fix bad formatting of code-block
Affected #: 1 file
diff -r 5d06656ee558710cade4b62562927314f560b58d -r 9a71c2cd57acf4dd02b8f47d37170976a81935d0 doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -316,10 +316,11 @@
The ``-r .`` means "push only the commit I'm standing on and any ancestors." The
``-f`` is to force Mecurial to do the push since we are creating a new remote head.
-Note that if you *did* use bookmarks, you don't have to force the push, but you do
+Note that if you *did* use a bookmark, you don't have to force the push, but you do
need to push the bookmark; in otherwords do the following instead of the above:
.. code-block:: bash
+
$ hg push -B mybookmark https://bitbucket.org/YourUsername/Your_yt
The ``-B`` means "publish my bookmark and any relevant changesets to the remote server."
https://bitbucket.org/yt_analysis/yt/commits/d9ca0ad64da1/
Changeset: d9ca0ad64da1
Branch: yt
User: ChrisMalone
Date: 2014-09-30 14:28:56+00:00
Summary: note about SSH
Affected #: 1 file
diff -r 9a71c2cd57acf4dd02b8f47d37170976a81935d0 -r d9ca0ad64da1f627d4e64b4a80b1f14c1741e1f5 doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -229,6 +229,18 @@
If you end up doing considerable development, you can set an alias in the
file ``.hg/hgrc`` to point to this path.
+
+ Note that the above approach uses HTTPS as the transfer protocol
+ between your machine and BitBucket. If you prefer to use SSH - or
+ perhaps you're behind a proxy that doesn't play well with SSL via
+ HTTPS - you may want to set up an `SSH key`_ on BitBucket. Then, you use
+ the syntax ``ssh://hg@bitbucket.org/YourUsername/yt``, or equivalent, in
+ place of ``https://bitbucket.org/YourUsername/yt`` in Mercurial commands.
+ For consistency, all commands we list in this document will use the HTTPS
+ protocol.
+
+.. _SSH key: https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Mercurial
+
#. Issue a pull request at
https://bitbucket.org/YourUsername/yt/pull-request/new
https://bitbucket.org/yt_analysis/yt/commits/5cc9769d57cf/
Changeset: 5cc9769d57cf
Branch: yt
User: ChrisMalone
Date: 2014-09-30 14:33:36+00:00
Summary: make it an *actual* note
Affected #: 1 file
diff -r d9ca0ad64da1f627d4e64b4a80b1f14c1741e1f5 -r 5cc9769d57cf91390d76b038a69a2f66ef8dd960 doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -230,16 +230,17 @@
If you end up doing considerable development, you can set an alias in the
file ``.hg/hgrc`` to point to this path.
- Note that the above approach uses HTTPS as the transfer protocol
- between your machine and BitBucket. If you prefer to use SSH - or
- perhaps you're behind a proxy that doesn't play well with SSL via
- HTTPS - you may want to set up an `SSH key`_ on BitBucket. Then, you use
- the syntax ``ssh://hg@bitbucket.org/YourUsername/yt``, or equivalent, in
- place of ``https://bitbucket.org/YourUsername/yt`` in Mercurial commands.
- For consistency, all commands we list in this document will use the HTTPS
- protocol.
+ .. note::
+ Note that the above approach uses HTTPS as the transfer protocol
+ between your machine and BitBucket. If you prefer to use SSH - or
+ perhaps you're behind a proxy that doesn't play well with SSL via
+ HTTPS - you may want to set up an `SSH key`_ on BitBucket. Then, you use
+ the syntax ``ssh://hg@bitbucket.org/YourUsername/yt``, or equivalent, in
+ place of ``https://bitbucket.org/YourUsername/yt`` in Mercurial commands.
+ For consistency, all commands we list in this document will use the HTTPS
+ protocol.
-.. _SSH key: https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Mercurial
+ .. _SSH key: https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Mercurial
#. Issue a pull request at
https://bitbucket.org/YourUsername/yt/pull-request/new
https://bitbucket.org/yt_analysis/yt/commits/f0faeac19925/
Changeset: f0faeac19925
Branch: yt
User: ChrisMalone
Date: 2014-09-30 14:34:11+00:00
Summary: typo
Affected #: 1 file
diff -r 5cc9769d57cf91390d76b038a69a2f66ef8dd960 -r f0faeac1992516e8c8ddf806da5e73e7b464e5eb doc/source/developing/developing.rst
--- a/doc/source/developing/developing.rst
+++ b/doc/source/developing/developing.rst
@@ -330,7 +330,7 @@
``-f`` is to force Mecurial to do the push since we are creating a new remote head.
Note that if you *did* use a bookmark, you don't have to force the push, but you do
-need to push the bookmark; in otherwords do the following instead of the above:
+need to push the bookmark; in other words do the following instead of the above:
.. code-block:: bash
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list