Commit Graph

1501 Commits

Author SHA1 Message Date
Patrick Mezard
f6c5bd6fa1 Merge with crew-stable 2009-09-05 19:39:46 +02:00
Patrick Mezard
d68b916da4 merge: exclude common ancestor from --preview (issue1818) 2009-09-05 18:56:51 +02:00
Christian Ebert
ebde959a47 log: prevent negative date range from displaying entire log (issue1805) 2009-09-04 11:51:28 +02:00
Nicolas Dumazet
fb2cbab1fb use 'x in dict' instead of 'dict.has_key(x)'
"in" is faster, and has_key will be removed in py3k
2009-08-24 21:00:34 +02:00
Dirkjan Ochtman
1677a2b0c1 log: fix traceback for log -k caused by 51e61d3c56bc (issue1805) 2009-08-21 09:33:27 +02:00
Dirkjan Ochtman
e00109f7e7 cmdutil: use context objects for walkchangerevs() 2009-08-20 08:34:22 +02:00
Matt Mackall
4f34600114 heads: more clarity for --closed 2009-07-22 18:27:23 -05:00
Matt Mackall
cfbbab6abc Merge with crew-stable 2009-07-22 18:08:02 -05:00
Matt Mackall
de154bfa34 update: allow -c to jump branches if clean 2009-07-22 17:59:11 -05:00
Martin Geisler
a17f0cee1b do not translate commit messages
It is not very helpful to have 'Added tag %s for changeset %s' and
similar messages translated into different languages when people work
together using different locales.

We now use English strings without support for translations. If
needed, the user can still supply a custom string for most commands.
2009-07-22 22:50:34 +02:00
Dan Villiom Podlaski Christiansen
dcd26b5a01 commands: hide deprecated commands.
A command is considered deprecated if the word "DEPRECATED" is found
in the doc string. Such commands are hidden from non-verbose help.
2009-07-10 13:40:25 +02:00
Matt Mackall
e3dc8aa6db fix memory usage of revlog caches by limiting cache size [issue1639] 2009-07-09 17:10:07 -05:00
Matt Mackall
fc2733b540 commit: lose some pointless 'nothing changed' messages
Move message from localrepo to commands. This drops confusing messages
in subrepo, import, and rebase.
2009-07-01 01:16:19 -05:00
Matt Mackall
c92524ffa3 help: add more pointers to commit --close-branch 2009-07-01 00:35:59 -05:00
Matt Mackall
a87df088a6 branches: add --closed flag for consistency with heads 2009-07-01 00:31:59 -05:00
David Soria Parra
b8eb153b05 commands: Check if helptext contains a newline before we split 2009-07-27 02:12:17 +02:00
Martin Geisler
050ea36350 commands: wrap docstrings at 70 characters
It is no longer necessary to wrap the docstrings at 70 characters in
the source -- with the reST parser, they are re-formatted to fit the
terminal when shown.

However, wrapping the docstrings at 78 characters makes life harder
for translators because it marks a lot of strings as fuzzy for no good
reason. When un-marking them, the translators would have to examine
each string again and determine if it is merely re-wrapped or if the
content was also changed.

The long lines also introduce very ugly linebreaks in the .po files if
they are processed using the standard Gettext tools without using
something like '--width 85' all the time.
2009-07-26 01:33:00 +02:00
Dirkjan Ochtman
da9d2d8f2b merge with crew-stable 2009-07-23 20:44:26 +02:00
Martin Geisler
ae0794fd45 coding style: use a space after comma
I left a cases like 'lambda x,y:' alone -- the lack of a space does
not bother me as much when the variables are single letters.
2009-07-22 23:12:54 +02:00
Martin Geisler
80783827fb commands: remove ineffective parenthesis 2009-07-22 23:08:32 +02:00
Martin Geisler
f69f24cd76 merge with crew-stable 2009-07-22 22:56:45 +02:00
Martin Geisler
3951831e0b commands: use minirst parser when displaying help 2009-07-16 23:25:26 +02:00
Martin Geisler
a2bda0adf6 merge with crew-stable 2009-07-15 17:44:47 +02:00
Nicolas Dumazet
7eadbe8d42 for calls expecting bool args, pass bool instead of int
str.splitlines and email.message.as_string both expect a bool argument
defaulting at False: replace f(1) by f(True) and f(0) by f()
2009-07-13 09:50:26 +09:00
Matt Mackall
eb6cba34d7 Merge with stable 2009-07-09 19:49:02 -05:00
Martin Geisler
be9af22b8a commands: avoid bad linebreak in addremove docstring 2009-07-08 00:30:21 +02:00
Martin Geisler
a53360d76e commands: wrapped docstrings at 78 characters
We have always had a left margin of 4 characters -- probably just
because that's how docstrings for top-level functions turn out by
default, but it also looks nice in the built-in help.

The docstrings were wrapped at 70 characters, which is the default for
Emacs. However, this gives a right margin of 10 characters in a
standard 80 character terminal.

I've now wrapped the relevant docstrings at 78 characters, effectively
killing the right margin. The asymmetric margins looked a bit odd and
some of the text looked cramped with a right margin, so Dirkjan and I
felt that it was best to remove it entirely. The two character gap was
kept to have some space between the border of the terminal -- it will
also make diffs involving the docstrings fit in a 80 character line.
2009-07-07 23:54:30 +02:00
Alejandro Santos
ebe339890f split local and stdlib module imports (eases migration issues) 2009-07-05 11:06:09 +02:00
Alejandro Santos
41ce14a033 compat: don't reference an exception var inside a lambda 2009-07-05 11:05:31 +02:00
Alejandro Santos
77d606ac51 compat: use open() instead of file() everywhere 2009-07-05 11:01:30 +02:00
Cédric Duval
6577113132 bisect: fix format specifiers for integers 2009-07-01 23:15:26 +02:00
Stefano Mioli
498646a2c2 commands: improve bundle compression methods description 2009-06-28 13:56:34 +02:00
Brendan Cully
8fec927bcc help: branch heads have no descendants, not no children 2009-06-29 08:48:05 -07:00
Martin Geisler
1454ed1684 commands: wrap short descriptions in 'hg help'
The code for wrapping a single line of text with a hanging indent was
duplicated in commands and help -- it's now moved to a new function
called wrap in util.

The function defaults to a line width is 78 chars, and this un-wraps
some command line flag descriptions, hence the test output changes.
2009-06-24 19:15:58 +02:00
Martin Geisler
6267399c7d commands: add "--" to command line flag in branches docstring 2009-06-24 18:40:13 +02:00
Dirkjan Ochtman
1d29e68744 change wiki/bts URLs to point to new hostname 2009-06-24 15:32:37 +02:00
Dirkjan Ochtman
4240802763 commands: add note about import retrieving patches from URLs 2009-06-24 12:04:19 +02:00
Matt Mackall
e869264d04 Merge with i18n 2009-06-23 15:43:09 -05:00
Martin Geisler
5d560b33c1 commands: removed redundant line from push docstring 2009-06-21 19:12:03 +02:00
Cédric Duval
16497ecd09 help: more improvements for the extensions topic
- improve help text English (thanks to timeless for corrections)
- rename and simplify functions a little bit, improved comments
2009-06-21 17:52:30 +02:00
Cédric Duval
17141a61d0 extensions: move extensions listing functions from mercurial.help
Includes some small fix-ups to comments in enabled() and disabled().
2009-06-21 16:32:00 +02:00
Dirkjan Ochtman
0d5412917a serve: obey the --encoding option 2009-06-21 16:27:07 +02:00
Cédric Duval
ecdc3822ca help: refactor extensions listing, and show enabled ones in the dedicated topic 2009-06-20 20:55:49 +02:00
Matt Mackall
c2f64c423c rollback: minor clarification (issue828) 2009-06-20 09:00:02 -05:00
Matt Mackall
1ca56aef1e update: add --check option 2009-06-20 08:29:41 -05:00
FUJIWARA Katsunori
0c065c08fa compare grep result between target and its parent
I found that typical case is that grep target is added at (*) revision
in the tree shown below.

     +--- 1(*) --- 3
     0
     +--- 2 ------ 4

Now, I expect 'hg grep --all' to show only rev:1 which is first
appearance of target line.

But 'hg grep --all' will tell:

  target line dis-appeared at 3 => 4
  target line     appeared at 2 => 3
  target line dis-appeared at 1 => 2
  target line     appeared at 0 => 1

because current 'hg grep' implementation compares not between target
revision and its parent, but between neighbor revisions in walkthrough
order.

I checked performance of this patch by "hg grep --follow --all
walkchangerevs" on whole Mercurial repo, and patched version could
complete as fast as un-patched one.
2009-05-19 16:49:54 +09:00
Dirkjan Ochtman
7daf0cc9cd merge: rename -S/--show option to -P/--preview 2009-06-19 13:58:48 +02:00
Matt Mackall
459bbfbb56 subrepo: basic push support 2009-06-15 02:46:20 -05:00
Matt Mackall
ce2e49a0da subrepo: introduce basic state parsing 2009-06-15 02:45:38 -05:00
Patrick Mezard
c1548a6a3e Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
2009-06-15 00:03:26 +02:00