Commit Graph

61 Commits

Author SHA1 Message Date
Patrick Mezard
1e4894d773 commit: abort if a subrepo is modified and ui.commitsubrepos=no
The default behaviour is to commit subrepositories with uncommitted changes. In
my experience this is usually undesirable:

- Changes to dependencies are often debugging leftovers
- Real changes should generally be applied on the source project directly,
  tested then committed. This is not always possible, subversion subrepos may
  include only a small part of the source project, without the tests.

Setting ui.commitsubrepos=no will now abort commits containing such modified
subrepositories like:

  $ hg --config ui.commitsubrepos=no ci -m msg
  abort: uncommitted changes in subrepo sub

I ruled out the hook solution because it does not easily take --include/exclude
options in account. Also, my main concern is whether this flag could cause
problems with extensions. If there are legitimate reasons for callers to
override this behaviour (I could not find any), they might either override at ui
level, or we could add an argument to localrepo.commit() later.

v2:
- Renamed ui.commitsubs to ui.commitsubrepos
- Mention the configuration entry in hg help subrepos
2011-02-15 22:25:48 +01:00
Matt Mackall
b4143e379a help: ssh urls don't allow passwords 2011-01-27 13:29:21 -06:00
Steve Borho
5d527f9378 match: support reading pattern lists from files 2010-12-23 15:12:24 -06:00
John Peberdy
2b3c69e04a help: correct documentation for branches keyword 2010-12-19 21:49:54 -05:00
timeless
595318704d help: urls help should include see also for paths 2010-11-10 04:53:11 -06:00
Matt Mackall
50b99d1a5a encoding: default ambiguous character to narrow
The current implementation of colwidth was treating 'A'mbiguous
characters as wide, which was incorrect in a non-East Asian context.
As per http://unicode.org/reports/tr11/#Recommendations, we should
instead default to 'narrow' if we don't know better. As character
width is dependent on the particular font used and we have no idea
what fonts are in use, this recommendation applies.

This introduces HGENCODINGAMBIGUOUS to get the old behavior back.
2010-10-27 15:35:21 -05:00
Wagner Bruna
ebc8faba4a help: correct tip about deleting a subrepository
The extra detail is not necessary, and wrong for Mercurial
subrepositories, so remove it (suggested by Patrick Mézard).
2010-10-27 12:13:49 -02:00
Wagner Bruna
0913d409a2 help: fix typo in merge-tools topic 2010-10-27 12:03:08 -02:00
Steve Borho
7b316e89b0 help: improve wording of internal:merge and internal:fail 2010-10-25 14:34:49 -05:00
Patrick Mezard
4f21d24f6f Add subrepos help topic
Edited by:
Martin Geisler <mg@lazybytes.net>
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
2010-10-24 19:28:44 +02:00
Patrick Mezard
d96f85f343 merge-tools.txt: 6 comes after 5 2010-10-24 18:37:59 +02:00
Patrick Mezard
90ed7bf6a1 merge-tools.txt: fix typos, simplify, renumber from 1. 2010-10-24 12:55:29 +02:00
Patrick Mezard
c832c42c0c revsets: generate predicate help dynamically 2010-10-23 19:21:51 +02:00
Mads Kiilerich
1c09b9028f help: improve merge-tools topic, describe --tool and clarify details
This doesn't make it simpler, but it makes it more correct.

With help from erikz, mg and abuehl.
2010-10-22 17:08:15 +02:00
Mads Kiilerich
aee658b0d9 help: use Windows cmd compatible quoting in revset help 2010-10-22 17:05:51 +02:00
Martin Geisler
7e2dd66daa merge-tools: fixed typos
Spotted by Patrick Mézard.
2010-10-21 21:34:30 +02:00
Erik Zielke
9ef6ae89b7 help: help topic for merge tools
I have made a help topic for merge tools. The text in the topic is
based on the http://mercurial.selenic.com/wiki/MergeProgram page from
the wiki, along with some extra information on the internal merge tools.
2010-10-20 16:54:34 +02:00
Augie Fackler
5fe5470142 revset: add id() and rev() to allow explicitly referring to changes by hash or rev 2010-10-11 09:44:19 -05:00
Augie Fackler
4a386faa07 revset: rename tagged() to tag() and allow it to take an optional tag name 2010-10-10 12:41:36 -05:00
Martin Geisler
ae6f6bb2ab revsets: fix stray * in help topic 2010-10-09 22:05:24 +02:00
Brodie Rao
915907e184 revsets: add a sample query to the help for getting active branches 2010-10-09 11:55:25 -05:00
Brodie Rao
e9092c74c1 revsets: add descriptions for sample queries in the help 2010-10-09 11:54:42 -05:00
Brodie Rao
e6cef43d44 revsets: clarify in the help that head() returns named branch heads 2010-10-09 11:27:29 -05:00
Mads Kiilerich
2fcbe3473c merge with stable 2010-10-01 00:54:03 +02:00
Mads Kiilerich
665d2722d8 doc: clarify that https cert verification requires web.cacerts 2010-10-01 00:48:50 +02:00
Brodie Rao
5a1e1994ac help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:

1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment

2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)

3. ~/.hgrc - hgrc(5)

In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
2010-08-27 22:36:35 -04:00
Brodie Rao
2104af5ee2 revset: support raw string literals
This adds support for r'...' and r"..." as string literals. Strings
with the "r" prefix will not have their escape characters interpreted.

This is especially useful for grep(), where, with regular string
literals, \number is interpreted as an octal escape code, and \b is
interpreted as the backspace character (\x08).
2010-09-24 15:36:53 -05:00
Dan Villiom Podlaski Christiansen
9c75aee050 templater: add hex filter. 2010-09-22 00:14:57 +02:00
Martin Geisler
c3c7fa090f Merge with stable 2010-08-30 13:00:22 +02:00
Matt Mackall
eef168b604 merge with stable 2010-08-19 10:25:41 -05:00
Dirkjan Ochtman
285c18754a help: document stringify templatefilter 2010-08-19 10:59:37 +02:00
Martin Geisler
5f4b538b5a glossary: fixed typo 2010-08-17 17:33:42 +02:00
Martin Geisler
f39e256b0e glossary: add entry for "Branch, inactive" 2010-08-17 13:59:37 +02:00
Wagner Bruna
64365a9e84 revset: predicate to avoid lookup errors
A query like

head() and (descendants("bad") and not descendants("fix"))

(testing if repo heads are affected by a bug) will abort with a
RepoLookupError if either badrev or fixrev aren't found inside
the repository, which is not very informative.

The new predicate returns an empty set for lookup errors, so

head() and (descendants(present("bad")) and not descendants(present("fix")))

will behave as wanted even if those revisions are not found.
2010-08-13 13:11:41 -03:00
Matt Mackall
c0507148ea merge with stable 2010-08-17 13:22:20 -05:00
Martin Geisler
0d581ef071 Merge with stable 2010-08-17 17:27:37 +02:00
Matt Mackall
9cc346f0b4 help: fix bytes/digit confusion for hashes
spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>
2010-07-31 18:27:03 -05:00
Nicolas Dumazet
5ab42d56dc revset: add min function 2010-07-30 10:07:46 +09:00
Patrick Mezard
3153012325 cleanup: typos 2010-07-26 22:29:49 +02:00
Patrick Mezard
8314d853e5 revsets.txt: minor improvements 2010-07-26 22:29:17 +02:00
Jason Harris
48d0722a3e templates: 'children' keyword
The template keyword 'parents' is already present and this just
provides the complimentary template keyword.
2010-07-03 05:24:16 +02:00
Renato Cunha
9116007193 glossary: fixed typo in "Directory, working" description
The term "Directory, working" referenced a non-existant term named "Parents,
working directory". This patch fixes the typo.
2010-07-06 13:10:16 -03:00
Julian Cowley
56d348181d revset: fix spelling typo 2010-06-23 16:54:12 -10:00
Wagner Bruna
94fd1c3ad7 help: glossary.txt formatting fixes 2010-06-23 17:50:27 -03:00
Wagner Bruna
22d1edb0c2 help: fix glossary.txt named branches description 2010-06-23 17:49:49 -03:00
Matt Mackall
5e7ddd1612 revset: improve help on strings 2010-06-21 13:38:40 -05:00
timeless
f73c558130 Explain trust near hgrc in config help 2010-05-21 12:51:55 +03:00
Martin Geisler
66a319e69f help: new revsets topic
Based on a patch by timeless which in turn is based on

  http://selenic.com/pipermail/mercurial-devel/2010-June/021638.html
2010-06-17 17:21:39 +03:00
Faheem Mitha
45dd4bd055 help: add "glossary" topic
Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion,
Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and
Martin Geisler.
2010-06-16 15:20:22 +05:30
Matt Mackall
5e9a746cad Merge with stable 2010-04-29 22:14:14 -05:00