Daniel J. Lauk <daniel.lauk@gmail.com> [Thu, 12 Aug 2010 11:15:33 +0200] rev 11835
convert: Test svn sink for a repo with tags.
This test case backs the fix in changeset 7e5f5e5858f9. The subversion
sink used to crash, if the source repo used tags.
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:13:38 +0200] rev 11834
hgrc.5: fix "hg hg status" -> "hg status"
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:10:11 +0200] rev 11833
url: expand vars in all [auth] settings (issue2328)
Matt Mackall <mpm@selenic.com> [Thu, 12 Aug 2010 18:09:03 -0500] rev 11832
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 12 Aug 2010 18:08:52 -0500] rev 11831
merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 12 Aug 2010 18:08:31 -0500] rev 11830
merge with i18n
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 18:10:42 +0200] rev 11829
i18n: merge Romanian translation
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 18:10:26 +0200] rev 11828
i18n: merge with stable
Paolo Giarrusso <p.giarrusso@gmail.com> [Thu, 12 Aug 2010 16:53:56 +0200] rev 11827
i18n-it: update many broken fuzzy messages
I started updating many fuzzy messages which no longer expressed the
intended meaning - new translations are inserted only to keep
coherence.
Not all fuzzy messages have been fixed, yet.
Paolo Giarrusso <p.giarrusso@gmail.com> [Thu, 12 Aug 2010 16:30:17 +0200] rev 11826
i18n-it: readd missing non-ASCII characters
Some accented vowels had disappeared.
Paolo Giarrusso <p.giarrusso@gmail.com> [Thu, 12 Aug 2010 16:30:17 +0200] rev 11825
i18n-it: avoid using two spaces after a '.'
See http://en.wikipedia.org/wiki/Sentence_spacing to verify that
single spacing is indeed correct.
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Mon, 09 Aug 2010 10:56:56 +0200] rev 11824
i18n-ro: initial version
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 18:30:24 +0200] rev 11823
Merge with stable
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 18:30:06 +0200] rev 11822
test-check-code: fix test after e1359ad582f6
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 18:00:41 +0200] rev 11821
cmdutil: remove unnecessary parenthesis
Martin Geisler <mg@aragost.com> [Thu, 12 Aug 2010 17:58:03 +0200] rev 11820
patch: fix typo in comment
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 05 Aug 2010 12:25:53 +0200] rev 11819
qguard: label patch names by status when listing guards
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 02 Jul 2010 15:12:50 +0900] rev 11818
hg.clone: do not ignore branch argument when source is a repo object
This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear:
hopefully using a test to cover this usage should prevent any bugs.
Alecs King <alecsk@gmail.com> [Wed, 11 Aug 2010 20:16:22 +0800] rev 11817
merge: fix typo in docstring
Alecs King <alecsk@gmail.com> [Thu, 12 Aug 2010 16:42:41 +0800] rev 11816
check-code: add exit status
so that we can use it in a shell command combination and/or in hg hooks.
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Aug 2010 09:40:48 +0100] rev 11815
test-patch.t: typos
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 23:46:56 +0900] rev 11814
tests: unify test-alias
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 23:27:32 +0900] rev 11813
tests: unify test-parents
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 23:22:25 +0900] rev 11812
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 23:02:12 +0900] rev 11811
tests: unify test-symlink-root
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 23:00:36 +0900] rev 11810
tests: unify test-symlink-basic
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:58:46 +0900] rev 11809
tests: unify test-symlink-addremove
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:57:06 +0900] rev 11808
tests: unify test-qimport-eol
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:54:41 +0900] rev 11807
tests: unify test-import
Adrian Buehlmann <adrian@cadifra.com> [Tue, 10 Aug 2010 13:21:28 +0200] rev 11806
tests: unify test-clone
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:31:40 +0900] rev 11805
tests: unify test-copy
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:28:21 +0900] rev 11804
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:24:13 +0900] rev 11803
unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:22:17 +0900] rev 11802
tests: unify test-commit
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:19:59 +0900] rev 11801
tests: unify test-committer
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 22:14:19 +0900] rev 11800
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 21:52:53 +0900] rev 11799
tests: unify test-walk
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 20:08:02 +0900] rev 11798
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 20:02:59 +0900] rev 11797
tests: unify test-conflict
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 19:49:58 +0900] rev 11796
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 19:43:45 +0900] rev 11795
tests: unify test-add
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 19:40:22 +0900] rev 11794
tests: remove useless sed in test-hook
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 19:38:31 +0900] rev 11793
tests: unify test-hook
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 19:10:57 +0900] rev 11792
tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 16:53:23 +0900] rev 11791
repair: do not compress partial bundle if we do not keep it on disk
A partial bundle is created to temporarily save revisions > rev but
not descending from the node to strip, to be able to restore the
changesets after stripping the changelog.
Since this bundle is not kept after the strip operation, and is not
user-visible, it is not necessary and should be faster to avoid
compression.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 16:45:47 +0900] rev 11790
store: skip decodir check if path does not contain '.hg/'
The three replace calls are slower than this simple __contains__,
and anyway we should not have this many paths ending with .i, .d, or .hg
compared to the normal, un-encoded other paths.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 17 Jul 2010 00:47:06 +0900] rev 11789
strip: support multiple revisions
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 16:35:34 +0900] rev 11788
tests: unify test-tag
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 15:41:58 +0900] rev 11787
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 15:31:18 +0900] rev 11786
tests: unify test-init
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 15:18:44 +0900] rev 11785
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 15:12:25 +0900] rev 11784
tests: unify test-patch
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 15:07:25 +0900] rev 11783
tests: unify test-status-color
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:54:10 +0900] rev 11782
tests: unify test-status
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:53:34 +0900] rev 11781
tests: catch re.error if test line is not a valid regular expression
Martin Geisler <mg@aragost.com> [Wed, 11 Aug 2010 12:30:18 +0200] rev 11780
Merge with stable
Martin Geisler <mg@aragost.com> [Wed, 11 Aug 2010 12:29:20 +0200] rev 11779
convert: less shouting in SVN sink warning
Daniel J. Lauk <daniel.lauk@gmail.com> [Wed, 11 Aug 2010 11:46:06 +0200] rev 11778
convert: Using --dest-type svn crashed, if the source repo used tags.
The convert extension requires puttags(self, tags) to return a sequence
for a multi-variable assignment. If puttags implicitly returns None,
the code will break when trying to un-pack None for assignment.
Martin Geisler <mg@aragost.com> [Wed, 11 Aug 2010 12:21:27 +0200] rev 11777
commands: use round parenthesis in 'hg head --active' help
This is the style used in the rest of the help strings.
Martin Geisler <mg@aragost.com> [Wed, 11 Aug 2010 12:19:01 +0200] rev 11776
graphlog: mark --branch as incompatible with --graph
The --only-branch option was deprecated in 0d5f139b23c1 and --branch
was added instead. But the graphlog extension was not updated to match
the change.
Martin Geisler <mg@lazybytes.net> [Thu, 15 Jul 2010 18:10:05 +0200] rev 11775
subrepos: support remapping of .hgsub source paths
Given a .hgsub file containing
lib/libfoo = http://server/libfoo
the 'lib/libfoo' subrepo will be cloned from 'http://server/libfoo'.
This changeset introduces a remapping mechanism whereby the source
paths (the right-hand sides) in the .hgsub file can be remapped. This
subpaths section
[subpaths]
http://server = /local
will result in the 'lib/libfoo' subrepo being cloned from
'/local/libfoo' instead of from 'http://server/libfoo'.
The patterns (left-hand sides) are really regular expressions and the
replacement strings (right-hand sides) can refer to matched groups
using normal backreferences. This can be used for more complicated
replacements such as
[subpaths]
http://server/(.*)-hg/ = http://hg.server/\1/
which replaces 'http://server/foo-hg/' with 'http://hg.server/foo/'.
All patterns are applied in the order by which they are listed in the
config files.
Martin Geisler <mg@aragost.com> [Tue, 10 Aug 2010 16:55:38 +0200] rev 11774
bookmarks: replace var used as a Boolean with a Boolean
Matt Mackall <mpm@selenic.com> [Mon, 09 Aug 2010 16:55:53 -0500] rev 11773
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Aug 2010 21:43:39 +0200] rev 11772
test-dispatch: Make test of removed working directory work on AIX (issue2315)
AIX sh won't delete its own working directory. Removing it from another process
works.
Also hide the actual OS error message - operating systems returns different
errors when getcwd fails.
Matt Mackall <mpm@selenic.com> [Mon, 09 Aug 2010 12:25:01 -0500] rev 11771
tests: only run check-code on tracked files
Martin Geisler <mg@aragost.com> [Mon, 09 Aug 2010 16:08:33 +0200] rev 11770
Merge with stable
Martin Geisler <mg@aragost.com> [Mon, 09 Aug 2010 15:31:56 +0200] rev 11769
dirstate: ignore symlinks when fs cannot handle them (issue1888)
When the filesystem cannot handle the executable bit, we currently
ignore it completely when looking for modified files. Similarly, it is
impossible to set or clear the bit when the filesystem ignores it.
This patch makes Mercurial treat symbolic links the same way.
Symlinks are a little different since they manifest themselves as
small files containing a filename (the symlink target). On Windows,
these files show up as regular files, and on Linux and Mac they show
up as real symlinks.
Issue1888 presents a case where the symlink files are better ignored
from the Windows side. A Linux client creates symlinks in a working
copy which is shared over a network between Linux and Windows clients.
The Samba server is helpful and defererences the symlink when the
Windows client looks at it. This means that Mercurial on the Windows
side sees file content instead of a file name in the symlink, and
hence flags the link as modified. Ignoring the change would be much
more helpful, similarly to how Mercurial does not report any changes
when executable bits are ignored in a checkout on Windows.
An initial checkout of a symbolic link on a file system that cannot
handle symbolic links will still result in a regular file containing
the target file name as its content. Sharing such a checkout with a
Linux client will not turn the file into a symlink automatically, but
'hg revert' can fix that. After the revert, the Windows client will
see the correct file content (provided by the Samba server when it
follows the link on the Linux side) and otherwise ignore the change.
Running 'hg perfstatus' 10 times gives these results:
Before: After:
min: 0.544703 min: 0.546549
med: 0.547592 med: 0.548881
avg: 0.549146 avg: 0.548549
max: 0.564112 max: 0.551504
The median time is increased about 0.24%.
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Sun, 08 Aug 2010 23:10:08 +0200] rev 11768
mq/qqueue: enable bash completion
Return the list of available queues when completion is attempted on qqueue.
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Sun, 08 Aug 2010 22:49:01 +0200] rev 11767
mq/qqueue: --list does not print (active) with --quiet
For scripting purposes, it can be convenient to get a simple listing of
available queues, without indication of the active one.
--quiet documentation change removed by Patrick Mézard.
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Aug 2010 22:29:39 +0200] rev 11766
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 07 Aug 2010 16:27:16 +0900] rev 11765
templatefilters: make json filter handle multibyte characters correctly
It aims to fix javascript error of hgweb's graph view in Japanese 'cp932'
encoding.
'cp932' contains multibyte characters ending with '\x5c' (backslash),
e.g. '\x94\x5c' for Japanese Kanji 'Noh'.
Due to json filter escapes '\' to '\\', multibyte string ending with
'\x5c' is translated to "xxx\", resulting javascript parse error on
a web browser.
This patch changes json() to pass unicode to jsonescape().
Unicode decoding error handler changed to 'replace' by Patrick Mézard.
Renato Cunha <renatoc@gmail.com> [Sat, 07 Aug 2010 16:13:53 -0300] rev 11764
check-code: added a check for calls to the builtin cmp function
Renato Cunha <renatoc@gmail.com> [Sat, 07 Aug 2010 16:12:51 -0300] rev 11763
manifest: removed usage of the global cmp function
Py3k doesn't have a global cmp() function, making this call problematic in the
py3k port. Also, calling cmp() here is not necessary, since we only want to
know if the two values are equal. A check for equality perfect in this case and
this patch does that.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 Aug 2010 15:38:05 +0200] rev 11762
tests: run check-code.py on working directory files
If we insist on Mercurial sources to pass check-code.py, let automate the
process and make it part of the tests.
Objections?
Alecs King <alecsk@gmail.com> [Sat, 07 Aug 2010 12:55:30 +0800] rev 11761
minor style fix: hgext/rebase.py:157 -- line too long
found by a run of check-code
Yuya Nishihara <yuya@tcha.org> [Sat, 07 Aug 2010 15:32:33 +0900] rev 11760
zsh completions: add qpush --move option
Matt Mackall <mpm@selenic.com> [Fri, 06 Aug 2010 12:59:13 -0500] rev 11759
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 06 Aug 2010 12:18:33 -0500] rev 11758
chunkbuffer: use += rather than cStringIO to reduce memory footprint
This significantly refactors the read() loop to use a queue of chunks.
The queue is alternately filled to at least 256k and then emptied by
concatenating onto the output buffer.
For very large read sizes, += uses less memory because it can resize
the target string in place.
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:39 -0500] rev 11757
httprepo: decompress stream incrementally to reduce memory usage
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:33 -0500] rev 11756
verify: initialize rp variable in case we hit out of memory
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:17 -0500] rev 11755
merge: drop reference to file contents after write
This reduces memory usage on large consecutive gets.
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:17 -0500] rev 11754
revlog: drop cache after use to save memory footprint
If we reconstruct back to back large versions, we need to drop the cache first to avoid doubling memory usage.
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:17 -0500] rev 11753
verify: reduce memory footprint when unpacking files
By never holding a reference to the unpacked string, we avoid holding two
consecutive large files in memory.
Matt Mackall <mpm@selenic.com> [Thu, 05 Aug 2010 16:17:17 -0500] rev 11752
verify: report exceptions that don't have a str() method
Matt Mackall <mpm@selenic.com> [Wed, 04 Aug 2010 13:21:11 -0500] rev 11751
color: fix test-diff-color breakage
Brodie Rao <brodie@bitheap.org> [Tue, 03 Aug 2010 13:02:11 -0400] rev 11750
hgcia/color: remove star imports
This plays nicer with demandimport and allows pyflakes to detect undefined
names.
Renato Cunha <renatoc@gmail.com> [Tue, 03 Aug 2010 13:59:14 -0300] rev 11749
hgfixes: added a fixer that makes bytes to be formatted correctly
This patch implement a fixer that replaces all calls to the '%' when bytes
arguments are used to a call to bytesformatter(), a function that knows how to
format byte strings. As one can't be sure if a formatting call is done when
only variables are used in a '%' call, these calls are also translated. The
bytesformatter, in runtime, makes sure to return the "raw" % operation if
that's what was intended.
Renato Cunha <renatoc@gmail.com> [Tue, 03 Aug 2010 13:52:48 -0300] rev 11748
py3kcompat: added a "compatibility layer" for py3k
This patch adds some ugly constructs. The first of them is bytesformatter, a
function that formats strings like when '%' is called. The main motivation for
this function is py3k's strange behavior:
>>> 'foo %s' % b'bar'
"foo b'bar'"
>>> b'foo %s' % b'bar'
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: unsupported operand type(s) for %: 'bytes' and 'bytes'
>>> b'foo %s' % 'bar'
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: unsupported operand type(s) for %: 'bytes' and 'str'
In other words, if we can't format bytes with bytes, and recall that all
mercurial strings will be converted by a fixer, then things will break badly if
we don't take a similar approach.
The other addition with this patch is that the os.environ dictionary is
monkeypatched to have bytes items. Hopefully this won't be needed in the
future, as python 3.2 might get a os.environb dictionary that holds bytes
items.
Renato Cunha <renatoc@gmail.com> [Tue, 03 Aug 2010 13:41:47 -0300] rev 11747
hgfixes: add a fixer to convert plain strings to bytestrings
This patch implements a 2to3 fixer that converts all plain strings in a python
source file to byte strings syntax. Example:
foo = 'Normal string'
would become
foo = b'Normal string'
The motivation behind this fixer can be found in
http://selenic.com/pipermail/mercurial-devel/2010-June/022363.html or, in other
words: the current hg source assumes that _most_ strings are "meant" to be byte
sequences, so it makes sense to make the convertion implemented by this patch.
As mentioned above, not all mercurial modules want to use strings as bytes,
examples include i18n (which uses unicode), and demandimport (in py3k, module
names are normal strings, thus unicode, and there's no need for a convertion).
Therefore, these modules are blacklisted in the fixer. There are also a few
functions that can take only unicode arguments, thus the convertion shouldn't
be done for those.
Vishakh H <vsh426@gmail.com> [Tue, 03 Aug 2010 19:38:19 +0530] rev 11746
revlog: add shallow header flag
REVLOGSHALLOW header flag to mark revlog as shallow.
The _shallow attribute of the revlog is used to check if the header flag is set.
Vishakh H <vsh426@gmail.com> [Tue, 03 Aug 2010 19:38:19 +0530] rev 11745
revlog: add punched revision flag
index flag to identify a revision as punched, i.e. it contains no data.
REVIDX_PUNCHED_FLAG = 2, is used to mark a revision as punched.
REVIDX_KNOWN_FLAGS is the accumulation of all index flags.
Matt Mackall <mpm@selenic.com> [Tue, 03 Aug 2010 00:10:28 -0500] rev 11744
tests: unify test-tags
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:43:06 -0500] rev 11743
tests: unify test-empty
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:29:14 -0500] rev 11742
tests: unify test-basic
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:27:22 -0500] rev 11741
tests: basic support for unified tests
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 15:44:54 -0500] rev 11740
tests: move script execution in runner helpers