Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 11:37:44 +0100] rev 15697
phases: add a function to compute visible heads
This function will be used to hide secret changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 18 Dec 2011 23:16:46 +0100] rev 15696
phases: Add a third phase for secret changeset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 11:29:39 +0100] rev 15695
phases: fix advanceboundary behavior when targetphase !=0
Changeset was properly removed from upper phase but was not explicitly added to
target phase. If advanced changesets had not pwasnt in target phase they was
considered public (0-phase).
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 18 Dec 2011 23:15:12 +0100] rev 15694
phases: add a bit more test for local phase movement.
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:33 -0600] rev 15693
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:26 -0600] rev 15692
merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:09 -0600] rev 15691
merge with i18n
Martin Schröder <martinschroeder@vcp-sh.de> [Mon, 19 Dec 2011 13:02:30 +0100] rev 15690
i18n-de: several new translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:47:17 -0200] rev 15689
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:43:18 -0200] rev 15688
i18n-pt_BR: synchronized with
dc5d1394ecd1
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:44:08 -0200] rev 15687
merge with i18n
Alexander Sauta <demosito@gmail.com> [Fri, 16 Dec 2011 10:13:46 +0300] rev 15686
i18n-ru: translated purge, progress, rebase
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 02:27:55 +0700] rev 15685
i18n-ru: editing for 'push' and 'pull'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 01:56:57 +0700] rev 15684
i18n-ru: editing for 'commit'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 00:48:54 +0700] rev 15683
i18n-ru: editing for 'directory'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 00:43:31 +0700] rev 15682
i18n-ru: editing for 'remote'
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 22:55:43 +0700] rev 15681
i18n-ru: editing for 'repository'
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 01:51:08 +0700] rev 15680
i18n-ru: editing for 'store' (largefiles concept)
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 01:40:30 +0700] rev 15679
i18n-ru: editing for 'branch'
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 01:11:46 +0700] rev 15678
i18n-ru: spellcheck
Alexander Sauta <demosito@gmail.com> [Mon, 12 Dec 2011 00:03:26 +0300] rev 15677
i18n-ru: glossary synchronized with wiki, still requires fixing
Alexander Sauta <demosito@gmail.com> [Sun, 11 Dec 2011 23:28:57 +0300] rev 15676
i18n-ru: mq translated
Alexander Sauta <demosito@gmail.com> [Thu, 08 Dec 2011 20:12:56 +0300] rev 15675
i18n-ru: largefiles strings fixed
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2011 19:05:59 -0600] rev 15674
merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:21:27 +0900] rev 15673
merge: check filename case collision between changesets for branch merging
this patch makes branch merging abort when merged changesets have same
file in different case on case insensitive filesystem.
this patch does not prevent linear update which merges between target
and working contexts, because 'branchmerge' is False in such case.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:41 +0900] rev 15672
i18n: use encoding.lower/upper for encoding aware case folding
this patch uses encoding.lower/upper for case folding, because ones of
str can not fold case of non ascii characters correctly.
to avoid cyclic dependency and to encapsulate logic of normcase in
each platforms, this patch introduces encodinglower/encodingupper in
both posix/windows specific files.
this patch does not change implementation of normcase() in posix.py,
because we do not know the encoding of filenames on POSIX.
some "normcase()" are excluded from function wrap list in
hgext/win32mbcs.py, because they become encoding aware by this patch.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15671
windows: use upper() instead of lower() or os.path.normcase()
this patch uses upper() instead of lower() or os.path.normcase() for
case folding on Windows(NTFS), because lower-ing causes problems for
some languages on it.
see below for detail about problem of lower-ing:
https://blogs.msdn.com/b/michkap/archive/2005/01/16/353873.aspx
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15670
icasefs: avoid normcase()-ing in util.fspath() for efficiency
'dirstate._normalize()', the only caller of 'util.fspath()', has
already normcase()-ed path before invocation of it.
normcase()-ed root can be cached on dirstate side, too.
so, this patch changes 'util.fspath()' API specification to avoid
normcase()-ing in it.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15669
icasefs: use util.normcase() instead of lower() or os.path.normcase in fspath
this also avoids lower()-ing on each path components by reuse the path
normcase()-ed at beginning of function.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15668
dirstate: prevent useless util.fspath() invocation for '.'
at first of dirstate.walk() on case insensitive filesystem,
normalization of '.' causes util.fspath() invocation, but '.' is not
cached in it.
this invocation is not only useless, but also harmful: initial "hg
tag" causes creation of ".hgtags" file after dirstate.walk(), and
looking up ".hgtags" in cache will fail, because directory contents of
root is already cached at util.fspath() invocation for '.'.