Commit Graph

15752 Commits

Author SHA1 Message Date
Martin Geisler
4c9bf5eec4 commands: no need to rename merge and phases on import 2012-01-13 11:38:49 +01:00
Martin Geisler
f194db061a phase: there is actually no -C option 2012-01-13 11:34:09 +01:00
Martin Geisler
312014ab5d phase: use standard syntax for command line flags
We don't mark them as literal text and we mention the short option the
first time we talk about a given flag.
2012-01-13 11:29:47 +01:00
Martin Geisler
c8fd9fad8f phase: fix RST markup (use `...` for literal text) 2012-01-13 11:26:24 +01:00
Martin Geisler
57ec63f3c0 phase: lowercase option help, rephrase slightly 2012-01-13 11:23:45 +01:00
Matt Mackall
1a97ae2eb1 merge with stable 2012-01-11 09:27:53 -06:00
Matt Mackall
dec1f1ecc2 merge with i18n 2012-01-11 09:27:37 -06:00
Matt Mackall
458a6108a3 merge with i18n 2012-01-11 09:26:47 -06:00
Steven Brown
a6c2ab15fb tests: make {date|age} template output independent of the current date 2012-01-11 22:18:20 +08:00
Pierre-Yves David
32c99d5daa phases: make outgoing object and discovery aware of exclusion
The outgoing object gains an "excluded" members holding all changesets which
were excluded because there where secret.

The core discovery code now remove secret changeset from discovery by default.
This means that any command relying on discovery will exclude secret changeset.
Most notable one are outgoing and bundle. (But bundle with and explicit
``--base`` still allow to bundle outgoing changeset.
2012-01-11 00:27:46 +01:00
Wagner Bruna
48d154e274 i18n-pt_BR: synchronized with 5ec2496518fa 2012-01-10 15:56:33 -02:00
Wagner Bruna
0746f36a73 merge with i18n 2012-01-10 15:48:16 -02: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
Pierre-Yves David
e929cd5e49 discovery: introduce outgoing object for result of findcommonoutgoing
Simplifies client logic in multiple places since it encapsulates the
computation of the common and, more importantly, the missing node lists.

This also allows an upcomping patch to communicate precomputed versions of
these lists to clients.
2012-01-09 03:47:16 +01:00
Pierre-Yves David
2362e6fe6c commands: make bundle use heads computed by findoutgoing 2012-01-09 04:16:00 +01:00
Pierre-Yves David
a51dc67424 revlog: improve docstring for findcommonmissing 2012-01-09 04:15:31 +01:00
Martin Geisler
e0542a7108 commands: bump copyright year 2012-01-11 15:51:02 +01:00
Matt Mackall
7ea3d8e9f3 phase: mark messages for i18n 2012-01-10 16:36:36 -06:00
Matt Mackall
7025e1c3b0 phase: fix up help string 2012-01-10 16:36:33 -06:00
Matt Mackall
ae28263f4b phase: drop reference to working directory phase 2012-01-10 16:36:32 -06:00
Pierre-Yves David
a2fe028df9 phases: add a phases command to display and manipulate phases 2012-01-10 19:45:35 +01:00
Ion Savin
029e0ada33 annotate: append newline after non newline-terminated file listings
The last line of a non newline-terminated file would mix with the first line of
the next file in multiple-file listings before this patch.

Possible compatibility issue: no longer possible to tell from the annotate
output if the file is terminated by new line or not.
2012-01-10 10:18:19 +02:00
Matt Mackall
36343a23b2 subrepo: avoid syncing bookmarks twice on clone (issue3191)
Clone internally handles bookmark synchronization.

(Fix spotted by Eric Blood)
2012-01-10 13:48:42 -06:00
Steven Brown
3ebdb5ed19 revlog: clarify strip docstring "readd" -> "re-add"
I misread it as "read".
2012-01-10 22:35:25 +08:00
Martin Geisler
5c1213d740 merge with stable 2012-01-10 15:23:49 +01:00
Andrei Polushin
2386de7f31 i18n-ru: spellcheck 2012-01-09 02:32:01 +07:00
Andrei Polushin
c25d491848 i18n-ru: editorial for vocabulary words.
Edited for: backup, bundle, repository, checkout
2012-01-09 01:12:54 +07:00
Steven Brown
51a1bd2f20 rebase: reinstate old-style rev spec support for the source and base (issue3181)
As of 1ffaca626da1 (first released as part of Mercurial 2.0), the rebase command
accepted ONLY revsets for the source and base arguments and no longer accepted
old-style revision specifications. As a result, some revision names were no
longer recognised, e.g.

hg rebase --base br-anch
abort: unknown revision 'br'!

These arguments are now interpreted first as old-style revision specifications,
then as revsets when no matching revision is found. This restores backwards
compatibility with releases prior to 2.0.
2012-01-08 23:09:35 +08:00
Andrei Polushin
fec3e33119 i18n-ru: editorial for hg help hgignore 2012-01-08 19:16:22 +07:00
Alexander Sauta
b2c663afdb i18n-ru: synchronized with 56f11e7f38ab 2012-01-08 13:54:36 +04:00
Andrei Polushin
3c579b87b3 i18n-ru: revsets predicates translated 2012-01-08 03:48:09 +07:00
Pierre-Yves David
c4636298a6 phases: use graph and phase name in exchange test 2012-01-07 17:03:33 +01:00
Pierre-Yves David
47a0f8f964 phases: `{phase}` template keyword display the phase name
``{phaseidx}`` is providing the phase index as integer. This integer
 representation is useful when people need to use the fact that phase are
 ordered.

Test keep using the number version for readability purpose.
2012-01-06 11:20:49 +01:00
Pierre-Yves David
cbc6c76868 dirstate: propagate IOError other than ENOENT when reading branch 2012-01-06 07:37:59 +01:00
Olav Reinert
16da43099e mq: Document that qdel requires exact patch identifiers 2012-01-06 15:05:51 +01:00
Na'Tosha Bard
d2bd6a2acb largefiles: fix output of hg summary (issue3060) 2012-01-08 12:35:47 +01:00
Na'Tosha Bard
0bd0abc6e9 largefiles: fix confusion upon removal of added largefile (issue3176)
This patch makes "hg remove" work the same way on largefiles as it does on
regular Mercurial files.  If you try to remove an added largefile, the removal
fails and you are instead prompted to use "hg forget" to undo the add.
2012-01-08 11:19:51 +01:00
Martin Geisler
649b8283da commands: add link to addremove in commit help text 2012-01-06 11:15:32 +01:00
Alexander Sauta
4c35f56b94 i18-ru: debug commands translated 2012-01-06 00:16:14 +04:00
Alexander Sauta
1786e91951 i18n-ru: user prompt related strings translated 2012-01-05 02:04:30 +04:00
Alexander Sauta
9ceb312349 i18n-ru: tanslated record-zeroconf 2012-01-05 01:00:43 +04:00
Matt Mackall
a5d2446886 tests: patch up silly new year's bug 2012-01-03 17:09:26 -06:00
Matt Mackall
8ba239a418 grep: make multiline mode the default (BC)
This is a much more logical way to deal with ^ and $.
Old ^ and $ behavior are available with \A and \Z.
2012-01-03 15:48:58 -06:00
Steve Borho
80262e7e1a wix: add map-commandline.bisect 2012-01-02 20:52:16 -06:00
Matt Mackall
6638238c51 Added signature for changeset 02ea40439373 2012-01-01 13:46:50 -06:00
Matt Mackall
439f06d5a0 merge with i18n 2012-01-01 13:37:30 -06:00
Alexander Sauta
d8b3b3593e i18n-ru: translated commands output up to the end 2012-01-01 19:45:06 +04:00
Alexander Sauta
8b8ac06ab2 i18n-ru: added missing strings in Mercurial help 2011-12-31 21:54:14 +03:00
FUJIWARA Katsunori
b977a4dff3 i18n-ja: synchronized with 3082e981a393 2011-12-31 15:23:05 +09:00
Matt Mackall
f3ededa444 convert: improve exception reporting for SVN logstream
- catch all exceptions
- pickle a stringified version of the exception
- use a normal abort

Hopefully this will result in less mysterious convert exceptions
2011-12-30 15:47:58 -06:00