Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:45:20 +0900] rev 11050
commands: refactor diff --stat and qdiff --stat
`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:10:54 +0900] rev 11049
mq: fix opts['unified'] = '0' to take effect when qdiff --stat
`opts['unified'] = '0'` tries to reduce the number of lines to be
processed by patch.diffstat, but here it does not affect diffopts,
thus it does not make sense.
Instead, we can change `diffopts.context` directly.
Added test case for qdiff --stat.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 15:32:23 +0200] rev 11048
showconfig: show rc paths with --debug
Eric Eisner <ede@mit.edu> [Mon, 26 Apr 2010 15:58:36 -0400] rev 11047
tags: return tags in sorted order
This makes log and summary have less arbitrary tag ordering and also
groups similar tags together, such as the mq tags.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 11046
keyword: test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 11045
keyword: support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 11044
keyword: remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since 911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Wed, 28 Apr 2010 11:10:58 -0300] rev 11043
acl: add tests for asterisk and for OS-level groups
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 27 Apr 2010 19:02:11 -0300] rev 11042
acl: updated doc string to reflect recent changes
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Mon, 26 Apr 2010 10:55:57 -0300] rev 11041
acl: add support for OS-level groups using @group syntax
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 11040
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11039
run-tests: sort options
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11038
run-tests: add -l short option for --local
Martin Geisler <mg@lazybytes.net> [Thu, 29 Apr 2010 23:47:07 +0200] rev 11037
Merge with main
Henrik Stuart <hg@hstuart.dk> [Wed, 28 Apr 2010 21:00:07 +0200] rev 11036
ui: fix check-code error
Michael Glassford <glassfordmjg@gmail.com> [Thu, 08 Apr 2010 11:00:46 -0400] rev 11035
schemes: fix // breakage with Python 2.6.5 (issue2111)
Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes
urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and
urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'.
Fix url.hidepassword() and url.removeauth() to handle these cases.
Dan Connolly <http://www.w3.org/People/Connolly/> [Wed, 28 Apr 2010 13:36:06 -0500] rev 11034
log: document the new xml style
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:46:38 -0500] rev 11033
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:45:57 -0500] rev 11032
Merge with i18n
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:45:21 -0500] rev 11031
Merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:41:32 -0300] rev 11030
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:37:49 -0300] rev 11029
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:30:24 -0300] rev 11028
i18n-pt_BR: synchronized with ede19417c3c4
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:34:55 -0300] rev 11027
merge with i18n stable
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 19:50:04 +0200] rev 11026
i18n-sv: synchronized with latest development code
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 18:59:02 +0200] rev 11025
Merge with stable
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 18:57:16 +0200] rev 11024
i18n-sv: translated a few messages
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 18:40:02 +0200] rev 11023
i18n-sv: syncronized with e3396b218e10
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 13:21:03 +0200] rev 11022
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 13:21:03 +0200] rev 11021
patch: minor cleanup of _applydiff
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 13:21:02 +0200] rev 11020
patch: git delete mode shouldn't be used at all
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 13:21:02 +0200] rev 11019
patch: make "unable to strip away" message less confusing
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 13:21:02 +0200] rev 11018
patch: descriptive patchmeta.__repr__ to help debugging
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 23 Apr 2010 15:24:11 +0900] rev 11017
log: remove useless condition
for "copied" to be not None, it requires follow=True
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 16:36:08 +0200] rev 11016
help config: update windows documentation to match implementation
This shows how confusing the current implementation is on Windows.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 27 Apr 2010 09:47:33 +0200] rev 11015
wix: new GUID for contrib.guid
to comply with the component GUID rules of Windows Installer, applied to
the change 6d9ff3374a81
Mads Kiilerich <mads@kiilerich.com> [Mon, 19 Apr 2010 11:00:36 +0200] rev 11014
contrib/mercurial.spec: drop git-viz
Follow-up to 9258228639ad
Yuya Nishihara <yuya@tcha.org> [Sat, 24 Apr 2010 18:08:06 +0900] rev 11013
tags: delete unnecessary close() of atomictempfile
cachefile.rename() implies cachefile.close().
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Apr 2010 18:27:12 +0200] rev 11012
win32: detect console width on Windows
Original version by anatoly techtonik <techtonik@gmail.com>
Following advices from similar bzr code.
Patrick Mezard <pmezard@gmail.com> [Mon, 26 Apr 2010 22:42:46 +0200] rev 11011
Merge with crew-stable
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.