Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:50:12 +0100] rev 20014
check-code: document last ignore regexp
For easier remembering to delete when it is not needed anymore.
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:49:05 +0100] rev 20013
check-code: drop unneeded ignore patterns
The exceptions seem to have disappeared.
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:44:28 -0500] rev 20012
merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:34:05 -0500] rev 20011
merge with i18n
Durham Goode <durham@fb.com> [Fri, 15 Nov 2013 13:20:49 -0800] rev 20010
contrib: add editmerge script for editor conflict prompts
Adds a script that opens the editor to the conflict as part of the merge
process. This way you can fix the merge during the rebase instead of having to
pause the rebase, resolve --mark, rebase --continue.
Only works on unix.
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 21:37:18 -0600] rev 20009
strip: fix last unprotected mq reference (
issue4097)
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 18:07:43 -0600] rev 20008
tests: skip tests that require not having root (
issue4089)
This adds a new root hghave to test against. Almost all of these are a
subset of unix-permissions, but that is also used for checking exec
bit handling.
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 17:17:44 -0600] rev 20007
make: restrict recursion in make clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 12 Nov 2013 00:07:23 +0900] rev 20006
scmutil: skip checks in "casecollisionauditor" if filename is already checked
Before this patch, almost all of check code in
"casecollisionauditor.__call__()" is executed, even if specified
filename is already checked, because "f in self._newfiles" is examined
lastly.
In addition to it, adding "fl" to "self._loweredfiles" and "f" to
"self._newfiles" are also redundant in such case.
This patch checks "f in self._newfiles" first, and returns immediately
to avoid execution of check code for efficiency.
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 10:21:20 +0100] rev 20005
check-code: prepend warning prefix only once, but for each warning
The code adding the prefix is now run once per pattern. It was run once per
file (after the change
3e1e4a8aec1e).
Demonstrate that it is working now by extending the test. Raise two different
warnings, one of them twice.
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 13 Nov 2013 16:46:46 -0200] rev 20004
hgweb, i18n: do not translate search mode description
The search mode description can't be translated by itself, since
it's displayed as part of a template phrase (the "Assuming ..."
/ "Use ... instead" bits). Just drop the translation markers for
now, since the templates themselves currently do not support
translations.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20003
tests: end output lines including path with "(glob)" to pass on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20002
tests: quote environment variable to extract wildcard on MinGW environment
On MinGW environment, the command line below in test script can't
extract wildcard "*" and remove target files correctly.
$ rm $ENVVAR/foo/bar.*
To extract wildcard, environment variable should be quoted by double
quotation like below:
$ rm "$ENVVAR"/foo/bar.*
This patch also omits "-f" of "rm" to know whether files are removed
or not by exit code of it.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20001
tests: choose the path separator in PYTHONPATH suitable for platform
Before this patch, test code introduced by
e3a5922e18c3 into
test-extension.t always uses ":" as the path separator in PYTHONPATH.
But ";" should be used on Windows.
This patch chooses the path separator in PYTHONPATH suitable for
platform.
Mads Kiilerich <madski@unity3d.com> [Fri, 08 Nov 2013 12:35:50 +0100] rev 20000
util: warn when adding paths ending with \
Paths ending with \ will fail the verification introduced in
684a977c2ae0 when
checking out on Windows ... and if it didn't fail it would probably not do what
the user expected.
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:00:31 +0100] rev 19999
check-code: more replacement characters
for finding '.. note::' (even) more exact by using more characters:
replace '.' with 'p' and ':' with 'q'
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:00:31 +0100] rev 19998
check-code: check comment for '.. note::' without two newlines
Because string entries are replaced before matching, we must search for
the transformed pattern. But it seems to be quite unique and does not return
false matches. If it will, they can be listed as 3rd arg in pypats.
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 08:59:55 +0100] rev 19997
documentation: add an extra newline after note directive
Like this no docutils version interprets any line in the following text as
argument of note.
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19996
tests: modify minirst test input to new format
Modifying the test input data shows the effects of the last patches.
In text output nothing has changed.
In html output the title has moved on its own line.
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19995
minirst: do not add a 2nd empty paragraph
This does not add a separating block after a separated note directive.
.. note::
text
is formatted to
Note:
text
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19994
minirst: find admonitions before pruning comments and adding margins
Lines with only a directive are not deleted anymore because they are detected
before comments are deleted by prunecomments().
addmargins() will be adapted later.
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19993
minirst: do not fail on an empty admonition block
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19992
minirst: do not interpret a directive as a literal block
When a directive was on its own line, it was interpreted as a literal block.
Example of problematic input:
.. note::
a note text
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:43:36 +0100] rev 19991
Makefile: do update on a temporary copy of a po file
This avoids having a half completed file (with a new timestamp) when msgmerge
has failed.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Nov 2013 10:52:41 -0200] rev 19990
i18n-pt_BR: synchronized with
d24ee6d7d167
Matt Mackall <mpm@selenic.com> [Thu, 07 Nov 2013 15:24:23 -0600] rev 19989
date: allow %z in format (
issue4040)
Matt Mackall <mpm@selenic.com> [Wed, 06 Nov 2013 16:36:07 -0600] rev 19988
merge with stable
Siddharth Agarwal <sid0@fb.com> [Wed, 06 Nov 2013 10:20:18 -0800] rev 19987
merge: move forgets to the beginning of the action list
Forgets need to be in the beginning of the action list, same as removes. This
lets us avoid clashes in the dirstate where a directory is forgotten and a
file with the same name is added, or vice versa.
Durham Goode <durham@fb.com> [Fri, 01 Nov 2013 17:08:06 -0700] rev 19986
rebase: fix working copy location after a --collapse (
issue4080)
Rebasing with --collapse would leave the working copy on the parent of the
collapsed commit, instead of on the collapsed commit. This fixes that. Also
fixes a few tests that already covered this area but had bad data.
This also fixes
issue3716 where bookmarks are not kept across rebases with
--collapse. I updated the test to cover that case as well.
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 12:53:39 -0500] rev 19985
Merge with stable.
Durham Goode <durham@fb.com> [Mon, 04 Nov 2013 19:59:00 -0800] rev 19984
rebase: fix rebase aborts when 'tip-1' is public (
issue4082)
When aborting a rebase where tip-1 is public, rebase would fail to undo the merge
state. This caused unexpected dirstate parents and also caused unshelve to
become unabortable (since it uses rebase under the hood).
The problem was that rebase uses -2 as a marker rev, and when it checked for
immutableness during the abort, -2 got resolved to the second to last entry in
the phase cache.
Adds a test for the fix. Add exception to phase code to prevent this in the
future.
Augie Fackler <raf@durin42.com> [Tue, 05 Nov 2013 13:25:45 -0500] rev 19983
Merge with stable.
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:04 +0100] rev 19982
check-code: prepend warning prefix for repeated warnings only once
When a warning occured several times in one file, "warning: " was prepended
several times:
examplefile.py:3:
> def a(object):
warning: this looks wrong
examplefile.py:27:
> def x(object):
warning: warning: this looks wrong
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:33 +0100] rev 19981
check-code: fix an error message
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Nov 2013 10:55:45 +0100] rev 19980
test: do not add .pyc and .orig in test-commit-amend.t (
issue4085)
This makes the test fails with disabled byte-compilation
(PYTHONDONTWRITEBYTECODE="1" environmental variable).
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:18 -0500] rev 19979
Added signature for changeset
d825e4025e39
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:14 -0500] rev 19978
Added tag 2.8 for changeset
d825e4025e39
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:03 -0500] rev 19977
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Nov 2013 11:04:48 -0200] rev 19976
i18n-pt_BR: fix a few missing changes on
95304251c376
Wagner Bruna <wbruna@yahoo.com> [Thu, 31 Oct 2013 00:25:20 -0200] rev 19975
i18n-pt_BR: synchronized with
95304251c376
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 31 Oct 2013 03:05:46 +0900] rev 19974
i18n-ja: synchronized with
1d7a36ff2615
Johan Bjork <jbjoerk@gmail.com> [Sun, 13 Oct 2013 08:38:30 -0400] rev 19973
patch: ensure valid git diffs if source/destination file is missing (
issue4046)
This is arguably a workaround, a better fix may be in the repo to
ensure that it won't list a file 'modified' unless there is a file
context for the previous version.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 27 Oct 2013 00:24:25 +0900] rev 19972
histedit: add description about exit code
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 27 Oct 2013 00:24:25 +0900] rev 19971
rebase: add description about exit code when there are unresolved conflicts
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Nov 2013 04:49:42 +0900] rev 19970
shelve: remove unused variable assignment
Fix test-check-pyflakes.t error after
1d7a36ff2615.
This patch replaces "readshelvedfiles()" invocation by
"shelvedfile().exists()" check and aborting, because it is required
only to ensure that shelved changes corresponded to specified name
exist after invocation.
This patch also remove definition of "readshelvedfiles()" itself,
because it is invoked only from the line removed by this patch.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 30 Oct 2013 19:45:14 +0100] rev 19969
rebase: fix selection of base used when rebasing merge (
issue4041)
Prior this changeset, rebasing a merge whose first parent was not in
the rebase lead to wrong and highly conflicting merge. See the in-line
comment for details.
Test have been updated with the data provided by the reported.
Pavlos Touboulidis <pav@pav.gr> [Tue, 29 Oct 2013 21:54:49 +0200] rev 19968
doc: fix internal date sample (
issue4072)
Mads Kiilerich <madski@unity3d.com> [Mon, 28 Oct 2013 22:34:07 +0100] rev 19967
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Prompts like
foo has been turned into a largefile
use (l)argefile or keep as (n)ormal file?
was not as clear as the usual prompts that use 'remote' or 'local' to explain
what happened on which side ... especially not when used to the normal prompts.
"as" could also indicate that it would be possible to take the content of the
largefile and somehow put it into the normal file. It could make it more clear
that it was a choice between one side or the other.
For consistency we will now phrase it like:
remote turned local normal file f into a largefile
use (l)argefile or keep (n)ormal file?