Commit Graph

9856 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
51b9419544 Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).

Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
2009-11-22 11:25:01 +01:00
Nicolas Dumazet
7639059665 inotify: improve error messages
* prefix messages by inotify-(client|server)
* make sure that all warning and abort messages use the same format.
* in the case where inotify.sock is an old broken symlink, say so and abort
  instead of trying to overwrite the already existing link
2009-11-19 11:06:01 +09:00
Greg Ward
939861b0bd run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by 40ac669fd6c2 (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories.  Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
2009-11-18 22:23:11 -05:00
Nicolas Dumazet
696edec52d inotify: add a inotify.pidfile configuration possibility
This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.

Also desactivate the workaround introduced in 37824a274d63
2009-11-17 15:36:09 +09:00
Nicolas Dumazet
bf5cba2457 cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since e8efd88001e7 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.

This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
2009-11-17 15:00:00 +09:00
Faheem Mitha
1bec9addf2 commands: improve help for "hg clone -r" 2009-11-19 17:33:41 -05:00
Martin Geisler
fe0b7cb0b8 commands, dates: use real lists instead of literal blocks 2009-11-19 23:29:02 +01:00
Martin Geisler
f70df45cf9 commands: use field lists instead of literal blocks in docstrings
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
2009-11-19 23:27:11 +01:00
Martin Geisler
20491e2b07 commands: do not indent list in clone help string 2009-11-19 22:25:38 +01:00
Thomas Arendsen Hein
694f407973 Extend test-branchmap to test 623593608e75
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
2009-11-18 16:47:20 +01:00
Sune Foldager
a2d25fc09b branchmap: fix defective fallback fix a3d9c67908ca
The fix applied as a3d9c67908ca doesn't work and is essentially a no-op.
This fix also adds a comment about the nature of the problem, and a test.
2009-11-18 15:20:08 +01:00
Dan Villiom Podlaski Christiansen
d5e8634932 qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
2009-11-17 22:16:41 +01:00
Matt Mackall
aa87974fcd summary: note non-default branches with -q 2009-11-17 16:23:05 -06:00
Matt Mackall
f8134703e6 Added signature for changeset 0dfb92b1ef88 2009-11-16 14:50:30 -06:00
Martin Geisler
daa2284e00 i18n-ja: fixed bad indentation 2009-11-16 21:25:36 +01:00
Matt Mackall
314a7ac071 Merge with crew 2009-11-16 13:52:53 -06:00
Brendan Cully
1ce45ec1c3 Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
2009-11-16 11:31:08 -08:00
Matt Mackall
cfae1d9769 Merge with i18n 2009-11-16 12:51:00 -06:00
Wagner Bruna
d71fdf8820 i18n-pt_BR: synchronized with crew b538e270b749 2009-11-16 14:37:31 -02:00
Henrik Stuart
1d4d06ceca support encoding fallback in branchmap to maintain compatibility with 1.3.x 2009-11-16 13:35:36 +01:00
Patrick Mezard
7155946405 convert/svn: fix warning when repo detection failed 2009-11-16 14:09:31 +01:00
Benoit Boissinot
b1932a0c4a inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
2009-11-16 11:58:03 +01:00
Benoit Boissinot
8b1492e457 lock: the correct way to do a trylock() is to use a timeout of 0 2009-11-16 11:55:29 +01:00
Fabian Kreutz
71b65cf1b0 i18n-de: messages for ae987ebfca64 and translation of patchbomb 2009-11-16 09:58:45 +02:00
Wagner Bruna
a93c59a694 i18n-pt_BR: messages for ae987ebfca64 and cleanup 2009-11-15 21:57:02 -02:00
Martin Geisler
85252bdcb6 diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 0f0383897d54. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.

It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
2009-11-14 14:21:53 +01:00
FUJIWARA Katsunori
c8818da4d5 i18n-ja: synchronized with 0e3591f5c72b 2009-11-13 14:30:57 +09:00
Matt Mackall
51a3364b03 Merge with i18n 2009-11-12 14:34:07 -06:00
Wagner Bruna
28097dfc04 i18n-pt_BR: synchronized with crew 6cfe9f41ca79
messages for 2515703f5d13 still included
2009-11-12 16:51:32 -02:00
Matt Mackall
948fcf8eac merge: fix changectx.ancestor(workingctx) (issue1327) 2009-11-12 12:03:39 -06:00
Dirkjan Ochtman
c93b170e46 hgweb: don't choke when an inexistent style is requested (issue1901) 2009-11-12 16:39:11 +01:00
Brodie Rao
4f62e5a654 pager: provide a default attend list
The default list includes commands which normally print large amounts of
text. This should be more user-friendly than paging all commands by default,
which can be confusing when the pager swallows input prompts (with, e.g.,
record, merge, HTTP/SSH authentication, etc.)
2009-11-12 10:29:40 -05:00
Thomas Arendsen Hein
b795944ec3 Add missing bash_completion for qfinish 2009-11-12 12:46:00 +01:00
Dirkjan Ochtman
91d7a1e376 help: don't show extension list on extension help 2009-11-12 13:43:36 +01:00
Patrick Mezard
709ae7efd4 convert/svn: fix HTTP detection bug introduced by bf008106de6f
The probe expected response is a 404 with content, and while urllib returns the
response body in this case, urllib2 raises an HTTP error.
2009-11-12 12:05:43 +01:00
Martin Geisler
5c6caf3b99 i18n-da: translate parentrevspec and record 2009-11-11 22:55:44 +01:00
Martin Geisler
2f62f669cf record: handle translated prompt correctly
The prompt function would return 'y' or 'n' untranslated. This should
therefore not be compared to _('y') and _('n'). However, it turns out
that prompt could just as well return a good old Boolean.
2009-11-11 22:53:01 +01:00
Nicolas Dumazet
eb99c4418d doc/style: add orange border color to notes 2009-11-11 21:52:02 +01:00
Martin Geisler
8053426d1c hgrc.5: mark some words as inline literals 2009-11-11 21:45:13 +01:00
Martin Geisler
e4de4738b7 hgignore.5: fix typo 2009-11-11 21:29:35 +01:00
Martin Geisler
0d2ce52580 doc/style: fix typo in comment (by timeless) 2009-11-11 21:16:20 +01:00
Martin Geisler
a116b17f79 i18n-da: translations in color, graphlog, mq 2009-11-11 00:44:40 +01:00
Martin Geisler
8971a51c4e i18n-da: synchronized with 2515703f5d13 2009-11-10 20:51:11 +01:00
Jens Bäckman
742a8a945f i18n-sv: synchronized with 2515703f5d13 2009-11-10 20:07:32 +01:00
Yuya Nishihara
4a0e94b4d0 doc/style: use default font color specified by user
* it's bad to specify only foreground color:
  http://www.w3.org/QA/Tips/color
* some people prefer dark background
* `color: #111' is mostly the same as `color: black',
  which is the default of almost all popular browsers.

so it's preferable to delete `color: #111', rather than adding
`background-color: white'.
2009-11-10 21:48:10 +09:00
Stuart W Marks
ee6cd48d72 help: improve wording of update help text 2009-11-10 22:27:31 -08:00
Martin Geisler
d8dd14a3aa hgrc.5: oft-requested "hg update" hook example 2009-11-11 20:08:26 +01:00
Patrick Mezard
e5e2172bf6 convert/svn: delegate to svn bindings if HTTP probe fails
convert extension tries to guess the remote repository type with HTTP probes.
Unfortunately, it does not handle authentication or HTTPS handshakes, so regular
svn repositories may be excluded. Instead, when a non-404 error is retrieved,
we keep trying with the svn bindings. The drawback is missing svn bindings will
make the conversion to fail even for non-svn targets. This can be avoided with
--source.
2009-11-11 19:45:00 +01:00
Patrick Mezard
634e25f569 test-rebase-newancestor: make executable 2009-11-11 18:32:56 +01:00
Patrick Mezard
2f3f5f28ea mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
2009-11-11 18:31:42 +01:00