[Pidgin] UsingPidginMercurial modified

Pidgin trac at pidgin.im
Mon Mar 28 13:29:11 EDT 2016

Page "UsingPidginMercurial" was changed by rlaager
Diff URL: <https://developer.pidgin.im/wiki/UsingPidginMercurial?action=diff&version=24>
Revision 24
Comment: We have moved to Bitbucket.
Index: UsingPidginMercurial
--- UsingPidginMercurial (version: 23)
+++ UsingPidginMercurial (version: 24)
@@ -1,16 +1,11 @@
 = Using Pidgin Mercurial =
 The master copy of the source code for libpurple, Pidgin, Finch, https://pidgin.im/, and https://imfreedom.org/ resides in [http://mercurial.selenic.com/ Mercurial] repositories.
-== Public Read-only Access ==
-All public Pidgin Mercurial repositories are available via HTTP/HTTPS from [https://hg.pidgin.im https://hg.pidgin.im].
+All public Pidgin Mercurial repositories are available via HTTP/HTTPS from [https://bitbucket.org/pidgin/main bitbucket].
-hg clone https://hg.pidgin.im/pidgin/main pidgin-main
+hg clone https://bitbucket.org/pidgin/main
-There is also a [https://bitbucket.org/pidgin/main clone at bitbucket.org] that can be used for forking and pull requests.
-== !Read/Write Access for Developers/CPWs/SoC Students ==
 === Configure Mercurial ===
 Mercurial is configured through serveral rc files.  You can override the system-wide settings on a per-user or per-repository basis by changing either `~/.hgrc` or `<repository>/.hg/hgrc`.  See `man hgrc` for details.
@@ -38,102 +33,10 @@
 log = -v
-=== Configure SSH for Access ===
-Pidgin's Mercurial repositories are served by the [https://www.lshift.net/practice/open-standards/open-source/mercurial-server mercurial-server] package.  This relies entirely upon SSH key-based authentication, providing access control and a layer of accountability.
+=== How the email and CIA notification works ===
-If you wish, you can simplify Mercurial ssh: URLs by adding the following to `~/.ssh/config`:
-Host hg.pidgin.im
-    Protocol 2
-    User hg
+[This may be a bit out-of-date after the move to Bitbucket.]
-=== SSH-based !Push/Pull ===
-You can get your initial checkouts from Mercurial using the [wiki:"UsingPidginMercurial#PublicRead-onlyAccess" Public Read-only Access] instructions.
-The 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):
-default-push = ssh://hg.pidgin.im/path/to/repo
-Once 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.
-Alternatively, you can clone the repository via ssh using the URI in the `default-push` settings above if http access is problematic for some reason
-Pushes to existing repositories are a simple matter of `hg push` within your working copy.
-Creating a new repository on the server must be done using `hg clone`:
-  * `hg clone . ssh://hg.pidgin.im/path/to/repo` in working copy
-   * (you'll need to use the `hg@` prefix if you haven't set it via the SSH config)
-== Administration ==
-=== Access Control ===
-Access control on Pidgin's Mercurial server is such that all developers can write to our master repositories, but each developer and CPW has their own repositories that anyone can read but only they can write to.  The repositories are structured like so (developers/CPWs listed here are for the purpose of example):
-hg.pidgin.im          # Mercurial server
- + pidgin               # "Official" Pidgin and libpurple repositories
- |  + main                # replaced im.pidgin.pidgin, im.pidgin.pidgin.2.x.y in Monotone
- + private            # Non-public only accessible by developers (for embargoed security fixes)
- | + main               # Clone of pidgin/main with embargoed security fixes
- + dev                # Developers' repositories
- |  + darkrain          # for all repositories darkrain wishes to create
- |  |  + irc              # replaced im.pidgin.cpw.darkrain42.irc in Monotone
- |  |  + xmpp_roster      # replaced im.pidgin.cpw.darkrain42.xppp.roster in Monotone
- |  + rekkanoryo        # for all repositories rekkanoryo wishes to create
- |     + examples         # replaced im.pidgin.cpw.rekkanoryo.examples in Monotone
- + cpw                # Crazy Patch Writers' repositories
- |  + eionrobb          # for all repositories eionrobb wishes to create
- |     + newfeature        # new repository
- + www                # For websites
- |  + pidgin            # for pidgin.im
- |  + imfreedom         # for imfreedom.org
- + util               # Supporting independent codebases
- | + hg_hooks           # various hg hooks
- | + hg_templates       # customized hgweb templates
- | + drmingw            # crash reporter used on windows builds
- | + mozilla-pushlog    # fork of mozilla hook used to keep track of pushes
- + soc                # For Google Summer of Code projects (lines below should be obvious)
-    + 2007
-    |  + student1
-    |     + project1
-    + ...
-    + 2012
-       + studentx
-          + projectx
-Access control is as follows:
-  * Developers and CPWs have write access to `pidgin/*`
-  * Developers have read / write access to `private/*` only via ssh
-  * Developers can create and modify repositories in `dev/$NICKNAME/`
-  * Crazy Patch Writers can create and modify repositories in `cpw/$NICKNAME/*`
-  * Summer of Code students can create and modify repositories in `soc/$YEAR/$NICKNAME/*`
-  * Public anonymous Read-only access is available for any repository on the server with the exception of those in the private tree.
-  * Those people with "root" access can do anything to any repository.  This access is strictly controlled.
-=== Adding New Users ===
-The process to allow new users SSH access to the Mercurial repositories is pretty simple, but requires someone with "root" access to mercurial-server.  Currently those people are datallah, markdoliner, rekkanoryo, elb, and lschiere.
-  1. Check out the `hgadmin` repo: `hg clone ssh://hg@hg.pidgin.im/hgadmin pidgin-hgadmin`
-  1. `cd pidgin-hgadmin/keys`.  In here  is a series of directories.  The format is self-explaining.  Developers go in `devs/$NICKNAME`, CPWs in `cpws/$NICKNAME`, SoC students in `soc/$NICKNAME`.  This is to allow a single developer, CPW, or SoC student to have multiple SSH keys, perhaps for multiple machines.
-  1. Create the appropriate directory.
-  1. Within this directory create a file named for the SSH key being added, for example `user at somehost`.
-  1. Put the SSH public key in this file.
-  1. `hg add $FILE`
-  1. Go back to the root of `pidgin-hgadmin`.
-  1. Edit `access.conf`.  Copy an existing line for the same class of user (developer, CPW, SoC student) and modify it as appropriate for the new person's nickname and, if applicable, SoC year.
-  1. `hg commit`
-  1. `hg push` (mercurial-server updates automatically on push)
-=== A Special Note About "root" Access ===
-As 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 ACLs, and thus can write to any repository, including developers', CPWs', and SoC students' repositories.
-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 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.
-=== How the email and CIA notification works ===
 As detailed below, we use slightly modified versions of the notify and hgcia hooks that are distributed with hg.  They are modified in order to support notification for multiple repositories without triggering duplicate notifications as the same revisions are pushed between various repositories on the server.
 The way it works is that there is a special repository that isn't served publicly (`/srv/mercurial-server/notification-repo/`) which is used to trigger the notifications as new revisions are enter it.  A hook is set up for the `hg` user and mercurial-server (`'changegroup.notify_sync'` - see below) so that revisions pushed into any repository will automatically be pulled into the notification repo.  This can be disabled on a per repository basis by overriding and disabling the hook in the appropriate repository-specific `.hg/hgrc` file:

Page URL: <https://developer.pidgin.im/wiki/UsingPidginMercurial>
Pidgin <https://pidgin.im>

This is an automated message. Someone added your email address to be
notified of changes on 'UsingPidginMercurial' page.
If it was not you, please report to datallah at pidgin.im.

More information about the Wikiedit mailing list