Patrick Mezard <pmezard@gmail.com> [Mon, 26 Apr 2010 22:30:40 +0200] rev 11010
util: fix default termwidth() under Windows
sys.stdout.write('-'*80 + '\n')
or
sys.stdout.write('-'*80 + '\r')
do not work on Windows as they do on unix. On a 80 columns Windows console, the
extra CR or LF are interpreted as if belonging to the next line, so the first
command displays 2 lines (only one on unix) and the second one leave the line
visible and move back to the following line. To avoid this, we sacrifice one
column under Windows.
Martin Geisler <mg@lazybytes.net> [Mon, 26 Apr 2010 21:35:09 +0200] rev 11009
commands: better markup in "hg help paths"
Martin Geisler <mg@lazybytes.net> [Mon, 26 Apr 2010 21:32:46 +0200] rev 11008
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Tue, 27 Apr 2010 00:44:06 +0530] rev 11007
commands: revised documentation of 'default' and 'default-push'
This patch was a collaborative effort between faheem, mg, timeless and
ilowe.
Steve Borho <steve@borho.org> [Mon, 26 Apr 2010 11:33:37 -0500] rev 11006
wix: hgweb file renames
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11005
zeroconf: handle string hgweb config args
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11004
hgweb: unify hgweb calls in serve
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11003
serve: webdir_conf -> webconf
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11002
hgweb: synchronize fcgi and wsgi scripts
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11001
hgweb: drop hgwebdir.cgi, now unified with hgweb.cgi
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 11000
hgweb: simplify hgweb.cgi, add help pointer
- move important config to the top
- add help pointer
- drop encoding hack comment (use web.encoding)
- simplify imports
- use unified hgweb interface
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10999
help: add some help for hgweb.config files
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10998
help: config.txt typo
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10997
docs: document default for web.encoding
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10996
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10995
hgweb: always clear report_untrusted and interactive
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10994
hgweb: add baseui to hgweb entrypoint
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10993
hgweb: make baseui parameter non-positional
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:03:40 -0500] rev 10992
hgweb: make top-level prototypes mirror their callees
Matt Mackall <mpm@selenic.com> [Mon, 26 Apr 2010 11:02:11 -0500] rev 10991
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Apr 2010 14:40:34 +0200] rev 10990
test-convert-git: be tolerant to git output variants
Patrick Mezard <pmezard@gmail.com> [Fri, 23 Apr 2010 14:29:44 +0200] rev 10989
color: handle non-standard stdout on win32
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Apr 2010 23:36:56 +0200] rev 10988
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Apr 2010 23:07:46 +0200] rev 10987
convert/git: check status when reading output stream
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Apr 2010 22:59:50 +0200] rev 10986
convert/git: check status when reading the whole output
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Apr 2010 22:32:27 +0200] rev 10985
convert/git: rename gitcmd() into gitopen() for readability
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 18:19:54 +0200] rev 10984
minirst: support all recommended title adornments
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 17:48:26 +0200] rev 10983
minirst: correctly format sections containing inline markup
Before, a section like
``foo``
-------
would be formatted as
"foo"
-------
We now recompute the length of the underline when formatting the
section.
Henrik Stuart <hg@hstuart.dk> [Sun, 25 Apr 2010 17:38:41 +0200] rev 10982
ui: support quotes in configlist (issue2147)
Several places that use ui.configlist, predominantly in authentication
scenarios need to interface with systems that can contain spaces in usernames
(e.g. when client certificates are usernames, or Windows usernames).
This changeset introduces a parser that supports quoting of strings, and
escape quotation marks that get decoded into a single quotation mark that
adopts the usual behavior one would expect from quoting strings. The Python
library shlex module is not used, on purpose, as that raises if it cannot
match quotation marks in the given input.
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 17:11:50 +0200] rev 10981
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 17:11:36 +0200] rev 10980
hgrc.5: mention lists as well
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 16:46:44 +0200] rev 10979
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 16:46:26 +0200] rev 10978
hgrc.5: describe form of config values
Martin Geisler <mg@lazybytes.net> [Sun, 25 Apr 2010 16:17:24 +0200] rev 10977
minirst: add test for sections
Martin Geisler <mg@lazybytes.net> [Sat, 24 Apr 2010 23:08:27 +0200] rev 10976
contrib/win32: update build instructions after cbe400a8e217
Martin Geisler <mg@aragost.com> [Fri, 23 Apr 2010 09:55:47 +0200] rev 10975
doc: add links from hgrc.5 to hg.1
Martin Geisler <mg@aragost.com> [Fri, 23 Apr 2010 09:53:25 +0200] rev 10974
doc: make links for hg role
The system has a bit of smartness:
:hg:`update` -> links to hg.1.html#update
:hg:`help diffs` -> links to hg.1.html#diffs
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:24:49 +0200] rev 10973
Use hg role in help strings
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:04:53 +0200] rev 10972
doc, minirst: support hg interpreted text role
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 09:57:04 +0200] rev 10971
doc: add generic frontend to rst2man and rst2html
This will allow us to easily register new roles and directives.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 21 Apr 2010 01:34:12 +0200] rev 10970
localrepo.commit: use explicit variables, avoid creating new contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 21 Apr 2010 01:18:31 +0200] rev 10969
context: remove parents parameter to workingctx
it was needed before the refactor of commit, workingctx always uses the
dirstate now.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Apr 2010 11:17:01 +0200] rev 10968
dirstate: more explicit name, rename normaldirty() to otherparent()
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:38:42 -0500] rev 10967
keyword: monkeypatch patch so that optional args can be passed as kwargs
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:23:24 -0500] rev 10966
patch: refactor applydiff to allow for mempatching
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:13:57 -0500] rev 10965
patch: move mercurial-specific imports after stdlib imports
Augie Fackler <durin42@gmail.com> [Fri, 16 Apr 2010 14:24:40 -0500] rev 10964
test-record: add hg summary to verify we update dirstate
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Apr 2010 01:08:20 +0200] rev 10963
log -b: use opts.get() instead of assuming opts is correctly filled
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 17:00:02 -0500] rev 10962
Merge with stable
Dévai Tamás <devait@vnet.hu> [Fri, 16 Apr 2010 23:59:43 +0200] rev 10961
Respect the DESTDIR variable during 'make install'
The DESTDIR variable used to tell 'make install' an alternate system root
to install the software to. Since setup.py supports the same via its --root
parameter, it's easy to make life easier for many packagers.
Steve Losh <steve@stevelosh.com> [Mon, 12 Apr 2010 19:33:25 -0400] rev 10960
commands: add more robust support for 'hg log -b' (issue2078)
Fixes issue2078 and adds tests to cover various 'hg log -b' uses.
This change adds a localrepo.lookupbranch(key, remote=None) function. This
will look up the branch of the revision with the given key. The algorithm
works like this:
* If a remote repo is given and KEY is the name of a branch in that repo,
return KEY.
* If no remote repo is given and KEY is the name of a branch in the local
repo object, return KEY.
* Otherwise look up the revision with the identifier KEY in the local repo
and return its branch.
This change also makes 'hg log -b' use this new functionality and adds a few
tests for it.
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 16:47:44 -0500] rev 10959
highlight: fix to work with caching templater
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 16:47:44 -0500] rev 10958
debugcomplete: don't list deprecated options
Steve Losh <steve@stevelosh.com> [Sun, 18 Apr 2010 18:18:19 -0400] rev 10957
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Switching to --branch makes log consistent with push/pull and make more sense
given the actual behavior of the option (you can specify -b multiple times to
include multiple branches).
This change also adds some tests for 'hg log -b'.
Isaac Jurado <diptongo@gmail.com> [Sat, 17 Apr 2010 14:32:26 +0200] rev 10956
bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121)
The fix for issue1611 left one last use of "repo" instead of "self" that has
resulted in more memory leaks from push/pull operations.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 06 Apr 2010 22:15:43 -0300] rev 10955
Added support for 'pretxncommit', so that one can call the ACL hook at
pre-commit time too. This is useful because now it's possible to avoid
violating ACL permissions much sooner, at commit time, instead of
waiting for a PUSH to check if there were any invalid commits.
Brett Cannon <brett@python.org> [Sun, 18 Apr 2010 14:20:08 -0700] rev 10954
subrepo: fix repo root path handling in svn subrepo
Yuya Nishihara <yuya@tcha.org> [Thu, 08 Apr 2010 00:13:33 +0900] rev 10953
remoteui: copy http_proxy settings
http_proxy settings of current repo's .hg/hgrc should be available
on remoteui, so that the httprepo can use them when pulling via http.
Simon Heimberg <simohe@besonet.ch> [Wed, 07 Apr 2010 02:41:22 +0200] rev 10952
dispatch: ignore if signals can not be set
This happens if the code is executed in a thread.
This patch allows tortoisehg to start the inotify server again.
Mark Determann <qwerty360@gmail.com> [Thu, 01 Apr 2010 22:04:30 +0100] rev 10951
hgweb: fix attribute error in error response (issue2060)
Brandon Parsons <parsonsb@rsn.hp.com> [Thu, 04 Mar 2010 14:32:01 -0600] rev 10950
cvs: skip bad tags
If the CVS repo somehow has a symbolic name that references a revision
consisting of a single number (e.g. BAD_TAG: 1), convert will fail when
attempting to find the branches, preventing the initial import from
working.
This patch skips those symbolic names--without warning.
anatoly techtonik <techtonik@gmail.com> [Wed, 07 Apr 2010 00:35:38 +0300] rev 10949
document missing template variables
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 18:52:59 +0200] rev 10948
diffstat: use ui.plain() instead of ui.interactive()
Previously, a default width of 80 is used for non-interactive
sessions. This behaviour was introduced before HGPLAIN was supported.
Isaac Jurado <diptongo@gmail.com> [Sat, 17 Apr 2010 15:35:34 +0200] rev 10947
mq: Remove -f from qnew command syntax.
In 1ebba857b371 the -f option was not completely removed from the help message.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 14:06:07 +0200] rev 10946
mq: toggle truncating using ui.plain() rather than ui.interactive()
This enables truncated messages when using `qseries' with the `pager'
extension.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 21:47:23 +0200] rev 10945
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:41:53 +0200] rev 10944
filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 21:44:21 +0200] rev 10943
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:30:31 +0200] rev 10942
filectx: _fileid isn't normalized, use _filenode instead
_fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we
should use something stable for comparisons (like _filenode).
Martin Geisler <mg@lazybytes.net> [Mon, 19 Apr 2010 20:49:09 +0200] rev 10941
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10940
convert: write "working copy" instead of "wc"
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10939
convert: mark strings for translation
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10938
convert: write "repository" instead of "repo"
We should strive to avoid slang in our messages to the users.
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10937
minirst: removed unnecessary initindent variable
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10936
minirst: add margin around definition items
This greatly improves the output of 'hg help env'.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 19:18:20 +0200] rev 10935
dirstate: remove unused variable
Martin Geisler <mg@lazybytes.net> [Fri, 16 Apr 2010 22:14:14 +0200] rev 10934
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Wed, 14 Apr 2010 11:59:53 +0530] rev 10933
Document 'default' and 'default-push' in paths docstring
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 18:12:28 +0200] rev 10932
mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in e37e9904bf10, which was
accidentally removed when labelling was introduced in 717c35d55fb3.
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 10931
keyword: replace deprecated mq commands in test
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Apr 2010 14:57:30 +0200] rev 10930
wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:58:14 +0200] rev 10929
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:57:53 +0200] rev 10928
test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:57:32 +0200] rev 10927
context: fix bug introduced in fb89cd21a7a0, path should be used
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 22:34:26 +0200] rev 10926
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 21:59:21 +0200] rev 10925
prepush: rewrite most of the code from scratch
For servers with branchmap support, the algorithm now works as follows:
1. A list of branches in outgoing changesets is created.
2. Using the remote branchmap, a check for new branches is performed.
3. A map (from branch to head list) of locally known remote heads before
the push is created, and one which, after step 4, will contain the locally
known remote heads after the push.
4. The post-push head map is updated with the outgoing changesets, using the
branch cache update mechanism.
5. A check for new heads is performed, by comparing the length of the head list
before and after push, for each branch. If there are new heads, an error
depending on whether or not there are incoming changes on the branch,
is returned.
6. If the push is allowed, a warning is written if there are incoming changes
on any branches involved in the push.
For old servers, an algorithm similar to step 4-6 above is used to check for
new topological heads only.
Two bugs are also fixed:
1. Sometimes you would be allowed to push new branch heads without --force.
A test for this case was added.
2. You would get the "note: unsynced remote changes!" warning if there were any
incoming changesets, even if they were on unrelated branches.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:26 +0200] rev 10924
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:07 +0200] rev 10923
run-tests.py: can't remove from os.environ on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 19:03:03 +0200] rev 10922
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 18:08:48 +0200] rev 10921
workingctx: correctly compute the flag for noexec filesystems+merge
This bug happens if the filesystem doesn't support exec-bit, during merges,
for example in 24ed7a541f23 on the hg repo.
If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is
based on p1, and the FS doesn't support the exec-bit, the dirstate can't
"guess" the right bit.
We instead fix it in workingcontext.flags()/manifest.
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 17:25:37 +0200] rev 10920
localrepo: simplify _updatebranchcache slightly
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:35:06 +0200] rev 10919
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:34:27 +0200] rev 10918
add +x to test-update-renames, removed by the merge on 24ed7a541f23
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:21:41 +0200] rev 10917
simplify test-issue2137, make it more portable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:21:21 +0200] rev 10916
add documentation for revlog._prereadsize
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 13:52:41 +0200] rev 10915
merge with stable
Greg Ward <greg-hg@gerg.ca> [Wed, 14 Apr 2010 15:06:40 -0400] rev 10914
revlog: fix lazyparser.__iter__() to return all revisions (issue2137)
Previously, it only returned revisions that were in the revlog when it
was originally opened; revisions added since then were invisible.
This broke revlog._partialmatch() and therefore repo.lookup().
(Credit to Benoit Boissinot for simplifying my original test script
and for the actual fix.)
Greg Ward <greg-hg@gerg.ca> [Tue, 13 Apr 2010 17:58:38 -0400] rev 10913
revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:49:06 +0200] rev 10912
merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:43:40 +0200] rev 10911
merge
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:43:19 +0200] rev 10910
prepush: backed out refactoring
It has some problems in corner cases and will fail on a test recently
introduced on stable. Will maybe be reintroduced later, in a better
version.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 14 Apr 2010 19:35:54 +0200] rev 10909
prepush: add more test cases
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:11:35 +0200] rev 10908
prepush: fix bug in warning message selection
In certain situations you would be told "you should pull and merge" even when
there is nothing to pull.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 11:27:15 +0200] rev 10907
merge with stable
Steve Borho <steve@borho.org> [Tue, 13 Apr 2010 23:12:23 -0500] rev 10906
verify: improve progress descriptions
For GUIs, the progress bar is disconnected visually from the text that
is output by ui.write(), so it's better to be a little bit redundant in
naming the status. "checking" is redundant, since the user is running
the verify command. 'changesets', 'manifests', etc, tell the user what
is being checked (the entity being counted in the progress bar.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 10905
pylint, pyflakes: remove unused or duplicate imports
Ry4an Brase <ry4an-hg@ry4an.org> [Wed, 14 Apr 2010 00:24:47 -0500] rev 10904
Fix --blacklist when --jobs > 1 in run_tests.py.
The options parsing logic replaces the options.blacklist initial value,
a list of filenames, with a dict of test names to filenames. When
runchildren rebuilds the command line to launch child processes the dict
is flattened and provided as a malformed argument when a filename is
expected.
Fix is to remove the blacklist option from child invocations since the
filtering is handled in the parent anyway.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:09:43 +0200] rev 10903
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:08:47 +0200] rev 10902
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 08:48:26 +0200] rev 10901
checklink: use an explicit prefix for the temporary file
Greg Ward <greg-hg@gerg.ca> [Tue, 13 Apr 2010 17:58:38 -0400] rev 10900
revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 23:04:46 +0200] rev 10899
fix test-pull after 468876bc3885
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 22:10:24 +0200] rev 10898
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 22:06:17 +0200] rev 10897
revlog: put graph related functions together
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 21:54:59 +0200] rev 10896
checkexec: use an explicit prefix for the temporary file
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:41:32 -0700] rev 10895
check-code: add a warnings level
- demote "unwrapped ui message"
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 10894
keyword: make the templater a local variable
After 6722ba3bf80b a class attribute makes no sense.
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 10893
rollback: improve message
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:11:14 -0700] rev 10892
transaction: use newlines to separate description elements
Augie Fackler <durin42@gmail.com> [Thu, 08 Apr 2010 15:04:00 -0500] rev 10891
progress: fall back to indeterminate progress if position is >= total
Matt Mackall <mpm@selenic.com> [Sun, 11 Apr 2010 14:25:02 -0500] rev 10890
mq: promote qnew, demote qinit in short help
Matt Mackall <mpm@selenic.com> [Sun, 11 Apr 2010 14:24:19 -0500] rev 10889
commands: improve some command summaries
Matt Mackall <mpm@selenic.com> [Sat, 10 Apr 2010 17:20:43 -0500] rev 10888
progress: show approximate progress info for pull
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:55:34 +0200] rev 10887
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:37:21 +0200] rev 10886
localrepo: do not store URL password in undo.desc
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:19:53 +0200] rev 10885
convert/subversion: fix default URL checker prototype
Brendan Cully <brendan@kublai.com> [Sun, 11 Apr 2010 20:59:55 -0700] rev 10884
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 09 Apr 2010 20:34:05 +0200] rev 10883
patch: don't look for headers in diff lines
If you have a diff line that matches a header line, the patch splitter
currently breaks your patch at this line. For example a line like:
+key: value
This can lead to "malformed patch" exceptions. Now fixed.
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 10882
rollback: add dry-run argument, emit transaction description
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:35 -0500] rev 10881
localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:52 +0200] rev 10880
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:31 +0200] rev 10879
merge default
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:14:43 +0200] rev 10878
test-hgwebdir: correctly include '-' in sed expression.
'\' can't be used to escape '-' from being interpreted as a range,
so put it at the end.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 08 Apr 2010 17:21:42 +0200] rev 10877
localrepo: refactor prepush logic
Simplifies the prepush check logic and makes it a lot more direct and
comprehensible. Instead of comparing the total local vs. remote head count, it
compares the number of new vs. removed heads.
Sune Foldager <cryo@cyanite.org> [Fri, 09 Apr 2010 10:35:53 +0200] rev 10876
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 08 Apr 2010 19:46:47 +0200] rev 10875
partial backout of 1e819576e926 and add tests (issue2131)
The tests are due to Peter Arrenbrecht
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 07 Apr 2010 21:31:47 +0200] rev 10874
copies: properly visit file context ancestors on working file contexts
Matt Mackall <mpm@selenic.com> [Wed, 07 Apr 2010 14:44:51 -0500] rev 10873
Merge with stable
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 07 Apr 2010 16:55:01 +0200] rev 10872
mq: use util.unlink instead of os.unlink and os.removedirs
If, on Windows, your repository and working copy are in a reparse point and you
use os.removedirs, you will remove non-empty reparse points, disabling the
reparse point. See @fa901423ac23.
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:54:18 -0500] rev 10871
color: respect HGPLAIN
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:49:19 -0500] rev 10870
color: add support for Windows consoles
Introduces color.mode configurable with values 'auto', 'ansi', or 'win32'. Any
other value disables coloring. When 'auto' is selected, the win32 console
method will be used if the win32console Python module is detected (requires
pywin32 to be installed).
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:44:13 -0500] rev 10869
color: remove unused import
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:40:46 +0200] rev 10868
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:40:00 +0200] rev 10867
merge default with default
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:39:44 +0200] rev 10866
merge stable with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 11:49:42 +0200] rev 10865
dirstate: no need to iterate twice, a dict can be updated in place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 00:46:09 +0200] rev 10864
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 00:45:53 +0200] rev 10863
clone: no race possible, we can use changegroup() and have smaller urls
Related to issue2126
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:48 -0500] rev 10862
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:31 -0500] rev 10861
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:00 -0500] rev 10860
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:38:31 +0200] rev 10859
Merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:10:09 +0200] rev 10858
i18n-da: small updates
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 00:14:24 +0200] rev 10857
i18n-da: synchronized with 37a5a397f150
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10856
templates: escape javascript braces
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10855
templater: drop \ when handling escaped {
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10854
templater: strip whitespace inside template methods
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10853
templater: drop raw method
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10852
templater: raise nested functions
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10851
templater: cache full tree
store the parsed version of subtemplates in higher level parse lists, avoid
run-time cache lookups
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10850
templater: use recursive flattening
This avoids slow list operations compared to the iterative version
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10849
templater: cache self.defaults.get
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10848
templater: privatize class variables
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10847
templater: map -> mapping
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10846
templater: extend preparsing
preparse filters and formats and supply functions to apply
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10845
templater: preparse templates and cache
This breaks templates down into a list of literal and {} groups, with
group types preidentified.
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10844
keywords: build a new templater to work around caching interaction
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10843
templater: directly parse templates, no regexes
Jeff Schiller <codedread@gmail.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10842
logo: clean up source file with scour
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10841
contrib: drop rewrite-revlog
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10840
contrib: drop git-viz
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 20:35:47 +0200] rev 10839
merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Mon, 05 Apr 2010 20:10:46 +0200] rev 10838
add a test for the inprocess status dirstate race
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 19:49:19 +0200] rev 10837
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 18:13:20 +0200] rev 10836
dirstate: fix in memory dirstate entries for 1-second race
Only the on-disk file was modified, we need to modify the in-memory dirstate
as well.
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 13:44:30 +0200] rev 10835
commands: leftover from d7b601f1e02c
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 11:58:54 +0200] rev 10834
commands: small refactoring in summary
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 11:52:40 +0200] rev 10833
commands: retrieve tags from context object
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