Commit Graph

14719 Commits

Author SHA1 Message Date
Steve Borho
123c48ed44 wix: catch up with more added files
revsets:  1.7::tip and adds("mercurial/help/**")
          1.7::tip and adds("mercurial/templates/**")
2011-06-30 12:55:19 -05:00
Wagner Bruna
4d2b25559b i18n-pt_BR: translate template filter descriptions 2011-06-30 20:37:32 -03:00
Wagner Bruna
2c14e6963e i18n-ja: recover template translations from a5bdb59b0d72
These translations were removed by 6ece57fe1de5 because the original
strings were transfered to the docstrings (401e7330c70d) without
the corresponding sources being added to the Makefile for extraction.
2011-06-30 20:05:23 -03:00
Alexander Sauta
35f649409c i18n-ru: fixed mixed up msgid and msgstr in annotate 2011-07-01 00:26:45 +04:00
Alexander Sauta
6701bbd038 i18n-ru: translated missing strings for commands, some typos corrected 2011-07-01 00:14:30 +04:00
Wagner Bruna
cf1c711d4f i18n-pt_BR: synchronized with a6885c8c0069 2011-06-29 18:19:17 -03:00
Matt Mackall
b80e3885ef merge with i18n 2011-06-29 16:05:41 -05:00
FUJIWARA Katsunori
df06e4bf58 i18n-ja: synchronized with b701a732142a 2011-06-30 01:55:14 +09:00
Alexander Sauta
9de8f36e3c i18n-ru: translated help for urls. Thus, all stock commands and help translated 2011-06-29 19:04:03 +04:00
Alexander Sauta
22e7db2d25 i18n-ru: translated help for templating 2011-06-29 16:14:26 +04:00
Adrian Buehlmann
182911e62d wix: add missing templates/paper/diffstat.tmpl 2011-06-29 12:54:34 +02:00
Jesse Long
33d5742949 hgweb: treat branch attribute closed' as more important than inactive'
In the branches page, branches that are closed and are merged into another
branch are displayed as `inactive'. This patch changes that behaviour to
show these branches as `closed'.

For me, the `closed' attribute is more important than the `inactive'
attribute.

Branches that are not closed, and are merged into other branches will still
be shown as `inactive'.

Branches that are closed, and are not merged into other branches will still
be shown as `closed'.
2011-06-29 09:36:45 +02:00
Idan Kamara
02ffbb9696 tests: add basic commandserver test 2011-06-29 15:49:35 +03:00
Brodie Rao
e231f6710d color: for the sake of "less -R", default to ansi in auto mode (issue2792)
less with the -R option only supports ANSI color codes, and terminfo
mode issue non-ANSI color codes (depending on the database). The -r
option can work around this, but there are users currently using the
-R option, and defaulting to terminfo would break colorization in less
for them without warning.
2011-06-29 13:20:40 -04:00
Brodie Rao
5123ea27df color: fix TypeError with auto mode on win32 when colors aren't available (issue2871)
This can happen when stdout isn't a terminal (e.g., it's being piped).
2011-06-29 13:20:39 -04:00
Jens Bäckman
563b99c00c i18n-sv: synchronized with b89c5d04dfcc 2011-06-29 09:24:45 +02:00
Wagner Bruna
864100241a i18n-pt_BR: synchronized with e8213c8b46d2 2011-06-28 14:32:54 -03:00
Alexander Sauta
e94015a995 i18n-ru: translated help for multirevs-subrepos 2011-06-28 20:42:07 +04:00
Martin Geisler
ec3b5c1cfc i18n-da: translate hg.1.html header 2011-06-28 10:06:56 +02:00
Adrian Buehlmann
13cd3f341f test-revert: add revert --all case when nothing changed
supposed to succeed without notice
2011-06-28 00:56:33 +02:00
Matt Mackall
8e3367eb55 subrepos: be smarter about what's an absolute path (issue2808) 2011-06-29 16:01:06 -05:00
Thomas Arendsen Hein
e2aeb2930a test-wireprotocol.py: rename to test-wireproto.py for consistency
1. The module named 'wireproto' is tested.
2. There already is a test-wireproto.t for related tests on shell level.
2011-06-29 13:04:00 +02:00
Thomas Arendsen Hein
692a53d202 classes: fix class style problems found by 06e968819ac9
This makes test-wireprotocol.py work on Python 2.4
2011-06-29 15:00:00 +02:00
Thomas Arendsen Hein
4575d54a81 check-code: fix class style checking (with tests)
- old-style classes were only checked for one-letter class names
- add check for new-style classes with empty parent class, because
  this is not available in Python 2.4
2011-06-29 13:45:51 +02:00
Mads Kiilerich
1b1811c0d4 tests: ignore inotify extension in test-duplicateoptions.py
The inotify extension is only available on linux and setup.py will not install
it on other platforms - but it will of course always be there in the source.

test-duplicateoptions.py tried to load most extensions (including inotify if
available). When the local uninstalled Mercurial was used it would thus always
load the inotify extension and cause a warning on unsupported platforms.

The inotify extension is not relevant for this test, so now we explicitly
ignore it.
2011-06-29 00:19:27 +02:00
Alexander Sauta
f0023dbc47 i18n-ru: translated help for merge-tools 2011-06-28 00:34:49 +04:00
Alexander Sauta
b7c0d7705e i18n-ru: translated help for hgignore 2011-06-27 21:34:48 +04:00
Martin Geisler
327d2f3053 i18n-pt_BR: add lost translation used in test-i18n.t
Changeset fbd2ad9d77be replaced the Portuguese translation with the
English original and broke the test.
2011-06-28 09:58:39 +02:00
Martin Geisler
9c81f22e34 i18n: merge with main 2011-06-28 09:42:45 +02:00
Danek Duvall
748bbc348d color: be silent when falling back to ECMA-48 mode if "auto" mode was desired
Don't warn about missing setab/setaf terminfo entries unless we explicitly
asked for terminfo mode; fallback to ECMA-48 mode silently.
2011-06-27 11:36:42 -07:00
Danek Duvall
20a33c579c tests: hardcode terminfo entry for the terminfo color test
For the terminfo color test, make sure that the terminfo entry used is one
of our own choosing, by delivering a special "hgterm" entry (a copy of
ncurses' xterm-color), compiling it, and specifically pointing curses to it
using the TERMINFO and TERM environment variables.  This means we can
ignore the variability in different terminal definitions on different
platforms.
2011-06-27 11:36:40 -07:00
Wagner Bruna
cf4e2abdf2 i18n-pt_BR: synchronized with 17ed24f2bb3e 2011-06-27 15:12:41 -03:00
Wagner Bruna
8e2edefeab i18n-ru: drop executable bit from .po file 2011-06-27 15:09:55 -03:00
Martin Geisler
5fd7504972 i18n: merge with main
This includes four i18n changesets transplanted from the default
branch to the stable branch since they were made after the freeze.
2011-06-27 19:10:45 +02:00
Wagner Bruna
a57ec020c9 localrepo: mark progress step for translation 2011-06-26 15:47:39 -03:00
Adrian Buehlmann
9b3812c8c6 revert: improve hints on abort when reverting to parent without --all
BEFORE:

    $ hg revert
    abort: no files or directories specified
    (use --all to discard all changes)

AFTER:

  Uncommitted changes (using --all *will* nuke edits):

    $ hg revert
    abort: no files or directories specified
    (uncommitted changes, use --all to discard all changes)

  Clean working directory (using --all won't discard anything):

    $ hg revert
    abort: no files or directories specified
    (use --all to revert all files)
2011-06-26 01:13:30 +02:00
Pierre-Yves David
2ebc0660c3 requirements: show all missing features in the error message.
Displaying all missing featureis help people to solve the issue (choosing the
right version, creation the right repo)
2011-06-25 02:30:24 +02:00
Pierre-Yves David
f95a6cfc12 error: Add a hint argument to RepoError
This use the same mechanism than Abort. Except clause stay distinct
because RepoError add "!" at the end of the message.
2011-06-25 02:30:17 +02:00
Adrian Buehlmann
bb2cb4edc9 test-revert: add case for nothing changed 2011-06-24 23:29:51 +02:00
Idan Kamara
a1bff0c5fe dispatch: set config options on the request repo.ui 2011-06-24 19:44:59 +03:00
Idan Kamara
f0f55bda59 dispatch: return read config options 2011-06-24 19:44:59 +03:00
Idan Kamara
122edf3c57 dispatch: set global options on the request repo.ui
If the request has a repo, and global options such as --verbose are passed,
we need to set those explicitly on the repo.ui.
2011-06-24 19:44:58 +03:00
Idan Kamara
b66cd482a9 cmdserver: assign repo.baseui before running commands
There are places in the code that use localrepository.baseui (see hg.remoteui),
we need the ui descriptors (and possibly other things) to be set
correctly on it, so output written to the remoteui descriptors ends up at the
right place.

Before this change, tests such as 'test-bookmarks-pushpull.t' didn't work.
2011-06-24 19:44:17 +03:00
Idan Kamara
29b1c451dc cmdserver: copy repo.ui before running commands 2011-06-24 19:43:59 +03:00
Idan Kamara
c368cbab93 dispatch: set descriptors on the request repo.ui 2011-06-24 19:38:28 +03:00
Idan Kamara
22edb918b3 dispatch: pass the correct ui to runcommand
For commands that take a repo, repo.ui is passed as the ui to runcommand.
This restores that behaviour when the request has a repo.
2011-06-24 19:36:44 +03:00
Idan Kamara
446fde5f1b filemerge: use ui out descriptor when calling util.system 2011-06-24 17:04:37 +03:00
Idan Kamara
05ff7deb85 archive: wrap the ui descriptor so it doesn't get closed
archival.tarit closes the fileobj if one is passed to it, which is undesired
when reading from '-'.
2011-06-24 17:04:37 +03:00
Idan Kamara
dedd139496 transplant: use ui out descriptor when calling util.system 2011-06-24 19:27:53 +03:00
Idan Kamara
eb3fbf796f bisect: use ui out descriptor when calling util.system 2011-06-24 17:04:37 +03:00