Eric Eisner <ede@mit.edu> [Sun, 04 Apr 2010 21:35:00 -0400] rev 10832
summary: make use of output labeling
The individual pieces of information use the same labels as the commands
they summarize for better cohesion of commands.
Brodie Rao <brodie@bitheap.org> [Sun, 04 Apr 2010 22:53:50 -0500] rev 10831
color: concatenate effects correctly and avoid printing empty effects
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:31:16 +0200] rev 10830
commands: fix typo
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:00:14 +0200] rev 10829
cmdutil: do not translate trivial string
Adrian Buehlmann <adrian@cadifra.com> [Sun, 04 Apr 2010 02:39:45 +0200] rev 10828
wix: refactor and new guids.wxi
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:19 -0500] rev 10827
color: don't split colors across lines (which confuses less -R)
Currently, less -R doesn't support colors spanning multiple lines; only
the first line will be colorized.
Instead of allowing colors to span multiple lines, the color extension
now applies colors to each line it receives, even when ui.write() is
given multiple lines in one call.
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:17 -0500] rev 10826
color: colorize based on output labels instead of parsing output
By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(),
the color extension can avoid parsing command output and simply colorize
output based on labels.
As before, the color extension provides a list of default colors for
core commands/labels. Other extensions can provide their own defaults by
specifying a colortable dict (similar to cmdtable).
In this process, --color is promoted to a global option and the deprecated
--no-color option is removed.
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:15 -0500] rev 10825
record: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:14 -0500] rev 10824
qseries: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:11 -0500] rev 10823
qdiff: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:12 -0500] rev 10822
qguard: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:10 -0500] rev 10821
churn: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:09 -0500] rev 10820
bookmark: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:07 -0500] rev 10819
cmdutil: make use of output labeling in changeset_printer
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:06 -0500] rev 10818
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:05 -0500] rev 10817
status: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:03 -0500] rev 10816
grep: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:00 -0500] rev 10815
ui: add ui.write() output labeling API
This adds output labeling support with the following methods:
- ui.write(..., label='topic.name topic2.name2 ...')
- ui.write_err(.., label=...)
- ui.popbuffer(labeled=False)
- ui.label(msg, label)
By adding an API to label output directly, the color extension can forgo
parsing command output and instead override the above methods to insert
ANSI color codes. GUI tools can also override the above methods and use
the labels to do GUI-specific styling.
popbuffer gains a labeled argument that, when set to True, returns its
buffered output with labels handled. In the case of the color extension,
this would return output with color codes embedded. For existing users
that use this method to capture and parse output, labels are discarded
and output returned as normal when labeled is False (the default).
Existing wrappers of ui.write() and ui.write_err() should make sure to
accept its new **opts argument.
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:51:59 -0500] rev 10814
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:51:32 -0500] rev 10813
Merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:49:38 -0500] rev 10812
Added signature for changeset 2b01dab59416
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:49:38 -0500] rev 10811
Added tag 1.5.1 for changeset 2b01dab59416
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Apr 2010 19:32:36 -0300] rev 10810
i18n-pt_BR: update qnew help text
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:40:47 -0500] rev 10809
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Apr 2010 19:32:08 -0300] rev 10808
mq: remove reference for deprecated -f option
-f is the default behaviour since 27d542bc0f5b
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Apr 2010 11:45:25 -0300] rev 10807
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Apr 2010 11:33:03 -0300] rev 10806
i18n-pt_BR: synchronized with e46c19c586fa
bttfmcf <bttf.mcf@gmail.com> [Wed, 31 Mar 2010 21:22:07 +0000] rev 10805
l10n: Updates to French (fr) translation
Transmitted-via: Transifex (www.transifex.net)
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 31 Mar 2010 12:15:24 -0300] rev 10804
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 31 Mar 2010 12:14:38 -0300] rev 10803
i18n-pt_BR: synchronized with ca6ba6cac6cd
Mads Kiilerich <mads@kiilerich.com> [Wed, 31 Mar 2010 11:07:46 +0200] rev 10802
check-code.py: Check for bare ^
Solaris sh interprets ^ as some kind of piping symbol.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Mon, 29 Mar 2010 09:15:08 -0300] rev 10801
Added support for 'everybody ' (using an asterisk) in user list.
Mads Kiilerich <mads@kiilerich.com> [Tue, 30 Mar 2010 02:42:21 +0200] rev 10800
convert.cvs: Initialize state variable and abort on cvs error
Fix as proposed by Frank Kingswood.
Avoids
UnboundLocalError: local variable 'mode' referenced before assignment
when cvs fails.
This alsa partially fixes issue1592.
Martin Geisler <mg@lazybytes.net> [Thu, 01 Apr 2010 00:15:29 +0200] rev 10799
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 01 Apr 2010 00:02:12 +0200] rev 10798
share: drop experimental label
As per mail from Matt:
http://selenic.com/pipermail/mercurial/2010-March/030774.html
Brendan Cully <brendan@kublai.com> [Wed, 31 Mar 2010 15:09:59 -0700] rev 10797
Merge with stable
Michael Glassford <glassfordmjg@gmail.com> [Wed, 31 Mar 2010 10:59:00 -0400] rev 10796
Add missing --mq option to hg log.
Since norepo is a string, not a list, the norepo check was matching
command names against any substring in norepo. This fix splits norepo
into a list of commands.
Martin Geisler <mg@lazybytes.net> [Wed, 31 Mar 2010 17:32:19 +0200] rev 10795
Merge with stable
Benoit Allard <benoit@aeteurope.nl> [Fri, 26 Mar 2010 21:37:18 +0100] rev 10794
url: expand path in auth filenames
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 27 Mar 2010 13:39:45 +0200] rev 10793
expand paths in aliases
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 31 Mar 2010 12:09:21 +0200] rev 10792
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 31 Mar 2010 12:07:13 +0200] rev 10791
test-subrepo-svn: properly escape the url, make it work for svn 1.5 again
Matt Mackall <mpm@selenic.com> [Tue, 30 Mar 2010 13:09:25 -0500] rev 10790
Merge with stable
Augie Fackler <durin42@gmail.com> [Mon, 15 Mar 2010 14:53:34 -0500] rev 10789
util.termwidth: check stderr first as it's least likely to be redirected
Augie Fackler <durin42@gmail.com> [Mon, 29 Mar 2010 16:44:24 -0500] rev 10788
progress: use stderr instead of stdout; check stderr.isatty()
This means that progress bars will continue to show on the terminal
when both stdin and stdout are redirected.
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 16:11:40 -0500] rev 10787
templatefilters: fix check-code warning
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 15:51:26 -0500] rev 10786
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 15:16:38 -0500] rev 10785
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 15:16:05 -0500] rev 10784
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 15:15:44 -0500] rev 10783
Merge stable heads
Jens Bäckman <jens.backman@gmail.com> [Sun, 28 Mar 2010 20:27:09 +0200] rev 10782
i18n-sv: translated the 'patterns' command
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Mar 2010 21:35:06 -0300] rev 10781
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Mar 2010 21:32:49 -0300] rev 10780
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Mar 2010 20:18:14 -0300] rev 10779
i18n-pt_BR: synchronized with 9f6e30a89f11
Jens Bäckman <jens.backman@gmail.com> [Tue, 23 Mar 2010 21:58:51 +0100] rev 10778
i18n-sv: synchronized with a1cb8ca051c0
Some simpler translations done too
Benjamin Pollack <benjamin@bitquabit.com> [Wed, 24 Mar 2010 16:42:08 -0400] rev 10777
schemes: add Kiln On Demand to default schemes
Greg Ward <greg-hg@gerg.ca> [Thu, 25 Mar 2010 15:37:39 -0400] rev 10776
Fix default style so 'log --copies' has a start and an end.
Mads Kiilerich <mads@kiilerich.com> [Wed, 24 Mar 2010 01:43:24 +0100] rev 10775
Tests with spaces in paths
This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg test'
and introduces other tests for spaces and shell quoting
Matt Mackall <mpm@selenic.com> [Mon, 29 Mar 2010 12:56:16 -0500] rev 10774
tests: add helpers.sh
Sune Foldager <cryo@cyanite.org> [Fri, 26 Mar 2010 17:09:56 +0100] rev 10773
merge with stable
Sune Foldager <cryo@cyanite.org> [Fri, 26 Mar 2010 17:02:49 +0100] rev 10772
push: refactor and optimize prepush
Sune Foldager <cryo@cyanite.org> [Fri, 26 Mar 2010 17:02:36 +0100] rev 10771
push: fix bug in prepush logic and its tests
Sune Foldager <cryo@cyanite.org> [Fri, 26 Mar 2010 17:02:23 +0100] rev 10770
localrepo: change _updatebranchcache to use a context generator
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Mar 2010 19:44:53 +0100] rev 10769
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Mar 2010 19:44:30 +0100] rev 10768
setup.py: don't use tabs
Matt Mackall <mpm@selenic.com> [Tue, 23 Mar 2010 17:24:17 -0500] rev 10767
Merge with crew
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:23:04 +0100] rev 10766
run-tests: force to test pure on pypy as well
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:22:17 +0100] rev 10765
Fix run-tests.py -jX after 2ed667a9dfcb
Matt Mackall <mpm@selenic.com> [Tue, 23 Mar 2010 17:06:58 -0500] rev 10764
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 22:59:31 +0100] rev 10763
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 20:45:08 +0100] rev 10762
rebase: fix --collapse with --keepbranches (issue2100)
This was broken in 38fe86fb16e3.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Mar 2010 20:01:30 +0100] rev 10761
setup: fail if bz2 is not available
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 22 Mar 2010 22:19:40 +0100] rev 10760
test-convert-cvs: filter unstable cvs output.
The order choosen by cvs to display commit is not stable when the tests are run
under heavy CPU/IO load. This leads to irrelevant failures of the test suite.
This changeset filters four lines impacted by this instability. The result of
the conversion is still verified.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Mar 2010 11:48:14 +0100] rev 10759
help: point out need for stringification
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:31 +0100] rev 10758
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:01 +0100] rev 10757
posix: move a global fcntl import to keep it from breaking jython
Only needed on darwin, anyway.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:36:19 +0100] rev 10756
util: fake the builtin buffer if it's missing (jython)
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 10:18:46 +0100] rev 10755
mq: fix qcommit documentation wrt --mq option
Matt Mackall <mpm@selenic.com> [Mon, 22 Mar 2010 17:03:33 -0500] rev 10754
Merge with stable
Konstantin Zemlyak <zart@zartsoft.ru> [Mon, 22 Mar 2010 15:16:27 +0100] rev 10753
wsgicgi: call close() on iterable to avoid resource leaks
Quoting PEP 333 (WSGI):
"If the iterable returned by the application has a close() method, the server
or gateway must call that method upon completion of the current request,
whether the request was completed normally, or terminated early due to
an error. (This is to support resource release by the application.
This protocol is intended to complement PEP 325's generator support,
and other common iterables with close() methods."
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 22 Mar 2010 11:08:52 +0100] rev 10752
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 22 Mar 2010 11:08:42 +0100] rev 10751
patch: warn when the internal patcher fails
hopefully we'll soon fix the remaining failures from the internal patcher, and
not use the external one anymore.
Brodie Rao <brodie@bitheap.org> [Mon, 22 Mar 2010 01:36:12 -0400] rev 10750
run-tests: make sure GREP_OPTIONS isn't set
This can interfere with test output, especially for options like --color.
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 16:57:24 -0500] rev 10749
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Mar 2010 14:47:05 +0100] rev 10748
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Mar 2010 21:16:22 +0100] rev 10747
patch: differentiate start of file with diff --git vs '--- '
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 10:01:56 -0500] rev 10746
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Mar 2010 22:52:38 +0100] rev 10745
patch: try harder to find the file to patch on file creation (issue2041)
accept the following patch header:
first line: foo/a.orig
second line: foo/a
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:05:16 -0500] rev 10744
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:04:49 -0500] rev 10743
Merge with i18n
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:04:00 -0500] rev 10742
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:37:14 -0300] rev 10741
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:36:44 -0300] rev 10740
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:31:08 -0300] rev 10739
i18n-pt_BR: synchronized with e930017f9e2a
Martin Geisler <mg@lazybytes.net> [Sat, 06 Mar 2010 10:02:45 +0100] rev 10738
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 06 Mar 2010 08:58:03 +0000] rev 10737
l10n: Updates to Danish (da) translation
Transmitted-via: Transifex (www.transifex.net)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Mar 2010 12:45:39 +0100] rev 10736
patch: second line of a context diff starts with '--- ', not '+++ '
Martin Geisler <mg@lazybytes.net> [Fri, 19 Mar 2010 11:32:55 +0100] rev 10735
Merge with stable
Cédric Duval <cedricduval@free.fr> [Mon, 15 Mar 2010 22:37:38 +0100] rev 10734
patchbomb: --desc implies --intro
For a single patch, an introductory text should not remain unsent
if --intro has been omitted, as the intent of --desc is clear.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 19 Mar 2010 10:39:01 +0100] rev 10733
wix: don't show version in title of root feature
The version is already shown in the title bar of the feature selection dialog
and in the text of the welcome dialog. It's unusual for Windows programs to repeat
the version in the root feature.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 19 Mar 2010 10:26:19 +0100] rev 10732
wix: use build variable for VC redist source dir
Brendan Cully <brendan@kublai.com> [Thu, 18 Mar 2010 14:36:24 -0700] rev 10731
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 18 Mar 2010 19:26:56 +0100] rev 10730
mq: allow lines starting with '--- ' in patch messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 18 Mar 2010 18:22:34 +0100] rev 10729
patch: enhance diff detection regexp, allow '--- ' in patch message
Sune Foldager <cryo@cyanite.org> [Thu, 18 Mar 2010 16:38:07 +0100] rev 10728
fix bug in hg.clone when passing in a repository object
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 18 Mar 2010 16:32:03 +0100] rev 10727
check-code: more tests and more robust python filtering
Martin Geisler <mg@lazybytes.net> [Thu, 18 Mar 2010 01:59:53 +0100] rev 10726
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 18 Mar 2010 01:58:26 +0100] rev 10725
localrepo: more specific warning on adding large files
With better language as suggested by timeless.
Matt Mackall <mpm@selenic.com> [Wed, 17 Mar 2010 18:15:16 -0500] rev 10724
progress: drop extra args for pos=None calls (issue2087)
Matt Mackall <mpm@selenic.com> [Wed, 17 Mar 2010 15:36:48 -0500] rev 10723
check-code: fix check-code complaint
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Mar 2010 14:15:33 +0100] rev 10722
check-code: improve quote detection regexp, add tests
Martin Geisler <mg@lazybytes.net> [Wed, 17 Mar 2010 10:55:28 +0100] rev 10721
Merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 17 Mar 2010 10:51:26 +0100] rev 10720
check-code: add a return value to checkfile function
The checkfile function returns True if the file is correct, False
otherwise.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:53:00 +0100] rev 10719
code-code: Add a logfunc argument to checkfile
This helps external tool customisation. The logfunc argument must be a
function called to report errors. A new logger class is also added to
keep the old behaviour by default.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:52:58 +0100] rev 10718
check-code: Add a ``maxerr`` argument to the ``checkfile`` function
check-code.py used to halt after 15 errors. This changeset adds a new
argument to the checkfile function to control this limit.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:52:57 +0100] rev 10717
check-code: Add a ``checkfile`` function
The part of the code actually checking each file is moved in the
``checkfile`` function to allow external reuses.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:52:56 +0100] rev 10716
check-code: Only call check-code if __name__ = "__main__".
This changeset moves the code that actually executes something to the
"if __name__ = '__main__'" section to allow the file to be imported as
a module.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:52:55 +0100] rev 10715
add a small test for contrib/check-code.py
This changeset adds a test file for contrib/check-code.py. This test runs
check-code.py against two small files. The first file should not raise any
check-code.py error while the second should. A line contains multiple errors to
verify the check-code.py behaviour: In the case of multiple errors at the same
line, the context line should only be displayed once.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:29:16 +0100] rev 10714
keyword: do not bother about detecting extension path in demo
Detecting and showing the path to a keyword extension in a
non-standard place only made sense while keyword.py was not
shipped with Mercurial.
The test output has changed because we do not have a spurious
space at eol anymore.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:58 +0100] rev 10713
keyword: make kwdemo less verbose
1) Set the branchname always silently with
dirstate.setbranch().
We create a branch so that testing the {branches} template
does not come up empty. But kwdemo is hardly the place to
inform the user by inference why {branches} is empty on the
default branch.
"demobranch" is ascii and cannot be changed, so using the
internal command instead of commands.branch() is safe.
2) Do not show full path to temporary directory
(distracting long lines on Mac OS X).
3) No special debug output. Output only related to keyword,
no internals like unsetting of commit hooks etc.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 10712
keyword: 1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:27:22 +0100] rev 10711
keyword: do not customize ui.note() when overwriting
Behaviour change:
hg commit --verbose now prints out the names of the files
which are overwritten.
Cédric Duval <cedricduval@free.fr> [Mon, 15 Mar 2010 20:52:22 +0100] rev 10710
mq: test for init --mq with a destination argument
Adrian Buehlmann <adrian@cadifra.com> [Tue, 16 Mar 2010 17:39:12 +0100] rev 10709
contrib/wix: fix product name to include version
Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.
Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as
'Mercurial 1.5.1032' for a stable 1.5+32-35893dcfd40c
'Mercurial 1.5.5080' for a unstable 1.5+80-1ee60e82333c
when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.
Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads
"The Setup Wizard will install Mercurial 1.5 on your computer"
instead of just
"The Setup Wizard will install Mercurial on your computer"
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 16:41:22 +0100] rev 10708
help: it's not necessary to escape quotes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 16:39:17 +0100] rev 10707
check-code: remove simple quotes first
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:16:19 +0100] rev 10706
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:16:04 +0100] rev 10705
filelog: no need to optimize an uncommon case, assume meta = {}
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:12:46 +0100] rev 10704
filelog: text is stored modified when it starts with '\1\n'
Matt Mackall <mpm@selenic.com> [Mon, 15 Mar 2010 16:36:32 -0500] rev 10703
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 12 Mar 2010 16:16:47 -0600] rev 10702
check-code: add check for any/all
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Mar 2010 19:55:52 +0100] rev 10701
cvsps: fix traceback involving 'synthetic'
https://bugzilla.redhat.com/show_bug.cgi?id=573666
Reported by Sjoerd Mullender
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:40:00 +0100] rev 10700
progress: use a verb in present participle
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:36:11 +0100] rev 10699
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:33:39 +0100] rev 10698
progress: use a verb (+noun) in present participle
Edouard Gomez <ed.gomez@free.fr> [Sun, 14 Mar 2010 00:28:10 +0100] rev 10697
subrepo: fix hgrc paths section during subrepo pulling
There are two bugs in current subrepo ctor:
- hgrc paths were using parent repo (ctx._repo) instead of self._repo
- it was joined with local extract path, not its source repo path
Fixed both bugs using _abssource on self once it is fully initialized.
It gets the job done perfectly for pull and push urls.
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Mar 2010 23:18:50 +0100] rev 10696
Merge with crew-stable
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Tue, 09 Mar 2010 12:09:57 +0100] rev 10695
convert: teach cvsps to handle . repository (issue1649)
For a CVS repository checked out with "cvs co .", the prefix used to strip of
what we get from CVS was previously erroneously set to "repopath/.".
We now prevent the dot to be added.
Test folded in test-convert-cvs and simplified by Patrick Mézard
<pmezard@gmail.com>.
Martin Geisler <mg@lazybytes.net> [Sun, 14 Mar 2010 23:10:52 +0100] rev 10694
record: separate each hunk with a blank line
This makes it easier for the eye to find the beginning of a hunk when
scrolling up in the terminal.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 22:17:10 +0100] rev 10693
mq: do not try to delete non-existent files (regression from e8e56d8377ab)
Martin Geisler <mg@lazybytes.net> [Sun, 14 Mar 2010 22:21:48 +0100] rev 10692
Merge with stable
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 18:46:38 +0100] rev 10691
mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 19:21:24 +0100] rev 10690
mq: no longer refer to deprecated qinit -c command
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 19:17:06 +0100] rev 10689
mq: don't mention qinit as a "common task"
Without -c, it is a no-op (the queue is implicitly initialized by all
relevant commands if needed), and queue repositories with -c are an
advanced usage of mq, and not otherwise required.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 19:09:55 +0100] rev 10688
mq: don't use regexp when not necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 14:53:20 +0100] rev 10687
mq: use xrange/enumerate instead of += 1
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 14:45:01 +0100] rev 10686
mq: don't use len(list) unless necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 12:08:14 +0100] rev 10685
mq: find_series() simplify and don't use regexps
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 11:12:51 +0100] rev 10684
mq: fix coding style (missing space)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 11:12:07 +0100] rev 10683
mq: qsave creates entries with the left part empty (':patchname')
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:35:54 +0100] rev 10682
mq: simplify statusentry(), fix restore broken by ee48e5ef8753
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:06:58 +0100] rev 10681
mq: use context API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:01:17 +0100] rev 10680
mq: simplify qparents calculation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 00:53:55 +0100] rev 10679
mq: simplify commit message generation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 00:36:10 +0100] rev 10678
mq: avoid many hex/bin conversions, keep the binary node when possible
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 07 Feb 2010 17:12:41 +0100] rev 10677
rebase: add option to not commit after a collapsing
This option is useful when other extensions (e.g., pbranch) want to
use rebase --collapse and append other things before committing.
This is not intended to be used from command line.
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Mar 2010 20:02:46 +0100] rev 10676
Merge with crew-stable
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:28:31 +0900] rev 10675
hgweb: make code to join url path simpler
Now SCRIPT_NAME never contains http://host:port part,
we don't need to care about '://'.
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:28:27 +0900] rev 10674
hgweb: fix broken URLs of RSS/Atom feeds (issue1772)
This fixes doubled URL, e.g. http://example.orghttp://example.org/...,
which appears on RSS/Atom feeds served by hgwebdir.
It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME,
according to RFC 3875.
Updated the test output since SCRIPT_NAME becomes not to contain
http://host:port part.
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:25:46 +0900] rev 10673
hgweb: introduce helper method to update req.env
Greg Ward <greg-hg@gerg.ca> [Tue, 02 Mar 2010 15:08:43 -0500] rev 10672
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
Martin Geisler <mg@lazybytes.net> [Sat, 13 Mar 2010 19:57:52 +0100] rev 10671
subrepo: wrap long line
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 17:02:41 +0100] rev 10670
merge with stable
Brodie Rao <me+hg@dackz.net> [Fri, 05 Mar 2010 17:38:02 -0500] rev 10669
test-extension: fix disabled extension tests for run-tests.py --local
One test that requires inserting a broken extension into hgext does this
by modifying PYTHONPATH. This doesn't work when run with --local because
the 'hg' script being used is in the same directory as the local hgext.
Instead of modifying PYTHONPATH, a secondary extension is enabled using
--config that inserts the dummy hgext at the beginning of sys.path,
before the script's path.
Edouard Gomez <ed.gomez@free.fr> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10668
subrepo: print subrepo pulling URL
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 16:44:52 +0100] rev 10667
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10666
subrepo: keep ui and hgrc in sync when creating new repo
Edouard Gomez <ed.gomez@free.fr> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10665
subrepo: forward the push to argument into _abssource
Greg Lindahl <greg@blekko.com> [Sat, 13 Mar 2010 16:19:28 +0100] rev 10664
mercurial.spec: remove reference to doc/ja
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 12:57:20 +0100] rev 10663
mq: simplify and use context API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 00:08:06 +0100] rev 10662
mq: avoid a (potentially expensive) repo.status(unknown=True) call
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 00:02:33 +0100] rev 10661
mq: all_files can be a set, remove dangerous default values
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:50:41 +0100] rev 10660
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:45:27 +0100] rev 10659
rebase: remove unnecessary \" from help string
They are not needed inside triple-quoted strings and they confuse the
line number computation done in i18n/hggettext. The script tries to
find the docstring in the source file. When \" in the source is turned
into just " in the docstring, the docstring can no longer be found.
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Mar 2010 03:07:35 +0100] rev 10658
test-merge-default and check-code.py: No "export x=x" in sh
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:02:39 +0100] rev 10657
Merge with stable
Augie Fackler <durin42@gmail.com> [Thu, 11 Mar 2010 16:54:34 -0600] rev 10656
progress: document progress.disable config option
Martin Geisler <mg@lazybytes.net> [Thu, 11 Mar 2010 23:44:12 +0100] rev 10655
shrink-revlog: add missing whitespace in expression
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Mar 2010 19:09:35 +0100] rev 10654
any is not available for python2.4
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 10653
keyword: update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 10652
keyword: remove deprecated options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Mar 2010 17:43:44 +0100] rev 10651
style: use consistent variable names (*mod) with imports which would shadow
David Wolever <david@wolever.net> [Thu, 11 Mar 2010 15:52:17 +0100] rev 10650
archive: autodetect archive type by extension (issue2058)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 11 Mar 2010 15:38:35 +0100] rev 10649
merge with stable
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 15:32:24 +0100] rev 10648
tests: use external coverage, mandate newer version
This removes the option for including the stdlib in coverage reports.
Eric Eisner <ede@mit.edu> [Thu, 11 Mar 2010 09:11:01 -0500] rev 10647
churn: use ui.progress instead of --progress
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:53:16 -0500] rev 10646
rebase: improve help text
- add a paragraph about default dest/source changesets
- option help: say "changeset" not "revision"
- option help: explain -b/--base better
- clarify that -a/--abort and -c/--continue are different from the
other options
Martin Geisler <mg@lazybytes.net> [Thu, 11 Mar 2010 14:56:15 +0100] rev 10645
commands: remove extra indentation from list in help text
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:33:29 +0100] rev 10644
server: initialize wsgi app in command, then wrap server around it
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:32:43 +0100] rev 10643
server: unnest server classes into module namespace
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:32:26 +0100] rev 10642
server: pass wsgi application to server (no need for non-local var)
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:31:37 +0100] rev 10641
server: abstract setup of ipv6 vs. normal server
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:30:52 +0100] rev 10640
server: handle server-internal config setup inside server class
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:28:39 +0100] rev 10639
server: externalize and streamline mixin setup
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 11:21:48 +0100] rev 10638
server: externalize application creation
timeless <timeless@gmail.com> [Thu, 11 Mar 2010 10:06:01 +0200] rev 10637
commands: document and test hg clone update priority
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:53:16 -0500] rev 10636
rebase: improve help text
- add a paragraph about default dest/source changesets
- option help: say "changeset" not "revision"
- option help: explain -b/--base better
- clarify that -a/--abort and -c/--continue are different from the
other options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 22:27:42 +0100] rev 10635
serve: fix port config
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Mar 2010 22:07:38 +0100] rev 10634
merge with other head, will show bug in hg serve
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Mar 2010 22:05:41 +0100] rev 10633
test-serve: Show if port config and option are correctly used
this will break in d3f27d15c9cb
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Mar 2010 21:35:38 +0100] rev 10632
drop (default: 8000), non-zero default is automatically added to help
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Mar 2010 21:21:15 +0100] rev 10631
make expression shorter, now the line fits into 80 chars
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 21:14:24 +0100] rev 10630
serve: fix options recording, trailing whitespace
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Mar 2010 10:51:37 -0800] rev 10629
serve: allow --port=0 to specify "server chooses the port number"
Sune Foldager <cryo@cyanite.org> [Wed, 10 Mar 2010 12:38:33 +0100] rev 10628
rebase: improve output of hg pull --rebase (issue2072)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:52:16 +0100] rev 10627
shrink-revlog: factor out postorder algorithm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:51:07 +0100] rev 10626
shrink-revlog: factor out suboptimal computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:48:15 +0100] rev 10625
shrink-revlog: remove branchsort algorithm (it behaves poorly)
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:25:37 -0500] rev 10624
shrink-revlog: add accounting of suboptimal nodes to the new algorithms.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:22:01 -0500] rev 10623
shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts.
Based on a patch by Benoit Boissinot, adapted to the pluggable sort
algorithm design. toposort_reversepostorder() is a very good
performer; it's designed to recreate what the revlog would have looked
like if Mercurial had parent deltas now. toposort_postorderreverse()
is unstable and very inconsistent, but perhaps with some work it could
be made better.
Greg Ward <greg-hg@gerg.ca> [Thu, 25 Feb 2010 09:16:39 -0500] rev 10622
shrink-revlog: add --sort option for user-selectable toposort algorithm.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:30:19 -0500] rev 10621
shrink-revlog: rename some local variables for consistency.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:13:39 -0500] rev 10620
shrink-revlog: instrument sort code to record statistics.
Notably, count "suboptimal" nodes (predecessor is not first parent)
and (with -v) report them at the end of the run.
Patrick Mezard <pmezard@gmail.com> [Tue, 09 Mar 2010 22:18:37 +0100] rev 10619
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 09 Mar 2010 22:11:43 +0100] rev 10618
convert: handle svn tree with empty roots (issue2079)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 20:47:35 +0100] rev 10617
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 20:38:23 +0100] rev 10616
bundle: fix bundle generation for empty changegroup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 19:04:18 +0100] rev 10615
patch/diff: move diff related code next to each other
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 18:31:57 +0100] rev 10614
remove header handling out of mdiff.bunidiff, rename it
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 18:27:02 +0100] rev 10613
remove contrib/hgdiff, it makes refactoring diff/patch harder
it can always be revived if needed
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 09 Mar 2010 16:03:57 +0100] rev 10612
demandimport: blacklist _ssl (issue1964)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 19:43:24 +0100] rev 10611
patch/diff: move patch.export() to cmdutil.export()
This API change will allow us to break a cycle between patch and cmdutil.
Steve Borho <steve@borho.org> [Mon, 08 Mar 2010 11:12:48 -0600] rev 10610
wix: pre-check the 'I approve this license' checkbox
This is simply a convenience to the user, they can click next until the
installer goes away. Optimally, the checkbox would be hidden or removed,
but that requires rewriting the UI.
Matt Mackall <mpm@selenic.com> [Sun, 07 Mar 2010 22:04:35 -0600] rev 10609
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 00:01:12 +0100] rev 10608
addremove: avoid fetching data again and again
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 00:00:03 +0100] rev 10607
addremove: add progress support for similarity search
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Mar 2010 23:59:28 +0100] rev 10606
addremove: atomically update the dirstate
In case someone hits ^C during the similarity search, properly rollback
Greg Ward <greg-hg@gerg.ca> [Sun, 07 Mar 2010 13:10:23 -0500] rev 10605
inotify: expose the same dirstate.status() interface as dirstate.
The real dirstate.status() does not have any keyword args. For
consistency, wrappers or subclasses should not have them either.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 13:03:03 +0100] rev 10604
keyword: remove spurious locks, improve handling of wlock
- kwcommitctx is inside the wlock of repo.commit: no lock
- _kwfwrite only needs wlock
wlock outside try block, so we don't need to import lock.release
_kwfwrite should even be safer that way, as we moved the status
call inside the try-except block.
Thanks to Benoit Boissinot for help.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 13:03:03 +0100] rev 10603
keyword: use status' names instead of index
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Mar 2010 17:44:43 +0100] rev 10602
hgweb/graph: edge should be same color as the destination
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 13:29:54 +0100] rev 10601
templatefilters: store the agescales in reverseorder directly
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 12:45:14 +0100] rev 10600
hgweb: separate generation of entries and sorting (cleanup)
Brendan Cully <brendan@kublai.com> [Fri, 05 Mar 2010 18:08:23 -0800] rev 10599
Merge stable
Greg Ward <greg-hg@gerg.ca> [Wed, 20 Jan 2010 20:23:36 -0500] rev 10598
demandimport: add __main__ to the blacklist (because of setuptools)
Paul Molodowitch <pm@stanfordalumni.org> [Thu, 17 Dec 2009 15:53:28 -0800] rev 10597
bookmarks: add invalidate() to bookmark_repo
Cached bookmark information would not be reset when repo.invalidate()
was called, meaning (for instanced) guis would be left with out-of-date
bookmark info. This patch fixes that by overriding bookmark_repo.invalidate()
Yuya Nishihara <yuya@tcha.org> [Tue, 12 Jan 2010 22:49:10 +0900] rev 10596
branch: help misuse of hg branch to switch branches
Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of
'hg update EXISTING_BRANCH' as me.
If so, let's help them to use 'update'.
Also removed '(use --force to override)' because it can mislead them.
Lee Cantey <lcantey@gmail.com> [Sat, 06 Mar 2010 21:29:02 -0800] rev 10595
Make Readme.html reference current OS X release
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 13:32:14 +0100] rev 10594
progress: clear progress before writing to stderr
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 18:26:13 -0600] rev 10593
Added signature for changeset ff2704a8ded3
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 18:26:12 -0600] rev 10592
Added tag 1.5 for changeset ff2704a8ded3
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 17:24:52 -0600] rev 10591
mq: drop -Q in favor of --mq only
Sune Foldager <cryo@cyanite.org> [Fri, 05 Mar 2010 12:27:23 +0100] rev 10590
mq: correct test output
Sune Foldager <cryo@cyanite.org> [Fri, 05 Mar 2010 10:49:56 +0100] rev 10589
mq: disallow : in patch names (issue2065)
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 14:23:54 +0100] rev 10588
mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 13:11:29 +0100] rev 10587
Merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 13:10:48 +0100] rev 10586
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
Martin Geisler <mg@lazybytes.net> [Thu, 04 Mar 2010 10:05:12 +0100] rev 10585
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Thu, 04 Mar 2010 07:34:22 +0100] rev 10584
i18n-sv: translated bisect, dates, locate, manifest
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 04 Mar 2010 11:56:53 +0900] rev 10583
i18n-ja: synchronized with c50a3d7154d2
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 03 Mar 2010 18:46:22 -0300] rev 10582
i18n-pt_BR: synchronized with f142fa3c0a8c
Steve Borho <steve@borho.org> [Wed, 03 Mar 2010 17:37:50 -0600] rev 10581
test-fetch: use relative URL to avoid echoing TMP path
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 22:32:51 +0100] rev 10580
fetch: fix newheads calculation (issue2047)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 22:04:59 +0100] rev 10579
Make annotate --follow an alias for -f/--file to behave like in older versions
Since 98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
Martin Geisler <mg@lazybytes.net> [Wed, 03 Mar 2010 20:35:20 +0100] rev 10578
win32/hgwebdir_wsgi: clarify copyright license
Adrian Buehlmann <adrian@cadifra.com> [Wed, 03 Mar 2010 14:50:35 +0100] rev 10577
store: only add new entries to the fncache file
Newly added fncache entries were not added to the in-memory cache,
making it possible for 'hg convert' to cause duplicates in
.hg/store/fncache.
Duplicates in the fncache file are harmless, but excessive numbers
of duplicates from large converted repositories may slow down
execution speed considerably.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 16:00:02 +0100] rev 10576
Updated test output of test-convert-baz after f2618cacb485
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 15:37:41 +0100] rev 10575
trailing spaces (and one stray tab)
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:59:39 +0100] rev 10574
Merge with default
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:43:27 +0100] rev 10573
Merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:42:43 +0100] rev 10572
add wsgi script for Microsoft IIS with isapi-wsgi
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 21:34:24 +0100] rev 10571
doc/ja: remove old Japanese man page translations
They were added way back in 2005 and haven't been updated since. They
are no longer referenced by the Makefiles at upper levels and have not
been shipped with a recent version of Mercurial.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 20:58:58 +0100] rev 10570
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Tue, 02 Mar 2010 18:36:37 +0100] rev 10569
i18n-sv: synchronized with f4f3a74ce832
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 02 Mar 2010 11:12:14 -0300] rev 10568
i18n-pt_BR: synchronized with b1339234080e
Yuya Nishihara <yuya@tcha.org> [Wed, 03 Mar 2010 00:12:05 +0900] rev 10567
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
HGPLAIN should suppress them because they change Mercurial's default
output.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 10:40:58 +0100] rev 10566
Merge with hg-i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 02 Mar 2010 12:41:27 +0900] rev 10565
i18n-ja: synchronized with bb4561401c84
Yuya Nishihara <yuya@tcha.org> [Mon, 01 Mar 2010 23:27:44 +0900] rev 10564
alias: fixes exception when displaying translated help text
__doc__ of aliased command shouldn't cointain non-ASCII characters,
because it'll be gettext-ed later by commands.help_().
Here gettext can raise UnicodeDecodeError.
Once concatenated two translatable strings into one, it become untranslatable.
So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_,
where help texts are translated.
'alias for:' was introduced by 6e8a16dd3e30.
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:47:39 +0100] rev 10563
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Sun, 28 Feb 2010 19:37:56 +0100] rev 10562
i18n-sv: synchronized with d1bbf01c4a8e
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:44:02 +0100] rev 10561
tests: update output to match b1339234080e
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 01 Mar 2010 14:15:55 +0100] rev 10560
Add ElementPath to the list of package ignored by demand import
The bzrlib try to import the ElementPath module but had a fallback in
case the import fails. Lazy import of this module leads to later
failure.
The bzrlib is used by the convert extension.
Greg Ward <greg-hg@gerg.ca> [Mon, 01 Mar 2010 15:41:21 -0500] rev 10559
resolve: rewrite help to be clearer and more complete (issue2030).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 28 Feb 2010 19:43:21 +0100] rev 10558
mq: simplify --mq handling / keep compatibility with other extensions
reported by edgimar on IRC
Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:06:47 +0100] rev 10557
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:02:20 +0100] rev 10556
i18n-da: synchronized with 091dddf05764
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 24 Feb 2010 13:47:59 -0300] rev 10555
doc/Makefile: fix doc generation when LANGUAGE is set
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 27 Feb 2010 19:58:59 +0900] rev 10554
i18n-ja: synchronized with 4462760d6cfc
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Feb 2010 19:28:23 -0300] rev 10553
i18n-pt_BR: synchronized with dd3526162436
Adrian Buehlmann <adrian@cadifra.com> [Thu, 25 Feb 2010 14:56:09 +0100] rev 10552
contrib/wix: add COPYING.rtf
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.
This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.
It happens to be installed by the msi installer, too.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Feb 2010 16:52:43 +0100] rev 10551
fix test-mq-eol under --pure (mimic diffhelper.c behaviour)
bug discovered by apycot (apycot.hg-scm.org)
Manpreet Singh <junkblocker@yahoo.com> [Wed, 24 Feb 2010 19:43:13 -0800] rev 10550
Updated contrib/vim/patchreview.* to version 0.2.2
- Security fixes by removing custom tempfile creation
- Removed need for DiffReviewCleanup/PatchReviewCleanup
- Better command execution error detection and display
- Improved diff view and folding by ignoring modelines
- Improved tab labels display
Martin Geisler <mg@lazybytes.net> [Thu, 25 Feb 2010 17:06:32 +0100] rev 10549
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Wed, 24 Feb 2010 19:47:51 +0100] rev 10548
i18n-sv: synchronized with fc5908d01ed7
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 21 Feb 2010 20:59:27 +0100] rev 10547
strip: invalidate all caches after stripping (fixes issue1951)
test thanks to Stefano Tortarolo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Feb 2010 14:35:21 +0100] rev 10546
fix test output changed by 2e1a9b811d13
Manpreet Singh <junkblocker@yahoo.com> [Wed, 24 Feb 2010 13:12:17 -0800] rev 10545
Updated contrib/vim/patchreview.* to version 0.2.1
1) adds a :DiffReview command to review code changes
in the current workspace.
2) removes the need to have patchutils (specifically filterdiff)
installed on the system by implementing patch extraction in
pure vim script.
Sune Foldager <cryo@cyanite.org> [Wed, 24 Feb 2010 12:35:26 -0500] rev 10544
httprepo: normalize output from unbundle with ssh
Lines from the remote are prefixed with 'remote: ' and written
locally using ui.status, similar to what sshrepo does.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Feb 2010 18:35:05 +0100] rev 10543
merge with default
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Feb 2010 18:22:45 +0100] rev 10542
shrink: handle all combinations of inline/non-inline revlogs
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 24 Feb 2010 11:04:56 -0300] rev 10541
commands: clarify --config syntax
Steve Borho <steve@borho.org> [Tue, 23 Feb 2010 23:10:01 -0600] rev 10540
progress: provide an explicit disable method for developers
The other three checks for disabling the progress bar have serious
side effects for any class that derives from ui.ui()
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 17:11:37 +0100] rev 10539
url: only mark format string for translation
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 09:26:31 +0100] rev 10538
Merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 09:25:55 +0100] rev 10537
i18n-da: fixed typo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 24 Feb 2010 15:02:06 +0900] rev 10536
i18n-ja: synchronized with eddf859343de
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 23 Feb 2010 12:51:07 -0300] rev 10535
i18n-pt_BR: synchronized with 076e8a8000a3, minor fixes
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Feb 2010 22:31:54 +0100] rev 10534
url: avoid traceback when parsing [auth] (issue2056)
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Feb 2010 23:19:09 +0100] rev 10533
filemerge: use native path separators when merging (issue1399)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 23 Feb 2010 22:56:37 +0100] rev 10532
gpg: make 13448eab08ca work when not on repo root
Sune Foldager <cryo@cyanite.org> [Tue, 23 Feb 2010 11:37:40 -0500] rev 10531
hgweb: use string join instead of slower cStringIO
Sune Foldager <cryo@cyanite.org> [Tue, 23 Feb 2010 11:34:08 -0500] rev 10530
hgweb: fix handling of arguments in the between command
The 'pairs' argument was coded to be optional, but the code would
crash if it was not provided.
Brendan Cully <brendan@kublai.com> [Mon, 22 Feb 2010 23:30:01 -0800] rev 10529
hgcia: report RPC errors
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Feb 2010 06:44:37 +0100] rev 10528
merge with stable
timeless <timeless@mozdev.org> [Tue, 23 Feb 2010 06:42:10 +0100] rev 10527
commands: correct diff -c explanation
Sune Foldager <cryo@cyanite.org> [Mon, 22 Feb 2010 23:12:12 -0500] rev 10526
httprepo: send Content-Type instead of content-type
Sune Foldager <cryo@cyanite.org> [Mon, 22 Feb 2010 16:28:57 +0100] rev 10525
httprepo: use content-type application/mercurial-0.1 for POST
Previously, application/octet-stream was used. The content-type is
currently ignored by the server.
Patrick Mezard <pmezard@gmail.com> [Mon, 22 Feb 2010 22:55:58 +0100] rev 10524
patch: fix patching with fuzz and eol normalization
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Sun, 21 Feb 2010 15:26:55 +0100] rev 10523
make the progress extension honor ui.quiet
Saint Germain <saintger@gmail.com> [Mon, 22 Feb 2010 01:19:59 +0100] rev 10522
subrepo: Update .hgsubstate in case of deleted subrepo
When a subrepo is deleted from .hgsub, it also needs to be removed from
.hgsubstate. Previous code was updating .hgsubstate only in case of newly or
modified subrepo.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 21 Feb 2010 22:16:35 +0100] rev 10521
Do not use osutil.c with python 2.4 and Windows (issue1364)
Windows python 2.4 os.stat() reports times including DST offset, while osutil.c
reports the correct value, which makes status() systematically compare files
content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c
is 4x times slower on large repositories but current code is completely
unusable. Given few people are likely to use python 2.4 on Windows this
solution was considered a good trade-off compared to more invasive solutions
trying to address the offset issue.
timeless <timeless@mozdev.org> [Sun, 21 Feb 2010 01:21:17 +0200] rev 10520
commands: mention diff -c
Martin Geisler <mg@lazybytes.net> [Sat, 20 Feb 2010 20:08:42 +0100] rev 10519
progress: mark units for translation
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 19 Feb 2010 13:04:11 -0200] rev 10518
patch, i18n: avoid parameterized messages
Singular message removed for simplicity.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Feb 2010 15:18:59 +0100] rev 10517
gpg: do not call status on the whole repository, only on '.hgsigs'
Brodie Rao <me+hg@dackz.net> [Fri, 19 Feb 2010 22:16:42 -0500] rev 10516
pager: set ui.interactive=False when enabled
This stops interactive-only things like progress bars from showing up
inside the pager.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Feb 2010 20:34:23 -0500] rev 10515
identify: don't include unknown in status
Brendan Cully <brendan@kublai.com> [Fri, 19 Feb 2010 16:50:47 -0800] rev 10514
zeroconf: suppress traceback during shutdown
If the read thred is in select when the main thread is in close, the main
thread may close the socket between select and read, generating a noisy
traceback. This can be ignored if the shutdown flag is set.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 19 Feb 2010 21:48:09 +0100] rev 10513
contrib/wix: switch *.wxs files to LF eol
Steve Borho <steve@borho.org> [Thu, 18 Feb 2010 23:23:17 -0600] rev 10512
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:51:35 +0100] rev 10511
url: *args argument is a tuple, not a list (found by pylint)
E1101:514:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member
E1101:516:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:23:38 +0100] rev 10510
i18n: mark more strings for translation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:11:37 +0100] rev 10509
shrink-revlog: remove unneeded imports and useless code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:07:13 +0100] rev 10508
shrink-revlog: add strings for translation / import _ before using it
Brodie Rao <me+hg@dackz.net> [Thu, 18 Feb 2010 16:51:39 -0500] rev 10507
ui: unset ui.slash when HGPLAIN is set
Brodie Rao <me+hg@dackz.net> [Thu, 18 Feb 2010 16:50:49 -0500] rev 10506
ui: suppress aliases when HGPLAIN is set
Greg Ward <greg-hg@gerg.ca> [Mon, 15 Feb 2010 15:25:29 -0500] rev 10505
merge: fix --preview to show all nodes that will be merged (issue2043).
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
Greg Ward <greg-hg@gerg.ca> [Mon, 15 Feb 2010 15:07:21 -0500] rev 10504
test-merge-default: make content of test repo clearer.
Makes it easier to understand and modify the test.
(issue2043).
Adrian Buehlmann <adrian@cadifra.com> [Thu, 18 Feb 2010 20:47:12 +0100] rev 10503
contrib/wix: MSVC CRT libraries are installed in WinSxS
not in %system32%
Steve Borho <steve@borho.org> [Thu, 18 Feb 2010 13:05:15 -0600] rev 10502
Add WiX installer scripts to contrib/wix
Brendan Cully <brendan@kublai.com> [Thu, 18 Feb 2010 10:46:01 -0800] rev 10501
import: if in doubt, consume stream until start of diff
This prevents a header-like line in the message body from causing a spurious split.
Alistair Bell <alistair@bellsonline.com> [Thu, 18 Feb 2010 10:32:51 +0100] rev 10500
bdiff: do not use recursion / avoid stackoverflow (issue1940)
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Feb 2010 05:55:05 +0100] rev 10499
keyword: mark improved demo commit message for translation
s/config/configuration/
Inside the quoted command put the message in single quotes in case
the translation contains apostrophes.
Brendan Cully <brendan@kublai.com> [Wed, 17 Feb 2010 14:35:11 -0800] rev 10498
mq: iterate over a copy of the command table keys (fixes issue2045).
I hope.
Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:10:22 +0100] rev 10497
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:07:50 +0100] rev 10496
progress: mark strings for translation
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 17:11:20 +0100] rev 10495
keyword: do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:44:49 +0100] rev 10494
inotify/inserve: implement --timeout-idle option (issue885)
hg inserve was ignoring and miscomputing the --timeout-idle option (seconds
vs. minutes).
Thanks to Jesse Glick for the bugreport and the initial patch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:30:57 +0100] rev 10493
regression: missing arg from 24ce8f0c0a39 dirstate.{walk,status} changes
Sune Foldager <cryo@cyanite.org> [Wed, 17 Feb 2010 15:43:21 +0100] rev 10492
run commit and update hooks after command completion (issue1827)
Previously, the working dir state hadn't been written when these
hooks were invoked, so external commands couldn't see all changes.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 11:00:48 +0100] rev 10491
http: len(x) fails if it doesn't fit into an int, use __len__() instead
len(x) raises OverflowError if it's bigger than 2**31-1, we need to call
__len__() ourself instead.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 16 Feb 2010 21:04:04 +0100] rev 10490
filelog: sort meta entries, ensure deterministic order
Martin Geisler <mg@lazybytes.net> [Tue, 16 Feb 2010 23:28:46 +0100] rev 10489
Merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Tue, 16 Feb 2010 22:01:27 +0100] rev 10488
i18n-sv: synchronized with 44b4a2a31623
Steve Losh <steve@stevelosh.com> [Tue, 16 Feb 2010 09:31:35 -0500] rev 10487
util: use the built-in any() and all() methods if they are available
Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 21:18:16 -0600] rev 10486
mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 20:28:42 -0600] rev 10485
hgrc.5: document use of environment variables on Windows
This feature was introduced in c31ac3f7fd8f
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 22:39:36 +0100] rev 10484
url: correctly quote '/' in user and password embedded in urls
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 15 Feb 2010 16:34:59 -0200] rev 10483
i18n-pt_BR: synchronized with 44b4a2a31623
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 18:12:50 +0100] rev 10482
url: fix python < 2.6 with ssl installed
_GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to
the right hunk.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 15 Feb 2010 09:57:11 +0100] rev 10481
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
Brendan Cully <brendan@kublai.com> [Mon, 15 Feb 2010 00:16:59 -0800] rev 10480
mq: unify implementation of qinit and init -Q
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 16:10:05 -0500] rev 10479
bundle: exclude csets given in --base, unless they are in --rev (issue1910)
Thanks Jesse Glick for the first version of this patch.
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:17:18 +0100] rev 10478
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:14:16 +0100] rev 10477
Merge with default
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:12:10 +0100] rev 10476
mq: more instructive use of "--" in qguard help (issue2040)
Brodie Rao <me+hg@dackz.net> [Sun, 14 Feb 2010 17:08:52 -0500] rev 10475
color: don't crash on invalid status codes (issue2036)
If an unknown file with a newline appears in the status output, color
shouldn't raise a KeyError trying to parse second line in the filename.
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 14 Feb 2010 23:17:28 +0100] rev 10474
Add progress extension to win32 default config file
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 20:28:49 +0100] rev 10473
test-interhg: test the extension
Wagner Bruna <wbruna@yahoo.com> [Sat, 06 Feb 2010 21:25:02 -0200] rev 10472
interhg: fixes regression introduced by 38170eeed18c
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 17:09:52 +0100] rev 10471
progress: use inline literals in help string
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 19:15:56 +0100] rev 10470
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:39:16 +0100] rev 10469
Fix test-push-validation under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:19:18 +0100] rev 10468
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 17:53:23 +0100] rev 10467
patch: remove useless copy, cleanup
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 11 Feb 2010 11:22:57 -0200] rev 10466
patch: separate reverse copy data (issue1959)
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 15:45:12 +0100] rev 10465
Add test for progress extension
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 15:42:47 +0100] rev 10464
progress: make progress.refresh=0 always display the progress line
This has no effect in real world where progress.refresh in unlikely to be set
to zero, but is very useful in tests where all progress output is to be traced.
It failed on platforms with coarse time.time() granularity, like Windows+py25.
Brodie Rao <me+hg@dackz.net> [Sun, 14 Feb 2010 01:52:31 -0500] rev 10463
remove unused imports
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 13:58:30 +0100] rev 10462
progress: make use of progress.refresh
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 13:29:11 +0100] rev 10461
i18n: merge default into stable
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 13:28:34 +0100] rev 10460
Merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Sun, 14 Feb 2010 00:08:26 +0100] rev 10459
i18n-sv: nine basic commands translated
Translated the following commands:
bundle, branch, branches, cat, copy, grep, heads, identify, incoming
Also did a sync with 956498af9812.
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 13:05:51 +0100] rev 10458
Merge with crew-stable
David Soria Parra <dsp@php.net> [Tue, 09 Feb 2010 18:32:57 +0100] rev 10457
subrepo: make sure that the source path is stripped
Test by Patrick Mézard <pmezard@gmail.com>
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:50:38 -0600] rev 10456
1.5 code freeze: merge default into stable
Brodie Rao <me+hg@dackz.net> [Sun, 07 Feb 2010 14:56:18 +0100] rev 10455
ui: add HGPLAIN environment variable for easier scripting
If HGPLAIN is set, the following settings are ignored when read from
hgrc files:
- ui.debug
- ui.fallbackencoding
- ui.quiet
- ui.traceback
- ui.verbose
- defaults.*
Localization is also disabled.
Equivalent options set via command line are honored.
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:24:27 -0600] rev 10454
tests: update help for add
Brodie Rao <me+hg@dackz.net> [Sat, 13 Feb 2010 23:34:15 -0500] rev 10453
progress: make determinate bar more like wget progress bar
foo [ ] 0/58
foo [> ] 1/58
foo [=> ] 2/58
...
foo [=======================================================> ] 56/58
foo [========================================================> ] 57/58
foo [=========================================================>] 58/58
The bar now has a '>' character at the end. This indicates the direction,
is consistent with the indeterminate '<=>' bar, and looks much nicer.
Brodie Rao <me+hg@dackz.net> [Sat, 13 Feb 2010 23:34:20 -0500] rev 10452
progress: simplify spacejoin()
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:20:17 -0600] rev 10451
check-code: two more rules
- no plain Exceptions
- complain about unmarked ui messages
timeless <timeless@mozdev.org> [Sun, 14 Feb 2010 00:46:13 +0200] rev 10450
progress: fix description
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 17:37:44 -0600] rev 10449
parsers: fix some signed comparison issues
(spotted by Steve Borho)