Commit Graph

15664 Commits

Author SHA1 Message Date
Mads Kiilerich
b08ea9058f tests: ignore slash direction in paths in test-notify-changegroup.t
Fixes testing on windows after 9801fdc244a0.
2011-12-26 16:57:14 +01:00
Matt Mackall
3c1ce2b49d merge with stable 2012-01-01 14:06:24 -06:00
Matt Mackall
bbe05357ea merge with stable 2012-01-01 14:05:03 -06:00
Matt Mackall
6638238c51 Added signature for changeset 02ea40439373 2012-01-01 13:46:50 -06:00
Matt Mackall
30aacfbca8 merge with i18n 2012-01-01 13:37:44 -06:00
Matt Mackall
439f06d5a0 merge with i18n 2012-01-01 13:37:30 -06:00
Alexander Sauta
d8b3b3593e i18n-ru: translated commands output up to the end 2012-01-01 19:45:06 +04:00
Alexander Sauta
8b8ac06ab2 i18n-ru: added missing strings in Mercurial help 2011-12-31 21:54:14 +03:00
FUJIWARA Katsunori
b977a4dff3 i18n-ja: synchronized with 3082e981a393 2011-12-31 15:23:05 +09:00
Matt Mackall
649efc7475 merge with stable 2011-12-30 17:04:36 -06:00
Matt Mackall
f3ededa444 convert: improve exception reporting for SVN logstream
- catch all exceptions
- pickle a stringified version of the exception
- use a normal abort

Hopefully this will result in less mysterious convert exceptions
2011-12-30 15:47:58 -06:00
Matt Mackall
2fc5d7ef51 fetch: fix unneeded commit when no merge attempted (issue2847) 2011-12-30 15:07:05 -06:00
Matt Mackall
02441ac6a9 fetch: patch cornercase in children calculation (issue2773) 2011-12-30 14:31:59 -06:00
Alexander Sauta
9aa28cf525 i18n-ru: translated missing commands output up to line 13868 2011-12-30 23:18:19 +03:00
Wagner Bruna
2567bf8f0d i18n-pt_BR: synchronized with 783c713954f6 2011-12-30 00:54:36 -02:00
Matt Mackall
c9f57cde0f merge with stable 2011-12-29 14:45:18 -06:00
Matt Mackall
e71ca537a7 merge with i18n 2011-12-29 14:44:30 -06:00
Matt Mackall
61f1d2e359 rollback: clarify --force text (issue3175) 2011-12-29 14:02:18 -06:00
FUJIWARA Katsunori
7cb93f1061 i18n-ja: synchronized with 25c2408b68b3 2011-12-29 16:10:53 +09:00
Michal Sznajder
1dd342b724 largefiles: clarify help when options are ignored until first add is done 2011-12-28 00:01:48 +01:00
Pierre-Yves David
7e4f710bf6 phases: prevent rebase to rebase immutable changeset. 2011-12-27 00:11:22 +01:00
Alexander Sauta
2b0fac37e9 i18n-ru: synchronized with 2720241b57f5, translated patchbomb 2011-12-26 22:05:48 +03:00
Pierre-Yves David
b57da0b2af phases: on copy clone, do not copy phases data if repote is publishing 2011-12-26 13:48:31 +01:00
Pierre-Yves David
4c85722ec4 phases: copy phases data on local clone 2011-12-26 13:47:37 +01:00
Michal Sznajder
09c755f459 largefiles: tiny code clean up
lfutil.islfilesrepo is a preffered way for testing if repo is largefiles enabled
2011-12-27 23:56:20 +01:00
FUJIWARA Katsunori
5a148330f8 windows: use normalized path as path to subrepo
path to subrepo is used to identify or check location of subrepo.

it should be normalized (in "/" delimiter form), because it is also
used with narrowmatcher which uses only normalized path even on
Windows environment.

this patch applies "util.pconvert()" on path to subrepo (called
"subpath") to normalize it.

for this patch, referers of below were checked.

  - subrepo.state()
  - subrepo.itersubrepos()
  - subrepo.subrepo()
  - context.sub()
  - context.substate()

typical usecase is:

    for subpath in ctx.substate:
        sub = ctx.sub(subpath)
        ... ctx.substate[subpath] ....

in this case, normalization has no side effect, because keys given
from substate are used as key itself.

other cases shown below also seem to require subpath to be normalized.

    - path components are joined by "/", in "commands.forget()":

        for subpath in ctx.substate:
            subforget[subpath + '/' + fsub] = (fsub, sub)

    - normalized "file" is used to check below condition, in
      "commands.revert()", "localrepository.commit()", and
      "localrepository._checknested()"

        file in ctx.substate

    - substate.keys() is passed to dirstate.walk()/status() which use
      only normalized pathes
2011-12-24 19:05:35 +09:00
FUJIWARA Katsunori
be239ba6ee windows: use normalized path to check repository nesting
current "localrepository._checknested()" uses specified path itself to
compare against subrepo pathes.

it is invoked from "hgsubrepo.subrepo()" or pathauditor (as callback),
and both use "os.sep" as separator.

this causes unexpected nesting check result, if subrepo configuration
uses "/" as path separator for sub repo path.

this path uses "/" to join path components (or apply "util.pconvert()"
on path) to normalize.
2011-12-24 19:05:25 +09:00
FUJIWARA Katsunori
529dcf14a4 windows: force specified path to be audited in localpath form
pathauditor is invoked not only for localpath form using "os.sep" as
separator, but also for normalized form using "/": for example, hg
internal path like "store/data" under ".hg", or ones normalized by
match object

this causes insufficient repository nesting check, because current
pathauditor implementation divides specified path into components by
"os.sep", and this causes to treat multiple path components joined by
"/" as single one on Windows environment.

this patch applies "util.localpath()" on specified path to force it to
be divided into components correctly.

in fact, root for pathauditor also uses multiple path separator on
Windows. but this does not affect audit itself, so "util.localpath()"
is not applied on it.
2011-12-24 19:01:07 +09:00
Laurens Holst
8daae4999d context: add isbinary function 2011-12-21 18:20:15 +01:00
Pierre-Yves David
84e54fd93c rebase: add a "D" short option for detach
Detach is usually what I want when I use --source or (in particular) --rev.
Having a shorter option make it less an hassle to use it.
2011-12-27 21:12:09 +01:00
Pierre-Yves David
30c8f3e74a rebase: allow --detach when --rev is used
--rev is only a more specific --source and there is no reason to refuse to use
detach with it.
2011-12-27 20:45:46 +01:00
Matt Mackall
dc09090fed merge with stable 2011-12-26 18:08:20 -06:00
Matt Mackall
282d4f5a2e merge with i18n 2011-12-26 18:07:49 -06:00
Alexander Sauta
710f7422e2 i18n-ru: translated notify, pager 2011-12-25 19:49:14 +03:00
FUJIWARA Katsunori
8a4c96d3b4 icasefs: add test for case preservation on case insensitive filesystem
"hg qpush" causes unexpected behavior, if case preservation on case
insensitive filesystem is not enough.

this patch adds the test using mixed-case filenames to reproduce this
problem on any case insensitive filesystems.
2011-12-24 19:16:36 +09:00
FUJIWARA Katsunori
20f2cd3a0c i18n: use "encoding.lower()" to normalize string in hgweb search query
some problematic encoding (e.g.: cp932) uses ASCII alphabet characters
in byte sequence of multi byte characters.

"str.lower()" on such byte sequence may treat distinct characters as
same one, and cause unexpected log matching.

this patch uses "encoding.lower()" instead of "str.lower()" to
normalize strings for compare.
2011-12-25 20:35:16 +09:00
FUJIWARA Katsunori
09db6940ae i18n: use "encoding.lower()" to normalize specified string for revset
some problematic encoding (e.g.: cp932) uses ASCII alphabet characters
in byte sequence of multi byte characters.

"str.lower()" on such byte sequence may treat distinct characters as
same one, and cause unexpected log matching.

this patch uses "encoding.lower()" instead of "str.lower()" to
normalize strings for compare.
2011-12-25 20:35:16 +09:00
FUJIWARA Katsunori
9dd2a411a7 i18n: use "encoding.lower()" to normalize specified keywords for log searching
some problematic encoding (e.g.: cp932) uses ASCII alphabet characters
in byte sequence of multi byte characters.

"str.lower()" on such byte sequence may treat distinct characters as
same one, and cause unexpected log matching.

this patch uses "encoding.lower()" instead of "str.lower()" to
normalize strings for compare.
2011-12-25 20:35:16 +09:00
FUJIWARA Katsunori
a8d00559c9 win32mbcs: allow win32mbcs extension to be enabled on cygwin platform
this patch allows win32mbcs extension to be enabled on cygwin platform
for problematic character encodings.

on recent cygwin platform, even though
"os.path.supports_unicode_filenames" is False, "os.listdir()" and
other path manipulation functions can return the result correctly
decoded in unicode for invocations with unicode arguments, if locale
is configured properly.

existing code to check "os.path.supports_unicode_filenames" is kept to
prevent win32mbcs from being enabled on unexpected platform.
2011-12-25 20:32:48 +09:00
FUJIWARA Katsunori
3abfeb7e54 icasefs: rewrite comment to explain situtation precisely 2011-12-24 00:52:06 +09:00
FUJIWARA Katsunori
b180efb872 icasefs: follow standard cache look up pattern 2011-12-24 00:51:14 +09:00
FUJIWARA Katsunori
1edd7d1c6d icasefs: disuse length check against un-normcase()-ed filenames
this patch disuses length check against un-normcase()-ed filenames
gotten by "os.listdir()", because there is no assurance that
filesystem stores filenames normalized except in letter case, even
though some case insensitive filesystems (in some environment, for
some language setting) store them in such manner.
2011-12-24 00:50:56 +09:00
Matt Mackall
11aa73a675 merge with stable 2011-12-22 15:56:27 -06:00
Matt Mackall
d818ed051b merge with i18n 2011-12-22 15:56:17 -06:00
Pierre-Yves David
8abd0aa7c9 phases: do not exchange secret changesets
Any secret changesets will be excluded from pull and push. Phase data are
properly synchronized on pull and push if a changeset is seen as secret locally
but is non-secret remote side.

This patch does not handle the case of a changeset secret on remote but known
locally.
2011-12-22 00:42:25 +01:00
Pierre-Yves David
ef5fe34436 phases: test the new-commit option and proper inheritence of phase 2011-12-22 00:40:46 +01:00
Fabian Kreutz
574046fada i18n-de: Translations and fixes until line 6000; more annotations 2011-12-21 11:48:18 +02:00
Kevin Bullock
0fb78c49bd graft: use consistent language in help
Removes the word 'aborted' from the 3rd paragraph in favor of
'interrupted', the same word used in the description of the
-c/--continue switch. The word 'interrupted' is also consistent with
the help for rebase.
2011-12-20 14:11:14 -06:00
Matt Mackall
c0c746bcbd largefiles: copy files in binary mode (issue3164) 2011-12-20 11:43:38 -06:00
Alexander Sauta
31525035a1 i18n-ru: translated inotify, interhg; skipped strings added 2011-12-19 22:40:59 +03:00