Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Dec 2011 23:56:15 +0100] rev 15707
phases: implement ``phase()`` and ``hidden()`` method for workingctx
Working ctx don't have revision number and need a dedicated implementation.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 20 Dec 2011 01:31:25 +0100] rev 15706
Add a phases.new-commit option to control minimal phase of new commit
this option is both intended for human and internal code usage.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 20 Dec 2011 01:34:12 +0100] rev 15705
phases: update doc to mention secret phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Dec 2011 23:47:18 +0100] rev 15704
phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Dec 2011 23:31:38 +0100] rev 15703
phases: add a mutable boolean property on context
Laurens Holst <laurens.hg@grauw.nl> [Tue, 20 Dec 2011 20:36:40 +0100] rev 15702
ignore: add files present in the hackable-hg windows distribution
Kevin Bullock <kbullock@ringworld.org> [Tue, 20 Dec 2011 14:11:14 -0600] rev 15701
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.
Matt Mackall <mpm@selenic.com> [Wed, 21 Dec 2011 14:36:08 -0600] rev 15700
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 20 Dec 2011 11:43:38 -0600] rev 15699
largefiles: copy files in binary mode (issue3164)
Alistair Bell <alistair.bell@netronome.com> [Thu, 15 Dec 2011 16:41:03 -0500] rev 15698
diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153)
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 '.'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15667
icasefs: consider as case sensitive if there is no counterevidence, for safety
for safety, this patch prevents case-less name from misleading into
case insensitivity, even though such names should not be used.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15666
pathauditor: switch normcase logic according to case sensitivity of filesystem
this patch applies 'util.normcase()' to audit path only on case
insensitive filesystem.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15665
pathauditor: preserve case in abort messages
this patch uses both plain and normcase()-ed pathes to preserve letter
case of path in abort messages.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15664
pathauditor: use normcase()-ed path for audit result cache
in current pathauditor implementation, un-normcase()-ed path is
stored into and compared with audit result cache.
this is not efficiency on case insensitive filesystem.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:35:00 +0100] rev 15663
largefiles: handle merges between normal files and largefiles (issue3084)
The largefiles extension prevents users from adding a normal file
named 'foo' if there is already a largefile with the same name.
However, there was a loop-hole: when merging, it was possible to bring
in a normal file named 'foo' while also having a '.hglf/foo' file.
This patch fixes this by extending the manifest merge to deal with
these kinds of conflicts. If there is a normal file 'foo' in the
working copy, and the other parent brings in a '.hglf/foo' file, then
the user will be prompted to keep the normal file or the largefile.
Likewise for the symmetric case where a normal file is brought in via
the second parent. The prompt looks like this:
$ hg merge
foo has been turned into a largefile
use (l)argefile or keep as (n)ormal file?
After the merge, either the '.hglf/foo' file or the 'foo' file will
have been deleted. This would cause status to return output like:
$ hg status
M foo
R foo
To fix this, the lfiles_repo.status method is changed so that a
removed normal file isn't shown if there is largefile with the same
name, and vice versa for largefiles.
David Soria Parra <dsp@php.net> [Wed, 14 Dec 2011 15:41:08 +0100] rev 15662
progress: check for ui.quiet and ui.debugflag before we write
ui.quiet and ui.debugflag are not initialized during uisetup and
reposetup. progressui is always initialized, therefore we have to check
during write() if ui.quiet is set or not.
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2011 18:23:15 -0600] rev 15661
changelog: handle decoding of NULs in extra more carefully (issue3156)
Escaped NULs adjacent to [0-7] could be decoded as octal. This hits
about 0.24% of changesets with transplant, which stores binary nodes.
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 16:50:21 -0600] rev 15660
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 15 Dec 2011 23:08:09 +0100] rev 15659
phases: change publish behavior to only alter behavior when server.
Older publish=True was:
1) Content of Publishing server are seen as public by client.
2) Any changegroup *added* to a publish=True server is public.
New definition are:
1) Content of Publishing server are seen as public by client.
2) Any changegroup *pushed* to a publish=True server is public.
See mercurial/phase.py documentation for exact final behavior
Kevin Gessner <kevin@fogcreek.com> [Thu, 15 Dec 2011 13:19:43 -0500] rev 15658
largefiles: don't require a user cache (issue3088) (issue3155)
If the user cache path isn't specified in .hgrc, and it can't be constructed
from the environment, don't try to use that cache.
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 15:27:11 -0600] rev 15657
util: don't mess with builtins to emulate buffer()
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:59:22 -0600] rev 15656
util: clean up function ordering
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:37:36 -0600] rev 15655
merge with stable
Nikolaus Schueler <nikolaus.schueler@lantiq.com> [Thu, 15 Dec 2011 13:57:54 +0100] rev 15654
notify: change behavior of "changegroup" hook
Change the behavior so that the sender (the "From" header in the notification
mail) in case of the "changegroup" hook is the user that did the first commit
in the changegroup. The option is configurable, if you set "notify.fromauthor"
to "True" in your config, the new behavior is activated. If you do not set the
option, the behavior is as before. The commit adds to an existing test to show
various aspects of the changed behavior.
Na'Tosha Bard <natosha@unity3d.com> [Thu, 15 Dec 2011 16:23:26 +0100] rev 15653
largefiles: optimize status when files are specified (issue3144)
This fixes a performance issue with 'hg status' when files are specified
on the command-line. Previously, a large amount of largefiles code was
executed, even if files were specified on the command-line and those files
were not largefiles. This patch fixes the problem by first checking if
non-largefiles were specified on the command-line and, just letting the
normal status function handle the case if they were.
On a brand new machine, the execution time for 'hg status filename' on
a repository with largefiles was:
real 0m0.636s
user 0m0.512s
sys 0m0.120s
versus the following (the same repository, with largefiles disabled):
real 0m0.215s
user 0m0.180s
sys 0m0.032s
After this patch, the performance of 'hg status filename' on the same
repository, with largefiles enabled is:
real 0m0.228s
user 0m0.189s
sys 0m0.036s
This performance boost is also true when patterns (rather than specific
files) are specified on the command-line.
In the case where patterns are specified in addition to a file list, we
just defer to the normal codepath in order to not spend extra time
expanding the patterns to just risk having to expand them again later.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 12 Dec 2011 15:16:58 +0100] rev 15652
wireproto: handle other server output in pushkey
Remote side may add useful information alongside failure return code. For
example "ssl is required". This patch mirror what is done for the unbundle
command.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:45:01 +0100] rev 15651
phases: exchange phase boundaries on push
For now phase sync is tried even if push fails with some know pathological
case. The exact behavior is to be discussed and implemented later.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:28:42 +0100] rev 15650
phases: exchange phase boundaries on pull
Add an extra argument to addchangegroup to all phase code to execute before the
lock is released.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 15 Dec 2011 02:18:24 +0100] rev 15649
phases: add a function to compute heads from root
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:24:26 +0100] rev 15648
phases: add basic pushkey support