Changes between Version 11 and Version 12 of UsingPidginMercurial


Ignore:
Timestamp:
07/06/12 16:35:05 (7 years ago)
Author:
datallah
Comment:

Further tweaks - remove the explicit ssh based cloning instructions because it's better for people to clone over http.

Legend:

Unmodified
Added
Removed
Modified
  • UsingPidginMercurial

    v11 v12  
    2727{{{
    2828[diff]
    29 git = 1
     29git = True
    3030
    3131[defaults]
     
    4444
    4545=== SSH-based Push/Pull ===
    46 You can get your initial checkouts from Mercurial by:
    47   * With SSH config above: `hg clone ssh://hg.pidgin.im/path/to/repo`
    48   * Without SSH config above: `hg clone ssh://hg@hg.pidgin.im/path/to/repo`
     46You can get your initial checkouts from Mercurial using the [wiki:"UsingPidginMercurial#PublicRead-onlyAccess" Public Read-only Access] instructions.
    4947
    50 Once initial clones are done, pulls are a simple matter of running `hg pull` within your working copy.  You may optionally add `-u` to have your checkout automatically updated if possible.
    51 
    52 Alternatively, you can clone the repository via http and add a `default-push` line to the `[paths]` section of the repository's `.hg/hgrc` file (you'll need to use the `hg@` prefix if you haven't set it via the SSH config):
     48The configuration of the server is such that pushes can only be performed via SSH, so you'll want to add a `default-push` line to the `[paths]` section of the repository's `.hg/hgrc` file (you'll need to use the `hg@` prefix if you haven't set it via the SSH config):
    5349{{{
     50[paths]
    5451default-push = ssh://hg.pidgin.im/path/to/repo
    5552}}}
    5653
    57 Pushes are a simple matter of `hg push` within your working copy.  If you need to push a new repository, you must clone:
    58   * With SSH config above: `hg clone . ssh://hg.pidgin.im/path/to/repo` in working copy
    59   * Without SSH config above: `hg clone . ssh://hg@hg.pidgin.im/path/to/repo` in working copy
     54Once initial clones are done, pulls are a simple matter of running `hg pull` within your working copy.  You may optionally use `hg pull -u` to have your checkout automatically updated if possible.
     55
     56Alternatively, you can clone the repository via ssh using the URI in the `default-push` settings above if http access is problematic for some reason
     57
     58Pushes to existing repositories are a simple matter of `hg push` within your working copy.
     59Creating a new repository on the server must be done using `hg clone`:
     60  * `hg clone . ssh://hg.pidgin.im/path/to/repo` in working copy
     61   * (you'll need to use the `hg@` prefix if you haven't set it via the SSH config)
    6062
    6163== Administration ==
    6264
    6365=== Access Control ===
    64 Access control on Pidgin's Mercurial server is strict.  The repositories are structured like so (developers/CPW's listed here are for the purpose of example):
     66Access control on Pidgin's Mercurial server is such that repositories.  The repositories are structured like so (developers/CPW's listed here are for the purpose of example):
    6567
    6668{{{
    6769hg.pidgin.im          # Mercurial server
    6870 + pidgin               # "Official" Pidgin and libpurple repositories
    69  |  + main                # replaced im.pidgin.pidgin in Monotone
    70  |  + 2_x_y               # replaced im.pidgin.pidgin.2.x.y in Monotone
     71 |  + main                # replaced im.pidgin.pidgin, im.pidgin.pidgin.2.x.y in Monotone
    7172 + dev                  # Developers' repositories
    7273 |  + darkrain            # for all repositories darkrain wishes to create
     
    9697  * Crazy Patch Writers can create and modify repositories in `cpw/$NICKNAME/*`
    9798  * Summer of Code students can create and modify repositories in `soc/$YEAR/$NICKNAME/*`
    98   * All of the above have read access to any repository on the server.
     99  * Public Read-only access is available for any repository on the server.
    99100  * Those people with "root" access can do anything to any repository.  This access is strictly controlled.
    100101
     
    117118As indicated above, people who have "root" access to mercurial-server have the ability to configure the server via the `hgadmin` repo.  They also have the ability to bypass all ACL's, and thus can write to any repository, including developers', CPWs', and SoC students' repositories.
    118119
    119 Additionally, there is a safety net built into the mercurial-server configuration.  In `/etc/mercurial-server` on rock.pidgin.im is a default ACL (`access.conf`) and a `keys` directory structure.  This default ACL is what grants "root" users their privileges, and the `keys` directory structure contains two keys in the `keys/root` directory.  These two keys belong to rekkanoryo and lschiere.  These keys are located here in the server's filesystem instead of in the hgadmin repository as a safety net.  When building the files used by mercurial-server, the tools ''always'' read from `/etc/mercurial-server` ''before'' reading from `hgadmin`; this allows rekkanoryo and lschiere to always be able to access the hgadmin repo in the event that it is damaged either through accidental or intentional means.  This safety net means that at least two people will ''always'' have access to our repositories.
     120Additionally, there is a safety net built into the mercurial-server configuration.  In `/etc/mercurial-server` on rock.pidgin.im is a default ACL (`access.conf`) and a `keys` directory structure.  This default ACL is what grants "root" users their privileges, and the `keys` directory structure contains the relevant keys in the `keys/root` directory. These keys are located here in the server's filesystem instead of in the hgadmin repository as a safety net.  When building the files used by mercurial-server, the tools ''always'' read from `/etc/mercurial-server` ''before'' reading from `hgadmin`; this allows access to the hgadmin repo in the event that it is damaged either through accidental or intentional means.  This safety net means that at least two people will ''always'' have access to our repositories.
    120121
    121122== Hooks / Extensions ==
All information, including names and email addresses, entered onto this website or sent to mailing lists affiliated with this website will be public. Do not post confidential information, especially passwords!