Commit Graph

136 Commits

Author SHA1 Message Date
Matt Mackall
87d3671dbf merge with stable 2012-03-12 17:05:42 -05:00
Johan Samyn
b5996e72f7 help: add verb to sentence in phases.txt 2012-03-12 13:22:28 +01:00
Michal Sznajder
1c1007a5ed help: sort hgrc related "Sections" chapters alphabetically 2012-02-18 14:27:57 +01:00
Patrick Mezard
eacdef0369 doc: minor fixes to [graph] section documentation 2012-02-18 12:30:24 +01:00
Matt Mackall
7b0e33b7e2 phases: add resync example to help topic 2012-01-30 16:37:15 -06:00
Matt Mackall
902bee47a8 pull: return 1 when no changes found (BC)
Currently we have the following return codes if nothing is found:

                commit   incoming    outgoing      pull     push
intended           1        1           1            1       1
documented         1        1           1            0       1
actual             1        1           1            0       1

This makes pull agree with the rest of the table and makes it easy to
detect "nothing was pulled" in scripts.
2012-01-30 16:01:54 -06:00
Matt Mackall
41ed50006e glossary: add phase terms 2012-01-30 14:44:01 -06:00
Matt Mackall
875e0dda31 help: add examples to phases topic 2012-01-27 18:43:41 -06:00
Wagner Bruna
26bcf69404 help/config: fix help command markup 2012-01-27 12:52:13 -02:00
Matt Mackall
d26a97cacb help: fix publish option spelling in phases topic 2012-01-26 17:54:52 -06:00
Matt Mackall
101ede8d22 help: add missing phase config items to config topic 2012-01-26 17:54:22 -06:00
Wagner Bruna
9e310d7986 help/phases: remove trailing whitespace 2012-01-26 17:23:43 -02:00
Matt Mackall
578253989c help: add phases topic 2012-01-26 11:23:14 -06:00
Constantine Linnick
73bdfc9ad9 graph: in hgrc specify line color for main branch
You can specify color to visually distinguish main branch (trunk)
on hgweb's graph page. If color specified, all branch heads will share
same color. Settings format is branch_name.color = value, where color
is six hexadecimal digits e.g.:
[graph]
default.color = FF0000
2012-01-22 19:47:03 +07:00
Constantine Linnick
c28ce344f6 graph: in hgrc specify line width for main branch
You can specify width to visually distinguish main branch (trunk)
on hgweb's graph page. Settings format is branch_name.width = value,
where width in px e.g.:
[graph]
default.width = 3
2012-01-22 19:35:26 +07:00
FUJIWARA Katsunori
4629df01c9 filemerge: create detail of internal merge tools from documentation string
this patch introduces 'internaltoolsmarker' which creates detail of
each internal merge tools from documentation string for 'hg help merge-tools'.
2012-02-12 21:38:12 +09:00
Matt Mackall
80b55e7b48 revset: simplify help not about quoting 2012-01-20 19:22:09 -06:00
Matt Zuba
60b19beb18 hooks: prioritize run order of hooks
As of Mercurial 1.3, hooks are sorted in the order they are read into
Mercurial.  There are many instances when someone may want the hooks
sorted in a specific order; this patch allows prioritizing hooks, while
maintaining the existing enumeration for hooks without a priority.
2012-01-15 13:50:12 -07:00
Martin Geisler
5c1213d740 merge with stable 2012-01-10 15:23:49 +01:00
Martin Geisler
303e7dc672 filesets: use example with quotes for encoding predicate
A user on IRC was confused that "encoding(ASCII)" works and
"encoding(UTF-8)" fails with "parse error: encoding requires an
encoding name".
2012-01-10 15:20:16 +01:00
Mads Kiilerich
7f38d9b9d4 help: Backed out changeset daf758dccb52, description of file urls
This help entry didn't try to describe the 'localhost' notation. It described a
non-standard host-less notation where 'local' just was the first part of a
sample relative path. It describe "urls" with relative and absolute paths like:

  file://file.txt
  file:///tmp/file.txt
  file://c:/tmp/file.txt
2011-11-18 01:32:28 +01:00
Mads Kiilerich
85ec0fb7bf help: it is 'file://localhost/', not 'file://local/'
The documentation has apparently always been wrong.
2011-11-16 00:10:52 +01:00
David M. Carr
b8f899bd68 subrepo: improve help for svn subrepo support
Add details on which commands are supported for Subversion subrepos.
2011-11-03 23:12:31 -04:00
David M. Carr
6878ff4146 subrepo: improve help for git subrepo support
Add details on which commands are supported for git subrepos.
2011-11-03 23:12:30 -04:00
David M. Carr
4025aa1003 subrepo: update help for commit to reflect new default behavior
Update the subrepo help to be consistent with the new default behavior,
which is to abort if any subrepo is dirty.
2011-11-03 23:11:40 -04:00
Martin Geisler
acfa971cf1 subrepos: abort commit by default if a subrepo is dirty (BC)
This changeset flips the default value of ui.commitsubrepos setting
from True to False and adds a --subrepos flag to commit.

The commit, status, and diff commands behave like this with regard to
recusion and the ui.commitsubrepos setting:

          | recurses      | recurses
          | by default    | with --subrepos
  --------+---------------+----------------
  commit: | commitsubrepo | True
  status: | False         | True
  diff:   | False         | True

By changing the default from True to False, the table becomes
consistent in the two columns:

* without --subrepos on the command line, commit will abort if a
  subrepo is dirty and status/diff wont show changes inside subrepos.

* with --subrepos, all three commands will recurse.

A --subrepos flag on the command line overrides the config settin.g
2011-10-21 00:33:08 +02:00
Christian Ebert
d589940139 help: properly underline annotate config heading 2011-12-06 13:21:45 +01:00
Matt Mackall
6c076151bb merge with stable 2011-11-20 16:06:18 -06:00
Patrick Mezard
cc3315778f annotate: support diff whitespace filtering flags (issue3030)
splitblock() was added to handle blocks returned by bdiff.blocks() which differ
only by blank lines but are not made only of blank lines. I do not know exactly
how it could happen but mdiff.blocks() threshold behaviour makes me think it
can if those blocks are made of very popular lines mixed with popular blank
lines. If it is proven to be wrong, the function can be dropped.

The first implementation made annotate share diff configuration entries. But it
looks like users will user -w/b for annotate but not for diff, on both the
command line and hgweb. Since the latter cannot use command line entries, we
introduce a new [annotate] section duplicating the diff whitespace options.
2011-11-18 12:04:31 +01:00
Matt Mackall
75db0d196a merge with stable 2011-11-17 16:53:17 -06:00
David M. Carr
f9ef6cf73b forget: support forgetting explicit paths in subrepos
Change the behavior of the forget command such that explicit paths in
subrepos are handled by forgetting the file in the subrepo. This eliminates the
previous behavior where if you called "hg forget" for an explicit path in a
subrepo, it would state that the file is already untracked.
2011-11-09 19:46:51 -05:00
Martin Geisler
cc14f68b49 merge with stable 2011-11-04 10:39:04 +01:00
David M. Carr
296a0c6305 add: support adding explicit files in subrepos
Change the behavior of the add command such that explicit paths in
subrepos are always added.  This eliminates the previous behavior
where if you called "hg add" for an explicit path in a subrepo
without specifying the -S option, it would be silently ignored.
If you specify patterns, or no arguments at all, the -S option
will still be needed to activate recursion into subrepos.
2011-11-02 01:17:11 -04:00
Matt Mackall
fe476543eb subrepo: add git to the help topic 2011-10-09 11:03:57 -05:00
Matt Mackall
c3e3cbc373 merge with stable 2011-08-18 17:24:04 -05:00
Wagner Bruna
6790ac4b35 help/config: strip trailing whitespace
This disabled paragraph splitting for translations.
2011-08-18 10:15:14 -03:00
Matt Mackall
bd0261e46e merge with stable 2011-08-01 18:10:05 -05:00
Patrick Mezard
8028e79c02 hgweb: do not ignore [auth] if url has a username (issue2822)
The [auth] section was ignored when handling URLs like:

  http://user@example.com/foo

Instead, we look in [auth] for an entry matching the URL and supplied user
name. Entries without username can match URL with a username. Prefix length
ties are resolved in favor of entries matching the username. With:

  foo.prefix = http://example.org
  foo.username = user
  foo.password = password
  bar.prefix = http://example.org/bar

and the input URL:

  http://user@example.org/bar

the 'bar' entry will be selected because of prefix length, therefore prompting
for a password. This behaviour ensure that entries selection is consistent when
looking for credentials or for certificates, and that certificates can be
picked even if their entries do no define usernames while the URL does.
Additionally, entries without a username matched against a username are
returned as if they did have requested username set to avoid prompting again
for a username if the password is not set.

v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly.
v3: allow unset usernames to match URL usernames to pick certificates. Resolve
prefix length ties in favor of entries with usernames.
2011-08-01 23:58:50 +02:00
Matt Mackall
9dd4882287 hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Before: hgweb made it possible to download file content with a content type
detected from the file extension. It would serve .html files as text/html and
could thus cause XSS vulnerabilities if the web site had any kind of session
authorization and the repository content wasn't fully trusted.

Now: all files default to "application/binary", which all important
browsers will refuse to treat as text/html. See the table here:

https://code.google.com/p/browsersec/wiki/Part2#Survey_of_content_sniffing_behaviors
2011-07-31 01:46:52 +02:00
Angel Ezquerra
3ee1ac8027 help: add "web/logoimg" setting description 2011-07-25 08:28:37 +02:00
Matt Mackall
1a588dc828 alias: note interaction of shell aliases with early opts in help 2011-07-18 14:57:22 -05:00
Arne Babenhauserheide
81729d0d3f help: fileset foo.lst was named files.lst 2011-07-01 22:50:36 +02:00
Wagner Bruna
53d990ed78 help/revsets: revset aliases can be defined on any config file 2011-06-17 19:28:38 -03:00
Wagner Bruna
ff9f5e4543 help/revsets: clean up whitespace between paragraphs 2011-06-17 19:27:40 -03:00
Wagner Bruna
5fc947dc55 help/config: mention [revsetalias] section 2011-06-17 19:14:47 -03:00
Matt Mackall
c8c26720e0 fileset: add a help topic
Add crosslinking with patterns topic.
2011-06-18 16:53:49 -05:00
Wagner Bruna
6aa802687e help/hgignore: refer to the builtin help instead of external URLs 2011-06-17 18:24:54 -03:00
Wagner Bruna
c100667e38 help/config: replace docutils markup 2011-06-17 13:31:23 -03:00
Wagner Bruna
dc3642eb62 help/config: quote config section names consistently 2011-06-16 12:52:37 -03:00
Wagner Bruna
c203edb0e4 help/config: fix small typo 2011-06-16 12:42:19 -03:00