Commit Graph

1850 Commits

Author SHA1 Message Date
Martin Geisler
0c95184876 churn: use reST syntax for literal blocks 2009-07-23 00:22:05 +02:00
Martin Geisler
49448c8739 bugzilla: wrap example template line 2009-07-23 00:21:46 +02:00
Martin Geisler
87f99d6b85 bugzilla: reformat list of configuration options 2009-07-23 00:20:18 +02:00
Martin Geisler
a15bfef40d bookmarks: use reST syntax for literal block 2009-07-23 00:02:06 +02:00
Martin Geisler
1bc6f1fdf9 acl: use reST syntax for literal blocks 2009-07-23 00:01:24 +02:00
Martin Geisler
0f9cd05325 transplant: better reST formatting 2009-07-22 23:26:27 +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
f69f24cd76 merge with crew-stable 2009-07-22 22:56:45 +02: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
Christian Ebert
515e88efb5 keyword: reformat kwfiles help for minirst parser 2009-07-22 08:28:30 +01:00
Matt Mackall
5d2bdd955b Merge with crew-stable 2009-07-20 19:15:44 -05:00
Benoit Boissinot
6018085a10 merge with -stable 2009-07-19 21:15:40 +02:00
Benoit Boissinot
74c03ea972 graphlog: fix incoming with local repo (issue1731) 2009-07-19 18:59:19 +02:00
Matt Mackall
b707d43231 Merge with crew-stable 2009-07-17 11:52:53 -05:00
Patrick Mezard
6fb02d8b2c Merge with crew-stable 2009-07-17 16:01:19 +02:00
Patrick Mezard
18de6d1538 convert/svn: fix backtrace in tags discovery (issue1742) 2009-07-17 13:31:12 +02:00
Brendan Cully
09920a4acd Merge with hg 2009-07-16 21:05:24 -07:00
Martin Geisler
3951831e0b commands: use minirst parser when displaying help 2009-07-16 23:25:26 +02:00
Matt Mackall
9f21c99975 Merge with stable 2009-07-16 15:40:13 -05:00
Greg Ward
b0c72fe36d localrepo: factor _findtags() out of tags() (issue548).
This makes in-memory caching the sole responsibility of localrepo,
eliminating some localrepo code that was duplicated in mq and
bookmarks.
2009-07-16 10:39:41 -04: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
Nicolas Dumazet
5335f5c399 inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735) 2009-07-13 21:55:17 +09:00
Nicolas Dumazet
2645ee079e inotify: fix issue1375, add a test.
The biggest problem was the data structure, which did not allow changing
a file into a directory or vice versa. This problem is fixed by 47d29dcb7266.

The walk() method also had an issue in this case:
 - we know 'path' as a directory. inotify server sleeps.
 - 'path' is deleted
 - 'path' is recreated as a file
 - the server catches up here, and see the deletion. it instantiates a scan(),
   which in its turn calls for walk(repo, path).
 - walk() then assumes that 'path' is a directory and calls os.listdir on it,
   which raises an OSError(errno.ENOTDIR)

Catch the error, and yield the file instead of the directory contents.
2009-07-13 16:49:05 +02:00
Shun-ichi GOTO
e6da45a0f4 win32mbcs: add special wrapper for osutil.listdir().
osutil.listdir() may misinterpret 0x5c of MBCS 2nd. byte as path
separator.  New wrapper prevents this by adding it beforehand.
2009-07-10 19:34:08 +09:00
Shun-ichi GOTO
928f0827e6 win32mbcs: wrapper supports keyword arguments and dict result.
The keyword arguments are also decoded before calling original.
And dict of return value is also encoded back.
2009-07-10 15:52:01 +09:00
Shun-ichi GOTO
8edf72da29 win32mbcs: also wrap windows.pconvert() 2009-07-09 22:06:30 +09:00
Brodie Rao
fef8ccb4a7 win32mbcs: look up modules using sys.modules (issue1729)
globals()[module] doesn't work for modules inside of packages, such as
os.path.
2009-07-08 09:48:48 -04:00
Christian Ebert
13a3dfdc8e keyword: eliminate potential reference cycles from kwrepo
- delete kwrepo.commitctx after using the tweaked version
- prefer self.hook over repo.hook to avoid nesting

Also pass arguments to commit as arbitrary list.

Thanks to Simon Heimberg and Matt Mackall for guidance.
2009-07-09 11:59:12 +02:00
Greg Ward
e4f07e8a14 convert/cvs: improve error message on unexpected server output. 2009-07-08 22:08:45 -04:00
Henrik Stuart
77301ebe8e acl: read correct index into url for username (issue298)
The index was inadvertedly off-by-one causing the username to be the
remote host rather than the remote user when hosted in a http(s)
session.
2009-07-02 19:53:20 +02:00
Christian Ebert
d0fba52b71 keyword: make repo.commit use a custom commitctx wrapper
This avoids forcing the dirstate of overwritten files to normal
during a commit.

Thanks to Dan Villiom Podlaski Christiansen for the idea of a
"double wrapper", so other extensions can still wrap
repo.commitctx safely.
2009-06-30 11:30:03 +02:00
Matt Mackall
d76e8a3e52 Merge with i18n 2009-06-30 12:32:30 -05:00
Martin Geisler
c15a8f8118 convert: do not ask for translation of "%s %s" 2009-06-27 12:31:41 +02:00
Matt Mackall
e869264d04 Merge with i18n 2009-06-23 15:43:09 -05:00
Martin Geisler
e032f8f8c6 merged with crew 2009-06-22 22:22:48 +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
Martin Geisler
16155b528f merged with crew 2009-06-21 19:06:57 +02:00
Dirkjan Ochtman
9685cd7ac9 mq: fix error message for qpush inexistent-patch (issue1702) 2009-06-21 17:34:33 +02:00
Dirkjan Ochtman
8e61ac3b6d highlight: was broken since 8f1a86879dd3 (encoding) 2009-06-21 16:54:57 +02:00
Dirkjan Ochtman
a774ff01bc help: add/fix docstrings for a bunch of extensions 2009-06-21 16:45:47 +02:00
Cédric Duval
0caffe860f help: remove per-extension paragraph on how to enable it
The central place to find this information is the "extensions" help topic.
2009-06-20 20:57:13 +02:00
Matt Mackall
995038fe46 bookmarks: add appropriate locking (issue1691)
- make updates of bookmark state locked and atomic
- wrap commit so that commit and bookmarks happen under the same lock
2009-06-20 16:42:51 -05:00
Martin Geisler
ffeac49b63 interhg: escape backslashes in docstring 2009-06-19 10:30:18 +02:00
Martin Geisler
b5e6e91ee1 interhg: remove unnecessary escaping 2009-06-19 10:24:34 +02:00
Frank Kingswood
d0ec83933c convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.

Edited by pmezard: fixed collation issue on OSX
2009-06-18 10:39:04 +01:00
Cédric Duval
e9c53f7deb patchbomb: do not assume the presence of angle brackets around msg-id
RFC 5322 states:
  "Semantically, the angle bracket characters are not part of the
   msg-id; the msg-id is what is contained between the two angle bracket
   characters."

Hence it should be correct to pass a message Id with no angle brackets
to --in-reply-to. Adding them if missing.
2009-06-17 20:54:26 +02:00
Christian Ebert
623f4a4a00 keyword: concise help title 2009-06-18 01:21:26 +01:00
Cédric Duval
d66dcc4318 interhg: upgrade comments to online help and improve them
Some inspiration taken from the wiki page of the extension.
2009-06-18 08:18:52 +02:00