Commit 32c9ae51 authored by Steve Borho's avatar Steve Borho
Browse files

Merge with stable

......@@ -66,3 +66,4 @@ d3d9c6af529a0dc9fe69389a9b851b7339c2f5b2 2.2.1
055b98684ae5e54d3e4eaf3a2b949977ced89f55 2.2.2
ce3f08f23d44daab96ccd770409d8539de261004 2.3-rc
ff0a221e51d504aa9fdc101d76d372e415bc0e0b 2.3
29f83d1d39c715070bf5fb41c7d48fcde6592501 2.3.1
......@@ -49,9 +49,9 @@ copyright = u'2011, Steve Borho and others'
# built documents.
#
# The short X.Y version.
version = '2.1'
version = '2.3'
# The full version, including alpha/beta/rc tags.
release = '2.1.0'
release = '2.3.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -177,6 +177,119 @@ remote_repository_url combination).
.. vim: noet ts=4
projrc
======
`projrc <http://mercurial.selenic.com/wiki/ProjrcExtension>`_ is an extension
that makes Mercurial look for and parse .hg/projrc for additional
configuration settings.The file is transferred on clone and on pull
(but never on push), after confirmation by the user, from a list of servers
that '''must '''be configured by the user. For security reasons the user
'''must '''also select which ''`projrc`'' configuration settings will be
transferred (i.e. no settings are transferred from any servers by default).
The user can also configure the extension to automatically accept all changes
to the .hg/projrc file.
This is useful for centralized setups where you want to distribute
configuration settings to all repositories with a minimum amount of setup.
In particular, it can be used to remap subrepository sources, as explained
on Mercurial's
`SubrepoRemappingPlan <http://mercurial.selenic.com/wiki/SubrepoRemappingPlan>`_.
**Configuration**
This extension (as most other extensions) is disabled by default. To use
and configure you must first enable it on the Settings/Extensions panel.
When the extension is enabled you will see a new entry, "Projrc" on the
settings dialog. This let's you configure the extension by setting the
following settings:
:guilabel:`Request confirmation`
If True (the default) you'll get a prompt whenever
the extension detects changes to the remote server's
.hg/projrc file.
If false, the extension will automatically accept any change to the
remote .hg/projrc file.
:guilabel:`Servers`
This setting is a comma separated list of glob patterns matching
the server names of the servers that the projrc file will be pulled from.
Unless this setting is set, no .hg/projrc files will be ever
transferred from any servers.
:guilabel:`Include`
This key lets you control which sections and which keys will be accepted
from the remote projrc files. This is a a comma separated list of glob
patterns that match the section or key names that will be included.
Keys names must be specified with their section name followed by a '.'
followed by the key name (e.g. "''`diff.git`''").
To allow all sections and all keys you can set this setting to "*"
(without the quotes).
:guilabel:`Exclude`
This setting is similar to the "''`Include`''" setting but it has the
opposite effect. It sets an "exclude list" of settings that will not
be transferred from the common projrc files.
The exclude list has the same syntax as the include list. If an exclusion
list is set but the inclusion list is empty or not set all non excluded
keys will be included.
If both an include and an exclude lists are set, and a key matches both
the include and the exclude list, priority is given to the most explicit
key match, in the following order:
* full key, exact matches are considered the most explicit (e.g.
"''`ui.merge`''");
* pattern (glob) matches are considered next (e.g.
"''`auth.bitbucket.com.*`''"), with the longest matching pattern being the
most explicit;
* section level matches (e.g. "''`ui`''");
* global ("''`*`''") matches.
If a key matches both an include and an exclude (glob) pattern of the same
length, the key is ''included'' (i.e. inclusion takes precedence over
exclusion).
**Usage**
Once enabled and properly configured, the extension will look for
.hg/projrc files whenever you clone or pull from one of the repositories
specified on its "servers" configuration key.
Whenever the extension detects changes to the remote projrc file (e.g. when
you do not have a .hg/projrc file yet, or when the contents of said file
have changed on the server), you'll receive a warning unless you have set the
"Require confirmation" setting to False (in which case the extension assumes
that you accept the changes). If you accept the changes your local .hg/projrc
file will be updated, and its settings will be taken into account by mercurial
and TortoiseHg.
If a local repository has a .hg/projrc file, you'll see an extra panel
on the setting dialog. The title of the extra panel is "project settings
(.hg/projrc)".
The "project settings" panel is a read-only panel that shows the settings that
are set on the local .hg/projrc file. Although you can update your local
version of the .hg/projrc file, the panel is read only to indicate that
you cannot change the remote repository's settings, and that if the remote
repository settings change your local copy will be updated on the next pull
(if you allow it).
The "project settings" settings panel is shown between the "global settings" panel
and the "repository settings" panel, indicating that its settings are applied
_after_ the global settings but _before_ the local repository settings (i.e
the settings specified in the repository .hg/hgrc file).
**Additional Information**
For the most up to date information regarding this extension, to see several
detailed usage examples and to learn how to use it and configure it from the
command line, please go to the extension's
`Wiki <http://mercurial.selenic.com/wiki/ProjrcExtension>`_.
pbranch
=======
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment