Mercurial > hg
view contrib/sample.hgrc @ 22456:4bbcee186fc6 stable
mq: examine "pushable" of already applied patch correctly
Before this patch, "hg qselect" with --pop/--reapply may pop patches
unexpectedly, even when all of patches applied before "qselect" are
still pushable.
Strictly speaking about the condition of this issue:
- before "qselect"
- there are N applied patches
- the index of the guarded patch X in the series is less than N
- after "qselect"
- X is still guarded, and
- all of applied patched are still pushable
In the case above, "hg qselect" should keep current status, but it
actually tries to pop patches because of X.
The index in "the series" should be used to examine "pushable" of a
patch by "mq.pushablek()", but the index in "applied patches" is used,
and this may cause unexpected examination of guarded patch.
To examine "pushable" of already applied patch correctly, this patch
uses "mq.applied[i].name": "pushable" is the function introduced by
the previous patch, and it returns "mq.pushable(mq.applied[i].name)[0]".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 12 Sep 2014 02:29:19 +0900 |
parents | 3dcc6708231c |
children |
line wrap: on
line source
### --- User interface [ui] ### show changed files and be a bit more verbose if True # verbose = True ### username data to appear in comits ### it usually takes the form: Joe User <joe.user@host.com> # username = Joe User <j.user@example.com> ### --- Extensions [extensions] ### each extension has its own 'extension_name=path' line ### the default python library path is used when path is left blank ### the hgext dir is used when 'hgext.extension_name=' is written ### acl - Access control lists ### hg help acl # hgext.acl = ### bisect - binary search changesets to detect bugs ### hg help bisect # hgext.hbisect = ### bugzilla - update bugzilla bugs when changesets mention them ### hg help bugzilla # hgext.bugzilla = ### extdiff - Use external diff application instead of builtin one # hgext.extdiff = ### gpg - GPG checks and signing ### hg help gpg # hgext.gpg = ### hgk - GUI repository browser ### hg help view # hgext.hgk = ### strip - Remove changesets and their descendents from history ### hg help strip # hgext.strip = ### notify - Template driven e-mail notifications ### hg help notify # hgext.notify = ### patchbomb - send changesets as a series of patch emails ### hg help email # hgext.patchbomb = ### churn - create a graph showing who changed the most lines ### hg help churn # hgext.churn = /home/user/hg/hg/contrib/churn.py ### eol - automatic management of line endings # hgext.eol = ### --- hgk additional configuration [hgk] ### set executable path # path = /home/user/hg/hg/contrib/hgk ### --- Hook to Mercurial actions - See hgrc man page for avaliable hooks [hooks] ### Example notify hooks (load hgext.notify extension before use) # incoming.notify = python:hgext.notify.hook # changegroup.notify = python:hgext.notify.hook ### Email configuration for the notify and patchbomb extensions [email] ### Your email address # from = user@example.com ### Method to send email - smtp or /usr/sbin/sendmail or other program name # method = smtp ### smtp server to send email to [smtp] # host = mail # port = 25 # tls = false # username = user # password = blivet # local_hostname = myhost ### --- Email notification hook for server [notify] ### multiple sources can be specified as a whitespace or comma separated list # sources = serve push pull bundle ### set this to False when you're ready for mail to start sending # test = True ### path to config file with names of subscribers # config = /path/to/subscription/file