Commit Graph

6994 Commits

Author SHA1 Message Date
Martin Geisler
d247b977fd i18n: mark help strings for translation
The gettext function is just another name for the normal _ function
and it is used for translating docstrings when using _ would make
pygettext.py output a warning.
2008-09-09 21:32:39 +02:00
Martin Geisler
66070424fd restructure helptable
When looking up a help topic, the key is now only matched against the
short names for each topic, and not the header. So

  hg help 'Environment Variables'

must be replaced with

  hg help env
2008-09-09 21:32:39 +02:00
Benoit Boissinot
7ba2d57a89 Do not try to load extensions twice (issue811) 2008-09-09 14:43:12 +02:00
Benoit Boissinot
83c55610b6 enhance the error output in case of failure during http push 2008-09-08 14:22:14 +02:00
Benoit Boissinot
416e5f2ef9 tag: without a checkout, base the tag changeset on tip instead of nullid
issue916
2008-09-08 14:04:10 +02:00
Peter Ruibal
30a2036f9e use Exception(args)-style raising consistently (py3k compatibility) 2008-09-08 13:07:00 +02:00
Sune Foldager
71dc05b36f fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Sune Foldager
20edf348ee branch: added more support for named branches
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
2008-09-08 12:55:27 +02:00
Martin Geisler
ca8bba4890 do not pretend to lock static-http repositories (issue994) 2008-09-08 11:32:53 +02:00
Benoit Boissinot
1343a1f47c d5e923544dd7 uses err() instead of warn() but prototype doesn't match
we might want to make warn() look more like err() in the future
to avoid this kind of problem.
2008-09-08 00:50:34 +02:00
Martin Geisler
f13a644c2d i18n: mark command line for translation 2008-09-06 17:44:07 +02:00
Martin Geisler
ce59efd5c2 i18n, mq: mark command line options for translation 2008-09-06 17:44:03 +02:00
Martin Geisler
43bddfde19 i18n, imerge: mark command line for translation 2008-09-06 17:44:02 +02:00
Martin Geisler
b8d2a11cdc i18n, hgk: mark command line options for translation 2008-09-06 17:44:01 +02:00
Martin Geisler
4ca32a1fdf i18n, convert: mark command line options for translation 2008-09-06 17:43:59 +02:00
Benoit Boissinot
ebcbcef11c merge with -stable 2008-09-06 17:04:01 +02:00
Benoit Boissinot
6600c99d5a inotify: workaround ENAMETOOLONG by using symlinks
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.

Fix issue1208
2008-09-06 14:11:33 +02:00
Benoit Boissinot
5b0f8d909f inotify: deactivate inotify status on failure
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
2008-09-06 12:49:20 +02:00
Benoit Boissinot
9849809bc7 inotify: fix traceback when the server has been already started 2008-09-06 12:48:52 +02:00
Benoit Boissinot
ba9e79c7be merge with crew 2008-09-05 11:04:36 +02:00
Benoit Boissinot
0156251424 merge with -stable 2008-09-05 11:03:34 +02:00
Benoit Boissinot
3e99382003 fix test-bisect error (because of set -e) 2008-09-05 11:02:12 +02:00
Patrick Mezard
f6efcddc6c store: pathjoiner default value is os.path.join 2008-09-05 11:00:07 +02:00
Benoit Boissinot
5e411ee73c merge with crew 2008-09-05 10:39:19 +02:00
Benoit Boissinot
61cdb0bdd6 show extensions loaded on traceback 2008-09-05 10:00:57 +02:00
Dirkjan Ochtman
051db6ab82 merge with crew-stable 2008-09-03 19:03:57 +02:00
Dirkjan Ochtman
f785a1c716 bisect: only complain when nothing can be done 2008-09-03 19:00:43 +02:00
Dirkjan Ochtman
8c471ba704 imported patch test-check 2008-09-03 19:01:35 +02:00
Rocco Rutte
fd3e1122b0 hgweb: Serve raw non-binary files as text/plain
Previously these were served as application/octet-stream usually making
browsers download them as files though they can be displayed inline just
fine. This is useful to refer to e.g. /project/raw-file/tip/README.
2008-09-03 15:46:46 +02:00
Benoit Boissinot
20fc9c8d79 allow committing a removed directory
fix issue1089
2008-09-03 02:27:25 +02:00
divy@chelsio.com
3a7f22fad0 notify: fix diffstat printing
notify.diff() keeps line breaks in the diff buffer before calling
patch.diffstat().
patch.diffstat() however adds another line break when feeding diffstat input.
The added extra empty line leads to erroneous diffstat output.
This fix removes the line breaks in notify.diff() and adds it back to print them.
2008-09-03 01:49:16 +02:00
Benoit Boissinot
f2003e5b8b merge with crew 2008-09-03 01:29:03 +02:00
Patrick Mezard
94ead662e7 convert: document source and sink identifiers, fix error message 2008-09-02 22:21:19 +02:00
Benoit Boissinot
7f2ac71a6c make normalize() work when cwd != repo.root 2008-09-02 22:04:09 +02:00
Patrick Mezard
a5a7a649cf graphlog: fix calls from outside the repository (issue1285) 2008-09-02 09:25:29 +02:00
Dirkjan Ochtman
e364bcbc41 record: catch PatchErrors from internalpatch and display error message
This resulted in big ugly tracebacks in issue1282, for example.
2008-08-31 11:36:07 +02:00
Dirkjan Ochtman
9d15aadfb0 record: take diff lines for lack of trailing newlines into account (issue1282)
The record extension incorrectly re-calculated the size lines for unified
diff hunks. It counted a '\\ No newline at end of file\n' line towards the
number of lines of trailing context, while it's not actually part of the
context (and certainly isn't added as a line to the resulting output).

Use the local name of a variable that was access through the nonlocal scope
while we're at it. Seeing the variable was a little bewildering.
2008-08-31 11:34:52 +02:00
Adrian Buehlmann
d71509e706 Fix for Issue1260 2008-08-31 00:22:20 +02:00
Rocco Rutte
cc79439de6 highlight: only pygmentize for HTML mimetypes
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
2008-09-05 10:39:57 +02:00
Dirkjan Ochtman
83b9ec89ae bisect: status message when no action is specified 2008-08-21 19:02:56 +02:00
Dirkjan Ochtman
0e4ee54eec bisect: expand help text to explain REV argument and --noupdate 2008-08-21 19:02:46 +02:00
Christian Ebert
51ca48048e Make test-hardlinks-safety portable
On some systems cp cannot create/preserve hardlinks.
Use util.copyfiles instead, after making sure it actually does
create hardlinks.
2008-08-20 17:58:12 +02:00
Thomas Arendsen Hein
0e5b328695 Adjust test output for hg help qrecord since 0fd032cb1106 2008-08-20 15:04:45 +02:00
TK Soh
84cf853d31 update copyright dates in Windows installer's readme file 2008-08-20 10:31:19 +02:00
Peter Arrenbrecht
889ece79c4 mq: fix docs for qrefresh -D (issue1234) 2008-08-20 10:30:53 +02:00
Brendan Cully
36f1ad5346 Use relative imports in inotify.server.
Fixes an import failure I was getting under hgtk and hgweb:
*** failed to import extension inotify: 'module' object has no attribute 'inotify'
2008-08-19 15:36:03 -07:00
Benoit Boissinot
d179cdfe82 a socket error might be a tuple or a singleton 2008-09-06 00:45:13 +02:00
Matt Mackall
cbbba2c177 Added signature for changeset 43904606a95e 2008-08-13 17:11:53 -05:00
Remy Roy
1ec1bfb70c Folding correction and missing import 2008-08-12 10:05:00 -04:00
Matt Mackall
59a536d380 util: disinfect lookup_reg strings (issue1126)
lookup_reg could return Unicode strings, which would infect other strings and
generate unexpected tracebacks. Spotted by Rémy Roy.

Fold in silly nested function while we're at it.
2008-08-10 22:55:00 -05:00