Ticket #9433: trac_9433-sage-repo.2.patch

File trac_9433-sage-repo.2.patch, 1.9 KB (added by ddrake, 9 years ago)

rebased for 4.6.1.alpha0

  • doc/en/developer/producing_patches.rst 

    # HG changeset patch
# User J. H. Palmieri <palmieri@math.washington.edu>
# Date 1278636162 25200
# Node ID 73ebae9a5f86a5eb69d98607a56b1d49c64e78bc
# Parent  f5e6724a274008cd284bbcac19b98a555a3cc667
#9433: add command hg_root for new repository

diff --git a/doc/en/developer/producing_patches.rst b/doc/en/developer/producing_patches.rst
    a b  
    134134
    135135- ``SAGE_ROOT/local/bin``: Sage shell scripts.
    136136
     137- ``SAGE_ROOT``: Sage root -- text files in the main Sage directory
     138  and in ``SAGE_ROOT/spkg``.
     139
    137140The previous section discussed using Mercurial with the Sage library,
    138141via the command ``hg_sage``. There are corresponding commands for each
    139142of the repositories:
    … …  
    144147
    145148- use ``hg_scripts`` for the Sage shell scripts.
    146149
     150- use ``hg_root`` for the Sage root.
     151
    147152Since version 3.4, both the Sage library and documentation
    148153repositories are managed by the command ``hg_sage``.

  • sage/misc/all.py 

    diff --git a/sage/misc/all.py b/sage/misc/all.py
    a b  
    3636
    3737from dist import install_scripts
    3838
    39 from hg import hg_sage, hg_scripts, hg_extcode, hg_sagenb
     39from hg import hg_sage, hg_scripts, hg_extcode, hg_sagenb, hg_root
    4040
    4141from package import install_package, is_package_installed, standard_packages, optional_packages, experimental_packages, upgrade
    4242

  • sage/misc/hg.py 

    diff --git a/sage/misc/hg.py b/sage/misc/hg.py
    a b  
    12651265                 push_url='%s/examples/'%SAGE_OUTGOING_SERVER,
    12661266                 obj_name='examples')
    12671267
     1268hg_root = HG(SAGE_ROOT,
     1269             'Sage Root',
     1270             pull_url=SAGE_INCOMING_SERVER,
     1271             push_url=SAGE_OUTGOING_SERVER,
     1272             obj_name='root')
     1273
    12681274hg_sagenb = HG('%s/devel/sagenb' % SAGE_ROOT,
    12691275               'SageNB Source Code',
    12701276               pull_url='http://boxen.math.washington.edu:8123',