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
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 13:31:43 -0500] rev 11739
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 13:30:03 -0500] rev 11738
Added signature for changeset c00f03a4982e
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 13:30:03 -0500] rev 11737
Added tag 1.6.2 for changeset c00f03a4982e
Wagner Bruna <wbruna@yahoo.com> [Mon, 02 Aug 2010 13:18:32 -0300] rev 11736
i18n-pt_BR: synchronized with 87dcf758309d
Wagner Bruna <wbruna@yahoo.com> [Mon, 02 Aug 2010 13:11:33 -0300] rev 11735
merge with i18n stable
Jens Bäckman <jens.backman@gmail.com> [Sun, 01 Aug 2010 22:43:13 +0200] rev 11734
i18n-sv: synchronized with 56b41b2cc690
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 10:55:51 -0500] rev 11733
Merge with stable
Brodie Rao <brodie@bitheap.org> [Mon, 02 Aug 2010 10:48:31 -0400] rev 11732
color: call correct superclass method in write_err
Without this fix, any calls to write_err would go to stdout instead of
stderr, and calls during pushbuffer would cause unpack ValueErrors on
popbuffer.
timeless <timeless@gmail.com> [Fri, 30 Jul 2010 10:38:54 +0300] rev 11731
convert/progress: use plural and avoid retrieving
Matt Mackall <mpm@selenic.com> [Sun, 01 Aug 2010 16:02:56 -0500] rev 11730
qfinish: fix range logic for --applied
qbase:qtip can include non-mq csets, use qbase::qtip instead
timeless <timeless@gmail.com> [Tue, 20 Jul 2010 20:53:48 +0200] rev 11729
rebase/progress: Adding progress for rebasing
timeless <timeless@gmail.com> [Thu, 22 Jul 2010 18:47:46 +0300] rev 11728
record: count lines changed as the number of lines added or removed
per "record" hunk
Record deals in hunks which are tighter than traditional patch hunks,
really only a single run of additions/removals. Another addition, even a
line after a fixed line is treated as a new hunk by record.
Brodie Rao <brodie@bitheap.org> [Sun, 01 Aug 2010 16:26:02 -0400] rev 11727
color: pass write/write_err to win32print correctly (issue2312)
Matt Mackall <mpm@selenic.com> [Sun, 01 Aug 2010 13:52:42 -0500] rev 11726
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 01 Aug 2010 13:49:43 -0500] rev 11725
Added signature for changeset bf1774d95bde
Matt Mackall <mpm@selenic.com> [Sun, 01 Aug 2010 13:49:42 -0500] rev 11724
Added tag 1.6.1 for changeset bf1774d95bde
Matt Mackall <mpm@selenic.com> [Sun, 01 Aug 2010 08:54:30 -0500] rev 11723
Merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:54:31 -0300] rev 11722
i18n-pt_BR: synchronized with db426935fa94
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:51:21 -0300] rev 11721
Merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:46:58 -0300] rev 11720
i18n-pt_BR: synchronized with 0e789549271d
Jens Bäckman <jens@titv.se> [Sun, 25 Jul 2010 10:51:05 +0200] rev 11719
i18n-sv: synchronized with c47cb3193c53
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:27:03 -0500] rev 11718
help: fix bytes/digit confusion for hashes
spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:12:50 -0500] rev 11717
Merge with stable
timeless <timeless@gmail.com> [Fri, 30 Jul 2010 10:32:24 +0300] rev 11716
progress: use gerund (updating) for merge progress
Gilles Moris <gilles.moris@free.fr> [Sat, 10 Jul 2010 21:23:00 +0200] rev 11715
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:58 +0900] rev 11714
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:42 +0900] rev 11713
perf: break down long line
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:36:24 +0900] rev 11712
dispatch: trailing whitespace
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:05:11 +0900] rev 11711
merge crew and main
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:04:33 +0900] rev 11710
merge crew and main
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 10:50:29 +0900] rev 11709
mq: clarify the fact that qimport is trying to read a file
"hg qimport tip" would throw "abort: unable to read tip" before this.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 30 Jul 2010 10:07:46 +0900] rev 11708
revset: add min function
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 30 Jul 2010 14:41:47 +0900] rev 11707
runrst: try to be more helpful if docutils is not installed
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 17:18:17 +0900] rev 11706
mq: correct qimport documentation
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 12:10:22 +0900] rev 11705
merge with stable
Idan Kamara <idankk86@gmail.com> [Sat, 24 Jul 2010 11:20:21 +0300] rev 11704
bookmarks: don't allow name to contain whitespaces only
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 29 Jul 2010 10:39:59 +0900] rev 11703
context: reuse filecontext.cmp in workingfilecontext.cmp
Same code path should mean less mistakes, and hopefully, better
caching.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:40:46 +0900] rev 11702
filectx: use cmp(self, fctx) instead of cmp(self, text)
This allows more flexibility in implementation, and in particular,
lets the context decide if revision text has to be loaded or not.
Patrick Mezard <pmezard@gmail.com> [Wed, 28 Jul 2010 11:07:20 +0200] rev 11701
mq: fix qimport --name --existing --force on win32
os.rename() does not overwrite existing targets on Windows.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 23 Jul 2010 23:43:43 +0900] rev 11700
mq: document possible combination of -e and -n for qimport
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 21 Jul 2010 11:53:09 +0900] rev 11699
mq: support "qimport --existing --name renametothis thatexistingpatch"
Before this change, the command would abort with a not too clear "patch
renametothis does not exist" error.
This change makes:
qimport --existing --name renametothis thatexistingpatch
equivalent to:
qimport --existing thatexistingpatch; qrename thatexistingpatch renametothis
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 24 Jul 2010 00:28:20 +0900] rev 11698
localrepo: refactor filter computation
Separate loading part from access part to be able to tell with:
repo._loadfilter(name)
bool(name in repo.filterpats)
if there is a 'name' filter available.
Matt Mackall <mpm@selenic.com> [Tue, 27 Jul 2010 16:04:00 -0500] rev 11697
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Jul 2010 16:03:42 -0500] rev 11696
Merge with crew
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 27 Jul 2010 14:43:40 +0200] rev 11695
alias: improved diagnostic when arguments include --cwd, etc.
The logic pre-emptively checks for -R, --repo, --repository and --cwd
in order to give the user a more helpful error message. In addition,
each option is handled invididually, which avoids listing them all in
the error.
Before:
% hg --config alias.broken='push --cwd /dev/null' broken
abort: Option --cwd may not be abbreviated!
After:
% hg --config alias.broken='push --cwd /dev/null' broken
error in definition for alias 'broken': --cwd may only be given on the command line
Pradeepkumar Gayam <in3xes@gmail.com> [Tue, 27 Jul 2010 20:50:09 +0530] rev 11694
perf: add perfrevlog function to check performance of revlog
Pradeepkumar Gayam <in3xes@gmail.com> [Tue, 27 Jul 2010 01:16:38 +0530] rev 11693
revlog: add a flags method that returns revision flags
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 27 Jul 2010 14:40:25 -0400] rev 11692
tag: do not allow tag names to consist solely of whitespace (issue2307)
(simplification and test by mpm)
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 21:20:05 -0500] rev 11691
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 20 Jul 2010 15:49:28 +0200] rev 11690
convert: warn on superfluous / in paths
shlex is really a bad parser for this line-based format ...
David Soria Parra <dsp@php.net> [Sat, 24 Jul 2010 22:15:22 +0200] rev 11689
inotify: remove unused variable
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 17:18:35 -0500] rev 11688
convert: handle closed branch heads in hg-hg conversion (issue2185)
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 17:10:32 -0500] rev 11687
check-code: add warning on lines over 80 characters
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Jul 2010 23:26:15 +0200] rev 11686
debugbuilddag: build repository content in binary mode
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Jul 2010 22:29:49 +0200] rev 11685
cleanup: typos
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Jul 2010 22:29:17 +0200] rev 11684
revsets.txt: minor improvements
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Jul 2010 22:28:37 +0200] rev 11683
dispatch: write Abort hint to stderr too
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Jul 2010 22:26:12 +0200] rev 11682
bookmarks: sort diffbookmarks() output
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 21:20:05 -0500] rev 11681
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 20 Jul 2010 15:49:28 +0200] rev 11680
convert: warn on superfluous / in paths
shlex is really a bad parser for this line-based format ...
David Soria Parra <dsp@php.net> [Sat, 24 Jul 2010 22:15:22 +0200] rev 11679
inotify: remove unused variable
Christian Ebert <blacktrash@gmx.net> [Sun, 25 Jul 2010 20:01:33 -0500] rev 11678
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
When cloning, prevent [keyword] filename patterns configured locally
in the source directory to persist during the update in the destination.
a) move [keyword] retrieval (back) to reposetup
b) remove the corresponding global kwtools attributes
Add test cases.
Mads Kiilerich <mads@kiilerich.com> [Wed, 21 Jul 2010 22:22:28 +0200] rev 11677
hgwebdir: allow pure relative globs in paths
This allows the (to me, in some setups) obvious configuration:
[paths]
/ = *
or
/ = **
Relative paths used to work with [collections] even though it isn't documented.
Perhaps it should be documented?
Brodie Rao <brodie@bitheap.org> [Thu, 22 Jul 2010 15:26:26 -0400] rev 11676
alias: ensure checksignature() is applied directly to the command (issue2286)
Aliased commands that received bad arguments would raise TypeError instead of
SignatureError. This only affected commands that weren't wrapped by extensions.
Using util.checksignature() in cmdalias.__call__() ensures SignatureError is
raised correctly.
Mads Kiilerich <mads@kiilerich.com> [Sat, 24 Jul 2010 00:38:08 +0200] rev 11675
dispatch: give better error message when cwd doesn't exist (issue2293)
Previous behavior wasn't very helpful:
$ hg st foo
abort: No such file or directory
Now we tell more about what failed:
abort: error getting current working directory: No such file or directory
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 22 Jul 2010 23:18:38 +0900] rev 11674
i18n: safety writing into non-ASCII named files on any shell implementation
some shell implementation (e.g.: dash) can not handle redirection into
non-ASCII UTF-8 named file correctly.
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 17:18:35 -0500] rev 11673
convert: handle closed branch heads in hg-hg conversion (issue2185)
Matt Mackall <mpm@selenic.com> [Sun, 25 Jul 2010 17:10:32 -0500] rev 11672
check-code: add warning on lines over 80 characters
Lee Cantey <lcantey@gmail.com> [Sun, 25 Jul 2010 08:22:03 -0700] rev 11671
Remove variable output affected by length of TMPDIR.
If the temporary directory is longer than /tmp then it's possible that
the Subject line will get wrapped by the headencode function.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 25 Jul 2010 13:10:57 +0200] rev 11670
chunkbuffer: split big strings directly in chunkbuffer
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 25 Jul 2010 10:05:38 +0900] rev 11669
localrepo.status: move fixup concatenation inside if block for clarity
clean += fixup only makes sense if fixup is not empty; it should
be inside the "if fixup" test.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 24 Jul 2010 17:23:08 +0200] rev 11668
chunkbuffer: targetsize isn't used outside of read()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 24 Jul 2010 15:21:39 +0200] rev 11667
chunkbuffer: use list instead of cStringIO
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 24 Jul 2010 15:20:29 +0200] rev 11666
chunkbuffer: use for/else to detect end of iteration
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 24 Jul 2010 00:15:29 +0200] rev 11665
changegroup*(): use enumerate when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 24 Jul 2010 00:03:19 +0200] rev 11664
changegroupsubset(): with the fix, prune() is actually useful in the testsuite
Martin Geisler <mg@aragost.com> [Thu, 22 Jul 2010 13:48:34 +0200] rev 11663
test-permissions: echo commands to make output readable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 23 Jul 2010 00:04:18 +0200] rev 11662
changegroupsubset: simplify knownheads/has_cl_set computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 23:54:57 +0200] rev 11661
changegroupsubset(): ancestors() is not inclusive, we need to remove the "heads"
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 23:44:14 +0200] rev 11660
changegroupsubset(): move comment at the right place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 23:13:03 +0200] rev 11659
changegroupsubset(): refactor the prune() functions
Martin Geisler <mg@lazybytes.net> [Thu, 22 Jul 2010 22:23:54 +0200] rev 11658
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 22 Jul 2010 21:43:45 +0200] rev 11657
help: make helptable a list instead of a tuple
The table should always have been a list so that extensions can append
their own help topics -- hgsubversion would like to do this now.
Jason Harris <jason@jasonfharris.com> [Sat, 03 Jul 2010 08:28:23 +0200] rev 11656
test-command-template: test 'children' template keyword
Jason Harris <jason@jasonfharris.com> [Sat, 03 Jul 2010 05:24:16 +0200] rev 11655
templates: 'children' keyword
The template keyword 'parents' is already present and this just
provides the complimentary template keyword.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 16:51:45 +0200] rev 11654
changegroupsubset(): change variable names, simplify lookup logic
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 16:18:33 +0200] rev 11653
changegroup(): used "linkrev" instead of "revlink"
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 22 Jul 2010 15:32:26 +0200] rev 11652
fix comment