Commit Graph

13461 Commits

Author SHA1 Message Date
Patrick Mezard
4158abce7f convert/svn: read trunk name once, use None for default 2011-03-03 22:19:28 +01:00
Patrick Mezard
1c127410a2 mq: mention qfinish in qimport help 2011-03-03 21:42:15 +01:00
Steve Borho
3d975f4e94 merge with stable 2011-03-02 22:00:41 -06:00
Steve Borho
9a4b1e24ec bookmark: fix invalidation of localrepo._bookmarkcurrent 2011-03-02 21:57:20 -06:00
Eric Eisner
bcb09d6c72 subrepo: show the source that git clones 2011-03-02 12:19:18 -05:00
Martin Geisler
e8a21642ee check-code: catch "echo > $HGRCPATH" too
Make error message consistent with the other error messages.
2011-03-02 14:52:31 +01:00
Martin Geisler
7f69ec3807 merge with stable 2011-03-02 14:23:22 +01:00
Martin Geisler
11500eaa6f check-code: better check for overwriting $HGRCPATH
Suggested by Mads Kiilerich on IRC.
2011-03-02 14:22:50 +01:00
Martin Geisler
27c7ce1873 test-eol-*: remove unused config settings 2011-03-02 14:16:11 +01:00
Martin Geisler
3334dc51b6 mq: forbid commit of merge involving mq patches 2011-03-02 14:09:06 +01:00
Matt Mackall
9b2d3c510c Added signature for changeset 1b5a9d02312a 2011-03-01 16:01:38 -06:00
Martin Geisler
83c27fb95f tests: don't overwrite HGRCPATH
Overwriting instead of appending to the file removes the [defaults]
section put into the file by run-tests.py.

It also defeats the --inotify option to run-tests.py.

(Nothing was broken yet, but the lack of -d "0 0" cause changeset
hashes to change unexpectedly in a test case I was editing.)
2011-03-01 17:01:17 +01:00
Gilles Moris
cd3e15208e contrib: update tcsh_completion for Mercurial 1.8
Added the following commands: bookmarks debugignore.
Fix the tcsh parse script for the current help text layout.
2011-03-01 07:28:20 +01:00
Matt Mackall
77a63d65a6 merge with i18n 2011-03-01 12:48:31 -06:00
FUJIWARA Katsunori
e20c3d9e56 i18n-ja: synchronized with b3a989ad994f 2011-03-01 22:44:03 +09:00
Wagner Bruna
8d168c1916 i18n-pt_BR: synchronized with cb0c081bca91 2011-03-01 01:00:35 -03:00
Augie Fackler
790d2fac2d zsh completion: complete bookmarks where they are accepted
This used to work because bookmarks were pseudo-tags, but broke
once bookmarks became their own first-class object.
2011-02-28 19:15:08 -06:00
Mads Kiilerich
eb342250cc tests: test-mq-subrepo.t Solaris 10 sh compliance
Solaris 10 sh do apparently not like temporary environment variable assignment
before a function call. There is no problem with commands.
2011-03-01 02:54:16 +01:00
Kevin Bullock
3a4f89086c bash_completion: complete bookmarks
Since bookmarks moved into core and are no longer merged with the list
of tags (8e2d23f4bd25), they don't get completed in bash_completion
along with other revision specifiers. This adds a new function to
provide the list of bookmarks for completion, and another, _hg_labels(),
to list all tags, branches, and bookmarks. It further modifies
completion for all commands where '_hg_tags; _hg_branches' was used to
use '_hg_labels' instead.
2011-02-28 16:45:15 -06:00
Matt Mackall
d0fa4e0180 mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
test from timeless to guard against regressing this
2011-02-28 17:41:40 -06:00
Pierre-Yves David
fa5d7584dd mq: gracefully handle malformated status file
This patch prevent mq to crash when .hg/patches/status contains Malformed lines
(without ":"). Blank lines are ignored and other malformed lines issue a
warning.
2011-02-11 13:10:39 +01:00
Mads Kiilerich
25da754c3d revset: fix typo when assigning weight to reverse and limit 2011-02-24 00:47:49 +01:00
Martin Geisler
8ccb77ff7e eol: do not abort on parse error
Handle parse errors in the .hgeol similarly to how parse errors in the
.hgtags file are handled: by issuing a warning. This allows the user
to revert the file using 'hg revert' or 'hg update -C'.
2011-02-28 15:46:48 +01:00
Martin Geisler
010793c962 eol: fix test typos introduced in f5579c036148 2011-02-28 11:34:51 +01:00
Martin Geisler
3ff64e3e9e eol: test win32text compatible encode/decode filters 2011-02-28 11:31:36 +01:00
Martin Geisler
1d26a9d184 eol: be explicit about how to enable hook (issue2661) 2011-02-28 09:28:18 +01:00
Antoine Pitrou
a5201c7f89 eol: stop after first matched rule in hook (issue2660)
When matching a file against the rules in .hgeol, the eol extension's
hook should stop after the first matching rule is encountered.
Otherwise, if this rule is contradicted by other more general rule
(for example a catch-all at the end of .hgeol), some files are simply
impossible to push. Trivial example:

  **.bat = CRLF
  **     = LF

If all matching rules were applied, a .bat file would be rejected
either because it has LFs (first rule) or because it has CRLFs (second
rule).
2011-02-27 19:50:28 +01:00
Matt Mackall
7fcadf8b92 merge with i18n 2011-02-27 15:58:29 -06:00
Adrian Buehlmann
d353d21e49 help: document branch template keyword
The branch keyword was added in 90d9a673aaed
2011-02-27 12:07:09 +01:00
Wagner Bruna
8fb57cd42b i18n-pt_BR: synchronized with fe28a35a29e3 2011-02-26 18:21:51 -03:00
Matt Mackall
6c089acfa6 merge with i18n 2011-02-26 10:40:22 -06:00
Jens Bäckman
f0ddfd142a i18n-sv: started translation of mq and patchbomb 2011-02-26 16:39:57 +01:00
Jens Bäckman
2b402536c0 i18n-sv: synchronized with 393a491ba39d 2011-02-26 16:31:11 +01:00
Ry4an Brase
c7fa18ccc0 ui: always report untrusted hgrc files when debug enabled
It was suggested in IRC that people disabling the reporting of unstructed hgrc
files can masquerade as problems.  This makes sure untrusted hgrc files are
always reported if --debug is used.
2011-02-25 23:26:24 -06:00
Pavel Boldin
b786abc779 convert.svn: branch name which equals trunk means `default' branch (issue2653)
Converting from subversion specifying config.svn.trunk results
in storing trunk under branch named as config.svn.trunk, where `default'
brunch is expected. Submission contains patch and test.
2011-02-25 21:01:30 +03:00
Wagner Bruna
cf857d2ef8 tests: test renaming a file added on two branches (issue2089)
The issue was fixed by 5455f79e4f3b .
2011-02-24 13:57:52 -03:00
Matt Mackall
6f9e4fb7c0 merge with i18n 2011-02-25 15:35:01 -06:00
Matt Mackall
8f5a9db068 context: be even more careful about result order in ancestors() (issue2642)
The earlier patch could be confused by more complicated topologies.
2011-02-25 15:31:32 -06:00
FUJIWARA Katsunori
75dfeb2112 i18n-ja: synchronized with fb734559dd4c 2011-02-25 22:26:02 +09:00
David Soria Parra
2f1c82ad07 i18n-de: translate some bookmark strings 2011-02-24 12:08:40 +01:00
David Soria Parra
aec4199dfb i18n-de: synchronized with bff31bf2f047 2011-02-24 12:07:42 +01:00
Martin Geisler
eeaf53e846 i18n-da: translate some small strings 2011-02-24 12:04:45 +01:00
Azhagu Selvan SP
c5a761259d convert/svn: abort operation when python bindings are not available
Subversion python bindings check was not present in svn_sink source
class which made it fail while using svn as destination repository.
Added a more maintainble svn bindings check for svn_source and svn_sink
classes.
2011-02-24 01:14:15 +05:30
Azhagu Selvan SP
346cc8ff15 convert/svn: handle MissingTool exception from converter_sink class
The converter_sink class had no way of handling MissingTool
exception. This change makes it to abort when there is a
MissingTool exception.
2011-02-24 00:45:02 +05:30
David Soria Parra
36125c089f bookmarks: restrict moving a bookmark to its descendants (issue1502)
A bookmark can only move to a descendant on commit, pull or
unbundle. Bookmarks cannot jump between heads anymore. This fixese
issue 1502.

We explicitly use new.node(), to emphasise that we are updating the
current bookmark to the new node.
2011-02-24 14:38:50 +01:00
Wagner Bruna
163c6a20af i18n-pt_BR: synchronized with a6fa507d66ad 2011-02-23 12:57:09 -03:00
Martin Geisler
b114a710ad i18n-da: synchronize with a609c5278125 2011-02-23 15:35:44 +01:00
Martin Geisler
b196a1ba62 i18n: merge with main 2011-02-23 15:31:49 +01:00
FUJIWARA Katsunori
09f7aa9864 i18n-ja: synchronized with ed4ddd4fa0dc 2011-02-23 23:15:02 +09:00
FUJIWARA Katsunori
b871413d57 i18n-ja: synchronized with 05da19201152 2011-02-23 22:52:38 +09:00