Commit Graph

8930 Commits

Author SHA1 Message Date
Brendan Cully
8fec927bcc help: branch heads have no descendants, not no children 2009-06-29 08:48:05 -07:00
Brendan Cully
e55703261f Branch heads should not include "heads" that are ancestors of other heads.
For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a)
I expect "hg heads a" to show only 3.
Discovered by running hg heads HEAD on the mutt repo, where older clients
committed default on top of HEAD.
2009-06-29 00:54:23 -07:00
Nicolas Dumazet
968f9e4e5f inotify: server: remove wpath method
Only called once. And can be simplified to an easy oneliner.
2009-06-28 19:31:16 +09:00
Simon Heimberg
e0ab0a167d inotify: return version to client even when not matching
Old clients are expecting a version string even in case of mismatch, otherwise
they get stuck.
2009-06-21 18:11:19 +02:00
Henrik Stuart
97f9be9c1f windows: fix use of undefined exception (issue1707)
This fixes the implied reliance on pywin32 and the win32 module. This
also fixes a regression in fe7c89838a64 that made Mercurial unusable
without pywin32.
2009-06-25 22:43:58 +02:00
Christian Ebert
4a2d871161 keyword: improve help for kwfiles 2009-06-27 13:05:25 +02:00
Martin Geisler
c981f8f929 highlight: remove author name from docstring
I don't feel this should be part of the documentation. The name of the
original author can of course still be found with 'hg log'.
2009-06-27 13:08:07 +02:00
Martin Geisler
d8c14d7c74 mq: standardize qfinish cmdline help string 2009-06-27 12:13:40 +02:00
Martin Geisler
31cc202751 inotify: OPT -> OPTION in cmdline help string 2009-06-27 12:05:01 +02:00
Martin Geisler
47de8fd2cd hgk: standardize cmdline help strings 2009-06-27 12:03:48 +02:00
Greg Ward
e4e711f7e0 color: don't blow up if configured with unknown color (just warn). 2009-06-25 09:23:33 -04:00
Isaac Jurado
fc1573a6f4 bookmarks: Change references to "repo" by references to "self" (issue1611)
Using "repo" instead of "self" inside bookmark_repo methods was causing a
circular reference and, thus, a memory leak.  It has been detected because the
method bundlerepository.__del__ is never called, therefore leaving dangling
uncompressed bundles inside .hg subdirectory.
2009-06-24 19:20:59 +02:00
Greg Ward
e0eb715075 run-tests: use os.path.realpath() to find hg's setup.py.
Needed for running out-of-tree test suites without --with-hg/--local.
2009-06-23 22:20:54 -04:00
Mads Kiilerich
230b15e299 Make RPM spec in contrib more aligned with the one from Fedora
This is mostly syntactical changes which make the real differences more obvious
when looking at a diff.

contrib/mergetools.rc is now also installed and enabled by default.
2009-06-24 03:05:01 +02:00
Matt Mackall
34cb6b5080 addremove: drop some silly variable assignments 2009-06-23 17:51:51 -05:00
Mads Kiilerich
4f97bc02c9 ui.prompt: Show prompt and selection in non-interactive mode
ui.prompt was completely silent in non-interactive mode, unless in verbose
mode. It is fine that it chooses the default automatically, but it is confusing
that the message and prompt shown interactively can't be found in scripted
tests.

The prompt and selection is now .write'ed instead of .note'ed.
2009-06-21 03:13:38 +02:00
Christian Ebert
fa2f238cad keyword: make kwdemo more translation friendly 2009-06-25 09:53:47 +02: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
c8e6583765 extensions: change descriptions for hook-providing extensions
Thanks to timeless and Dave Townsend for advice!
2009-06-24 13:42:34 +02:00
Dirkjan Ochtman
0448417ea2 extensions: change descriptions for extensions providing a few commands 2009-06-24 13:42:02 +02:00
Dirkjan Ochtman
26c979b536 help: rewrap extension description line length at 78 instead of 70 2009-06-24 13:10:05 +02:00
Dirkjan Ochtman
1c6c4a9bc7 extensions: fix up description lines some more 2009-06-24 12:25:56 +02:00
Dirkjan Ochtman
4240802763 commands: add note about import retrieving patches from URLs 2009-06-24 12:04:19 +02:00
Dirkjan Ochtman
115b52ec56 windows: import WinIOError from win32 module (issue1707)
Quick fix pending further refactoring of windows error handling.
2009-06-24 12:03:53 +02:00
Dirkjan Ochtman
501eaa4cfb mq: compact & rewrap documentation for qdelete command 2009-06-24 12:03:13 +02:00
Martin Geisler
4323e41d7e test-globalopts: broken by output change in 9635d54be8c2 2009-06-23 23:05:51 +02:00
Matt Mackall
e869264d04 Merge with i18n 2009-06-23 15:43:09 -05:00
Wagner Bruna
ae79f5d7d6 i18n-pt_BR: synchronized with 1fb13558d140 2009-06-22 15:58:22 -03:00
Martin Geisler
e032f8f8c6 merged with crew 2009-06-22 22:22:48 +02:00
Wagner Bruna
7a083daf6e i18n-pt_BR: minor rewording and formatting fixes 2009-06-22 15:58:21 -03:00
Wagner Bruna
916c7a99a5 i18n-pt_BR: synchronized with dbb7e8a56cee 2009-06-22 15:58:12 -03:00
Cédric Duval
295c588e3f extensions: remove import rendered unnecessary by 69a0fe38731b 2009-06-21 20:34:58 +02:00
Cédric Duval
6d8eae2087 help: fixing non-matching example texts 2009-06-21 20:35:20 +02:00
Cédric Duval
dbcec5595d extensions: improve the consistency of synopses
Trying as much as possible to consistently:
 - use a present tense predicate followed by a direct object
 - verb referring directly to the functionality provided
   (ie. not "add command that does this" but simple "do that")
 - keep simple and to the point, leaving details for the long help
   (width is tight, possibly even more so for translations)

Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
2009-06-22 15:48:08 +02:00
Cédric Duval
d99e4e75eb acl: help improvements
Thanks to timeless for the review.
2009-06-22 14:49:07 +02:00
Cédric Duval
a144fa2af5 bookmarks: help improvements
- bookmarks are obviously Mercurial's, no need to specify it
 - more explicit about the behavior without track.current
 - typos

Note: the extension's help is shadowed by that of the command
of the same name and as such will never appear to the user.

Thanks to timeless for the fixes.
2009-06-22 14:08:49 +02:00
Simon Heimberg
66c4ab1cbf patch: use new style class in linereader 2009-06-22 12:05:11 +02:00
Wagner Bruna
f14001170d i18n-pt_BR: synchronized with 91ad3310b8cc 2009-06-19 12:38:04 -03:00
Wagner Bruna
d58a35ee40 i18n-pt_BR: synchronized with e116310a2810 2009-06-19 12:34:12 -03:00
Martin Geisler
255e1799df merged Greek translation 2009-06-21 20:09:03 +02:00
Martin Geisler
bbd24eb572 i18n-da: sync with hg.pot
- translated fuzzy strings
- removed old unused strings
2009-06-21 19:27:09 +02:00
Martin Geisler
5d560b33c1 commands: removed redundant line from push docstring 2009-06-21 19:12:03 +02:00
Martin Geisler
16155b528f merged with crew 2009-06-21 19:06:57 +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
f2fdd668fb extensions: use _order to determine if an extension is enabled 2009-06-21 17:19:34 +02:00
Cédric Duval
18fcf35d02 extensions: check for path existence only when necessary 2009-06-21 17:18:48 +02:00
Dirkjan Ochtman
ac890b2ded extensions: remove now-useless pathdirs() function 2009-06-21 17:35:04 +02:00
Dirkjan Ochtman
9685cd7ac9 mq: fix error message for qpush inexistent-patch (issue1702) 2009-06-21 17:34:33 +02:00