Martin Geisler <mg@lazybytes.net> [Sat, 23 May 2009 13:43:11 +0200] rev 8550
setup: another newline if version could not be established.
Martin Geisler <mg@lazybytes.net> [Sat, 23 May 2009 00:24:00 +0200] rev 8549
setup: add missing newline in warning
Jeremy Whitlock <jcscoobyrs@gmail.com> [Fri, 22 May 2009 21:03:06 +0200] rev 8548
setup: read .hg_archival.txt for version info (issue1670)
Previously, setup.py was enhanced to identify the Mercurial version
from either .hg/ or mercurial/__version__.py. When archives are
created using 'hg archive' or via hgweb, neither of those options are
available. However, there is a .hg_archival.txt file in the root of
the archive that has the information. This patch enhances setup.py to
identify the Mercurial version from the .hg_archival.txt file when
there is no .hg/ or mercurial/__version__.py available.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 May 2009 14:26:58 +0200] rev 8547
setup.py: subprocess instead of os.popen, sys.stderr.write instead of print
Also check that .hg is a directory.
Ori Avtalion <ori@avtalion.name> [Fri, 22 May 2009 20:19:22 +0200] rev 8546
gendoc: add missing space in command synopsis
Steve Borho <steve@borho.org> [Fri, 22 May 2009 11:42:21 -0500] rev 8545
merge: give hint as to how to discover uncommitted changes
Many users will try 'hg diff' here, and it will not show them missing files.
Ori Avtalion <ori@avtalion.name> [Fri, 22 May 2009 18:57:53 +0200] rev 8544
commands: standardize parents command meta data
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 23:56:15 +0200] rev 8543
i18n-da: synchronized
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 23:43:13 +0200] rev 8542
i18n: accurately generate hg.pot
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 22:53:26 +0200] rev 8541
hgcia, convert: escape backslashes in docstrings
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 17:36:19 +0200] rev 8540
commands: remove unnecessary quotes in backout help
Patrick Mezard <pmezard@gmail.com> [Thu, 21 May 2009 22:43:38 +0200] rev 8539
test-merge-tools: windows fixes
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it
Patrick Mezard <pmezard@gmail.com> [Thu, 21 May 2009 20:59:36 +0200] rev 8538
ui: honor interactive=off even if isatty()
Patrick Mezard <pmezard@gmail.com> [Thu, 21 May 2009 22:41:18 +0200] rev 8537
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 21 May 2009 20:32:45 +0200] rev 8536
hgwebdir: fix [collections] evaluation under Windows
Virtual and real path separators are not the same under Windows.
Martin Geisler <mg@lazybytes.net> [Wed, 20 May 2009 12:20:27 +0200] rev 8535
cmdutil: mark string for translation
Martin Geisler <mg@lazybytes.net> [Wed, 20 May 2009 10:50:23 +0200] rev 8534
util: use "is" for True/False/None comparisons
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 May 2009 21:16:04 +0200] rev 8533
remove: warn if unversionned files are specified (issue1454)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 May 2009 19:37:25 +0200] rev 8532
fetch: allow -r for remote repos
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 May 2009 18:35:47 +0200] rev 8531
filelog encoding: move the encoding/decoding into store
the escaping of directories ending with .i or .d doesn't
really belong to filelog.
we put the encoding/decoding in store instead, for backwards
compat, streamclone and the fncache file format still uses the
partially encoded filenames.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 May 2009 18:35:41 +0200] rev 8530
store: refactor the fncache handling
put all the fncache file writing and reading in
the same place.
Jeremy Whitlock <jcscoobyrs@gmail.com> [Wed, 20 May 2009 16:04:37 +0200] rev 8529
hgweb: make hgwebdir handle dict/list paths the same as config paths
Before this patch, the only way to get hgwebdir to honor the recursive paths
was to create a config object or a config file with the recursive paths in it.
This patch makes hgwebdir treat paths the same whether passed in as a list,
tuple, config or however hgwebdir supports passing paths.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 May 2009 02:08:53 +0200] rev 8528
workingfilectx: always use the same filelog, even for renames
workingfilectx() was using the "src" filelog in case the file was renamed in
the working copy.
For consistency, stop special-casing it. This allows us to remove some
duplication between filectx and workingfilectx.
Martin Geisler <mg@lazybytes.net> [Wed, 20 May 2009 00:52:46 +0200] rev 8527
use 'x is None' instead of 'x == None'
The built-in None object is a singleton and it is therefore safe to
compare memory addresses with is. It is also faster, how much depends
on the object being compared. For a simple type like str I get:
| s = "foo" | s = None
----------+-----------+----------
s == None | 0.25 usec | 0.21 usec
s is None | 0.17 usec | 0.17 usec
Martin Geisler <mg@lazybytes.net> [Wed, 20 May 2009 00:43:23 +0200] rev 8526
patch: simplify Boolean expression slightly
The context variable is either True, False or None. Abbreviate it as C
and we get the following truth table where the second column is the
original expression and the third column is the new expression:
C | C or C == None | C is not False
True | True | True
False | False | False
None | True | True
Simon Heimberg <simohe@besonet.ch> [Tue, 05 May 2009 10:29:34 +0200] rev 8525
mq: new method invalidate
Introduce method invalidate (similar to dirstate and repo).
Simon Heimberg <simohe@besonet.ch> [Mon, 04 May 2009 03:35:42 +0200] rev 8524
mq: only read files when needed
use util.propertycache as in dirstate
Martin Geisler <mg@lazybytes.net> [Tue, 19 May 2009 23:02:17 +0200] rev 8523
tests: replace #...# syntax with {...}
Simon Heimberg <simohe@besonet.ch> [Fri, 15 May 2009 09:43:30 +0200] rev 8522
match: use self.exact instead of lambda
self.exact uses a set and does not need an extra copy of the files
Simon Heimberg <simohe@besonet.ch> [Thu, 14 May 2009 19:47:52 +0200] rev 8521
dirstate: use quicker matchfn() instead of match() everywhere
matchfn does the same as match(), but a direct "link"
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 19 May 2009 15:10:45 +0200] rev 8520
patchbomb: don't localize Date headers
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 14:14:07 +0200] rev 8519
alias: a0104303f400 did not correctly handle whitespace in the args
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 03:59:58 +0200] rev 8518
update --clean: do not unlink added files (issue575)
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:25:48 +0200] rev 8517
templater: lowercase error message
Changing this messages should be safe: automated scripts ought to have
debugged their templates and wont grep for this error message.
Simon Heimberg <simohe@besonet.ch> [Tue, 19 May 2009 09:57:06 +0200] rev 8516
util: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 11:39:12 +0200] rev 8515
localrepo: update commit*() docstrings
Cédric Duval <cedricduval@free.fr> [Tue, 19 May 2009 01:37:38 +0200] rev 8514
patchbomb: with --in-reply-to, still thread message under first in series
When specifying --in-reply-to for a message M, have
[M]
[0/2]
[1/2]
[2/2]
instead of
[M]
[0/2]
[1/2]
[2/2]
which is more consistent with the way messages are being threaded
when --in-reply-to is not used.
Martin Geisler <mg@lazybytes.net> [Tue, 19 May 2009 01:17:54 +0200] rev 8513
merge with mpm
Cédric Duval <cedricduval@free.fr> [Tue, 19 May 2009 00:06:19 +0200] rev 8512
patchbomb: minor typo and language fixes
Cédric Duval <cedricduval@free.fr> [Tue, 19 May 2009 00:02:54 +0200] rev 8511
patchbomb: clarify diffstat usage
Cédric Duval <cedricduval@free.fr> [Mon, 18 May 2009 23:59:22 +0200] rev 8510
patchbomb: fix inexact description of the messages threading
Each message refers only to the first of the series.
Martin Geisler <mg@lazybytes.net> [Tue, 19 May 2009 00:57:36 +0200] rev 8509
coal/paper: minimize whitespace differences in CSS files
Martin Geisler <mg@lazybytes.net> [Tue, 19 May 2009 00:33:23 +0200] rev 8508
coal/paper: equal heights for file and annotate views
Martin Geisler <mg@lazybytes.net> [Tue, 19 May 2009 00:28:47 +0200] rev 8507
spartan: ensure equal heights for file and annotate views
The display used to jump up and down when switching from the file view
to the annotate view. It now stays still: when switching from the file
view to the annotate view it looks like the file content is simply
right-shifted to make room for the author names.
Martin Geisler <mg@lazybytes.net> [Mon, 18 May 2009 23:37:36 +0200] rev 8506
coal/paper: simplify margin and padding CSS rules
Martin Geisler <mg@lazybytes.net> [Mon, 18 May 2009 23:35:27 +0200] rev 8505
spartan: simplify CSS colors (#xxxxxx -> #xxx)
Martin Geisler <mg@lazybytes.net> [Mon, 18 May 2009 23:27:51 +0200] rev 8504
coal/paper/spartan: remove extra line break in annotate view
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8503
commit: tidy up mergestate slightly
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8502
commit: drop unneeded dirstate invalidate logic
We no longer touch the dirstate in the middle of a commit, so a
failing commit doesn't require invalidating the dirstate.
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8501
commit: some tidying
- simplify handling of 'close'
- kill silly wlock=None
- sort/uniq files later
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8500
commit: remove unused lock var
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8499
commit: move description trimming into changelog
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8498
commit: simplify manifest commit
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8497
commit: explain how to abort commit in editor
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 8496
commit: move editor outside transaction
The commit editor is now invoked before files and manifest are
committed. The editor is now run with only the wlock held and aborting
an edit no longer requires rolling back a transaction. Changes to
files during a commit still result in undefined behavior.
(This is preliminary work for committing subrepositories)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 May 2009 22:55:45 +0200] rev 8495
convert: directly use nullid
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 13:54:21 -0500] rev 8494
Merge with stable
Jeremy Whitlock <jcscoobyrs@gmail.com> [Thu, 02 Apr 2009 18:18:43 -0600] rev 8493
Fix how setup.py identifies the Mercurial version.
There is a problem with setup.py where it will not identify the Mercurial
version properly when not being ran in within a repository even if
mercurial/__version__.py exists.
To fix, use mercurial.__version__.version when available before defaulting
to "unknown". (Using mercurial.util.version() is not an option due to a
dependency issue where osutil can be referenced before it is built.)
Matt Mackall <mpm@selenic.com> [Sun, 17 May 2009 18:17:04 -0500] rev 8492
templater: replace eval with closure
Matt Mackall <mpm@selenic.com> [Sun, 17 May 2009 17:13:56 -0500] rev 8491
win32mbcs: remove silly eval
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 23:07:23 +0200] rev 8490
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 22:51:17 +0200] rev 8489
addremove/findrenames: find renames according to the match object (issue1527)
Instead of only finding similarities in the added/removed files found
by the addremove step, follow the match object:
hg addremove -s80 foo -> add and removes files in foo
+ find similarities between files in foo
hg addremove -s80 -> add and removes files in the whole repo
+ find similarities between files in the whole repo
hg import --similarity will still work correctly (only find similarities
between files found in the patch).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 22:40:04 +0200] rev 8488
addremove: mapping isn't really needed, simplify
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 22:52:45 +0200] rev 8487
gitweb, monoblue: break long line in map file
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 22:51:50 +0200] rev 8486
coal, paper: add newlines when displaying a file in hgweb
The newlines make the HTML somewhat readable and gives much smaller,
readable diffs when the tests change.
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 21:47:24 +0200] rev 8485
test-highlight: decouple test from get-with-headers.py
The test copied get-with-headers.py from $TESTDIR and committed it to
a test repository. The test output therefore depended unnecessarily on
the exact content of get-with-headers.py. It has now been replaced
with another small Python script.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 May 2009 20:00:11 +0200] rev 8484
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:57:40 +0200] rev 8483
convert/cvsps: use set.update for bulk update
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:57:12 +0200] rev 8482
hbisect: use set.update for bulk updates
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:56:53 +0200] rev 8481
localrepo: use set.update for bulk updates
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:56:20 +0200] rev 8480
store: create set directly from iterable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:55:51 +0200] rev 8479
repair: bulk update sets
Use a single set.update and set.difference_update call instead of many
set.add and set.discard calls.
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 16:20:27 +0200] rev 8478
ui: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 16:15:37 +0200] rev 8477
alias: honor the [defaults] section, fix issue1642
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 17 May 2009 16:08:47 +0200] rev 8476
templater: keep a cache of Python functions for filter expressions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 17 May 2009 16:06:48 +0200] rev 8475
templater: replace regex complexity by simple str containment checks
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 17 May 2009 16:05:50 +0200] rev 8474
templater: clean up the process method, separating code paths
Cédric Duval <cedricduval@free.fr> [Sun, 17 May 2009 09:54:08 +0200] rev 8473
patchbomb: make diffstat usage clearer
Making it clear that diffstat output does not only depend on diffstat
being installed - it also needs to be explicitely requested.
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 15:30:45 +0200] rev 8472
patchbomb: describe --attach and --inline options in help
Cédric Duval <cedricduval@free.fr> [Sun, 17 May 2009 09:45:49 +0200] rev 8471
patchbomb: fix help to reflect actual operation
In the body, the description is shown in its entirety,
unstripped from what was already in the subject.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 May 2009 14:35:06 +0200] rev 8470
convert/bzr: warn when source is a lightweight checkout (issue1647)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 04:33:39 +0200] rev 8469
localrepo: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 04:20:59 +0200] rev 8468
copies: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 04:16:44 +0200] rev 8467
store: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 04:14:15 +0200] rev 8466
verify: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:53:13 +0200] rev 8465
ancestor: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:49:59 +0200] rev 8464
revlog: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:40:54 +0200] rev 8463
bisect: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:38:03 +0200] rev 8462
repair: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:28:49 +0200] rev 8461
patch: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:26:08 +0200] rev 8460
record: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:25:24 +0200] rev 8459
hgk: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:19:00 +0200] rev 8458
convert: cleanups in monotone converter
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:14:37 +0200] rev 8457
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:04:17 +0200] rev 8456
convert: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 May 2009 03:02:12 +0200] rev 8455
bugzilla: use set instead of dict