Sune Foldager <cryo@cyanite.org> [Tue, 10 Feb 2009 14:20:42 +0100] rev 7748
hgweb: add rss error template
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Mon, 09 Feb 2009 19:00:55 +0100] rev 7747
hgk: added explanation to .hgk for background colour
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Mon, 09 Feb 2009 19:00:52 +0100] rev 7746
hgk: added colour settings for different colours in diff view
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Mon, 09 Feb 2009 19:00:48 +0100] rev 7745
hgk: added setting of foreground colour
Added the fgcolor setting read by hgk to change the text colour in the
diff output and the file list. The colours for diff highlighting
remains unchanged.
Martin Geisler <mg@daimi.au.dk> [Mon, 09 Feb 2009 00:14:07 +0100] rev 7744
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk> [Mon, 09 Feb 2009 00:09:24 +0100] rev 7743
commands: fix paths command docstring indention
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 09 Feb 2009 13:08:32 +0100] rev 7742
hgweb: commit forgotten update to a3d7f99c23c0
Sune Foldager <cryo@cyanite.org> [Mon, 09 Feb 2009 11:31:52 +0100] rev 7741
hgweb: support custom http headers in ErrorResponse
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 09 Feb 2009 11:29:09 +0100] rev 7740
hgweb: pass ErrorResponses directly into req.respond()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 07 Feb 2009 23:29:12 +0100] rev 7739
merge with mpm
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Sat, 07 Feb 2009 18:46:13 +0100] rev 7738
hgk: Add background colour setting
Adds the bgcolor config variable, that sets the background
colour of the text and canvas frames.
Martin Geisler <mg@daimi.au.dk> [Wed, 04 Feb 2009 20:55:44 +0100] rev 7737
commands: removed unnecessary string concatenation
Martin Geisler <mg@daimi.au.dk> [Wed, 04 Feb 2009 20:53:38 +0100] rev 7736
patch: turned strings with backslashes into raw strings
In Python, the backslash in an unrecognized escape sequence is left
behind, which makes '\.' the same as r'\.'. Relying on this feature is
quite brittle, IMHO.
Removed unnecessary string concatenation as well.
Martin Geisler <mg@daimi.au.dk> [Tue, 03 Feb 2009 21:38:36 +0100] rev 7735
convert: marked string for translation
Martin Geisler <mg@daimi.au.dk> [Thu, 25 Dec 2008 10:42:01 +0100] rev 7734
reset mergestate after commit
Matt Mackall <mpm@selenic.com> [Wed, 28 Jan 2009 14:27:44 -0600] rev 7733
warn if --repository provided for norepo commands
Mads Kiilerich <mads@kiilerich.com> [Sun, 25 Jan 2009 21:20:13 +0100] rev 7732
Make util.find_exe alway returns existing file, fixing issue1459
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT
This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
Mads Kiilerich <mads@kiilerich.com> [Sun, 25 Jan 2009 21:20:11 +0100] rev 7731
test-merge-tools
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
Jim Correia <jim.correia@pobox.com> [Sun, 25 Jan 2009 14:12:41 -0500] rev 7730
Account for symlinks when setting up HGTMP.
On Mac OS X, several top-level directories are actually symlinks into
/private. When setting up HGTMP, expand the symlinks so that later
comparisons to or substituations with the actual path work as expected.
John Mulligan <phlogistonjohn@asynchrono.us> [Sun, 25 Jan 2009 13:49:15 -0500] rev 7729
mq: allow qclone's -p option to use path alias
Add support for running 'hg qclone -p foo bar' where foo is a path
alias defined in the [paths] section of an hgrc file.
John Mulligan <phlogistonjohn@asynchrono.us> [Sun, 25 Jan 2009 13:20:43 -0500] rev 7728
branch closing: permit closing the default branch
There was no good reason to special case the 'default' branch.
Allow the 'default' branch to be closed if the user wants it.
If you're uncomfortable about mistakenly closing the default branch,
you can always reopen the branch by commiting a "normal" changeset onto
the closed branch.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Feb 2009 17:40:25 +0100] rev 7727
demandimport: patch __builtin__ instead of __builtins__
This helps on implementations other than CPython, where __builtins__ isn't
necessarily defined (as it's an implementation detail for CPython).
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Feb 2009 18:21:22 +0100] rev 7726
notify: use contexts more pervasively
Benoit Allard <benoit@aeteurope.nl> [Thu, 05 Feb 2009 18:15:33 +0100] rev 7725
coal/paper: switch to XHTML 1.1
Martin Geisler <mg@daimi.au.dk> [Tue, 03 Feb 2009 20:32:42 +0100] rev 7724
i18n: updated Danish translation
Now with 379 translated and 1396 untranslated messages.
Martin Geisler <mg@daimi.au.dk> [Sat, 31 Jan 2009 22:50:18 +0100] rev 7723
run-tests: add --pure flag for using pure Python modules
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 01:44:43 +0100] rev 7722
add --pure flag to setup.py
This flag will make the build_py step install the pure Python modules
in mercurial/pure/ into mercurial/ and furthermore prevent building
the C extensions.
Martin Geisler <mg@daimi.au.dk> [Thu, 29 Jan 2009 19:25:25 +0100] rev 7721
setup: get version number using pure Python modules
Martin Geisler <mg@daimi.au.dk> [Wed, 28 Jan 2009 10:32:15 +0100] rev 7720
setup: do not use -c with msgfmt on Solaris (issue1489)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Jan 2009 18:17:59 +0100] rev 7719
merge with crew
Steve Borho <steve@borho.org> [Tue, 27 Jan 2009 09:58:48 -0600] rev 7718
record: do not lose permission changes on commit
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 26 Jan 2009 15:52:10 +0100] rev 7717
hgweb: expose sibling branches to templater
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 26 Jan 2009 16:50:27 +0100] rev 7716
graphlog: extract large parts of repeated code from incoming/outgoing
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 26 Jan 2009 16:40:43 +0100] rev 7715
graphlog: reuse cmdutil.loglimit() instead of redefining
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 26 Jan 2009 16:34:38 +0100] rev 7714
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 26 Jan 2009 16:15:28 +0100] rev 7713
graphlog: import util module rather than selected functions
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 20:27:37 +0100] rev 7712
i18n: check format strings when building xx.mo files
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 20:16:35 +0100] rev 7711
i18n: add python-format comments to da.po
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 21:31:54 +0100] rev 7710
i18n: extract strings with xgettext
The xgettext program knows about Python string formatting and will
mark messages with a special "#, python-format" comment in the hg.pot
file. When msgfmt compiles the file, it can check these messages to
ensure that the translated string uses the same conversion specifiers
as the original string.
The pygettext program is still used to extract the docstrings.
Matt Mackall <mpm@selenic.com> [Sun, 25 Jan 2009 12:09:51 -0600] rev 7709
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 25 Jan 2009 10:16:45 -0600] rev 7708
wire protocol: avoid infinite loop (issue1483)
Matt Mackall <mpm@selenic.com> [Sun, 25 Jan 2009 12:07:41 -0600] rev 7707
fix up tests for paths and urls help
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 01:47:36 +0100] rev 7706
use PURE option in Makefile
Christian Ebert <blacktrash@gmx.net> [Sun, 25 Jan 2009 11:10:51 +0100] rev 7705
notify: remove subfunctions that are called only once
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 00:13:49 +0100] rev 7704
move mercurial.osutil to mercurial.pure.osutil
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 00:12:20 +0100] rev 7703
pure Python implementation of bdiff.c
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 00:12:19 +0100] rev 7702
pure Python implementation of diffhelpers.c
Brendan Cully <brendan@kublai.com> [Tue, 30 Dec 2008 18:58:58 -0800] rev 7701
Pure python base85 fallback
Encoding takes about 100x longer than native on a large binary.
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 00:12:18 +0100] rev 7700
pure Python implementation of parsers.c
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 00:12:17 +0100] rev 7699
pure Python implementation of mpatch.c
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 12:33:49 +0100] rev 7698
i18n: sort Danish translation by file
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 12:33:46 +0100] rev 7697
i18n: strip string locations from Danish translation
Matt Mackall <mpm@selenic.com> [Fri, 23 Jan 2009 14:51:09 -0600] rev 7696
simplify colwidth a bit
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 21 Jan 2009 20:29:47 +0900] rev 7695
Also find correct column width of wide characters.
Use unicodedata.east_asian_width() to determine wide/full width
characters if available. Otherwise, return character count as before.
Bill Barry <after.fallout@gmail.com> [Thu, 22 Jan 2009 10:48:37 -0700] rev 7694
added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs
Bill Barry <after.fallout@gmail.com> [Thu, 22 Jan 2009 11:02:50 -0700] rev 7693
consolidated url help into urls help topic and added information about path aliases
Martin Geisler <mg@daimi.au.dk> [Thu, 22 Jan 2009 20:49:47 +0100] rev 7692
i18n: updated Danish translation
This fixes a crash due to a bad string interpolation, fixes a bunch of
typos and adds more translated strings.
Bill Barry <after.fallout@gmail.com> [Thu, 22 Jan 2009 08:39:34 -0700] rev 7691
Clarified 'hg paths' command help
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Jan 2009 18:58:12 +0100] rev 7690
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 25 Jan 2009 18:55:29 +0100] rev 7689
Fix a corner case when committing a rename after a merge (issue1476)
Dongsheng Song <dongsheng.song@gmail.com> [Sun, 25 Jan 2009 15:11:43 +0800] rev 7688
i18n: Starting Chinese Translation of Mercurial
Martin Geisler <mg@daimi.au.dk> [Sun, 25 Jan 2009 12:33:47 +0100] rev 7687
i18n: sort by file when generating hg.pot
This will make the order more stable and give smaller patches when
translations merge in new and deleted strings from the hg.pot file.
Christian Ebert <blacktrash@gmx.net> [Sun, 25 Jan 2009 12:21:57 +0100] rev 7686
Do not install executable man pages
Default mode of install might be 755, therefore specify 644.
Martin Geisler <mg@daimi.au.dk> [Sat, 24 Jan 2009 18:52:46 +0100] rev 7685
patchbomb: respect diff settings
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Jan 2009 11:27:53 +0200] rev 7684
status: make options optional (issue1481)
Pascal Quantin <pascal.quantin@gmail.com> [Fri, 23 Jan 2009 23:39:28 +0100] rev 7683
Retrieve Beyond Compare's path from registry
Switch from a hardcoded path to registry key to find Beyond Compare's
executable. Calling BCompare.exe works fine with version 3.0.14.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 Jan 2009 16:07:44 +0100] rev 7682
templater: fix age filter to state the obvious on future timestamps
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 Jan 2009 15:22:37 +0100] rev 7681
tests: fix issue in test-audit-path with HGTMP on OS X
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 Jan 2009 14:33:49 +0100] rev 7680
tests: eliminate use of sed -i (which fails on NetBSD)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 Jan 2009 14:32:39 +0100] rev 7679
tests: fix up tests to cope with 6a0bc2dc9da6
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 Jan 2009 14:19:29 +0100] rev 7678
help: some improvements for the templating topic
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 22 Jan 2009 14:18:08 +0100] rev 7677
help: add a topic about some of the templating features
Matt Mackall <mpm@selenic.com> [Wed, 21 Jan 2009 14:14:56 -0600] rev 7676
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 21 Jan 2009 11:15:47 -0600] rev 7675
verify: don't trip over binary files starting with 01 0a
Matt Mackall <mpm@selenic.com> [Mon, 19 Jan 2009 17:00:23 -0600] rev 7674
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jan 2009 01:38:52 +0100] rev 7673
notify: fix neglect of custom headers set via template
e981725da3fe introduced a bug that discarded all custom headers.
Add custom header to test template.
Matt Mackall <mpm@selenic.com> [Mon, 19 Jan 2009 16:19:09 -0600] rev 7672
Give a useful message about PYTHONPATH if startup fails
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 Jan 2009 13:20:47 +0100] rev 7671
hgweb: simplify parents/children generation code
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 Jan 2009 12:59:56 +0100] rev 7670
kill some trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 Jan 2009 12:58:01 +0100] rev 7669
merge with crew-stable
Stepan Koltsov <yozh@mx1.ru> [Mon, 19 Jan 2009 12:36:06 +0100] rev 7668
coal/paper: add missing spaces in changeset child formatting
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Jan 2009 12:38:54 +0200] rev 7667
cmdutil.logmessage: options should be optional
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Jan 2009 00:36:32 +0100] rev 7666
bookmarks: work around missing posixfile_nt.readline()
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 17 Jan 2009 18:51:40 +0100] rev 7665
Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
Patrick Mezard <pmezard@gmail.com> [Tue, 13 Jan 2009 20:28:06 +0200] rev 7664
diffstat: don't fail on merges
First version by Alexander Solovyov <piranha@piranha.org.ua>
Pascal Quantin <pascal.quantin@wavecom.com> [Sat, 17 Jan 2009 15:25:20 +0100] rev 7663
Package hgk Tcl/Tk script in win32 installer
hgk script will be copied to Contrib/hgk.tcl
Pascal Quantin <pascal.quantin@wavecom.com> [Sat, 17 Jan 2009 15:23:13 +0100] rev 7662
Update mercurial.ini file packaged in win32 installer
Update contrib/win32/mercurial.ini file with contrib/sample.hgrc
content and append contrib/mergetools.hgrc content during installation
Patrick Mezard <pmezard@gmail.com> [Sat, 17 Jan 2009 15:19:41 +0100] rev 7661
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 17 Jan 2009 15:15:26 +0100] rev 7660
Document how HTML documentation is built under Windows
Pascal Quantin <pascal.quantin@wavecom.com> [Thu, 15 Jan 2009 14:19:29 +0100] rev 7659
Add Lee Cantey's installer icon to win32 installer
Add Lee Cantey's installer icon to contrib/win32 and update
mercurial.iss accordingly
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jan 2009 01:38:52 +0100] rev 7658
notify: fix neglect of custom headers set via template
e981725da3fe introduced a bug that discarded all custom headers.
Add custom header to test template.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7657
branch closing: add test for branch closing (and reopening)
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7656
branch closing: referencing open and closed branches/heads
Treat fully closed branches similarly to "inactive" in the output of
'hg branches'. They will be suffixed with "(closed)" where inactive branches
are marked with "(inactive)". If the -a/--active option is given both
inactive and closed branches will not be shown.
Partially closed branches (multiple heads, at least one not closed)
will display the next (tipmost) open head.
Add -a/--active option to "hg heads" which will hide closed heads iff the
option is specified.
In other hg commands, when multiple branch heads exist the branch name will
refer to the tipmost open head, and if none exist, then the tipmost closed
head.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7655
branch closing: mark closed branches with a 'close' extra
Adds a --close-branch option to commit.
When --close-branch is present the commit will mark the changeset
with close=1 in the changeset extras field.
If a regular changeset is added on top of a closed head the branch
is no longer considered closed, and thus re-opened.
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 14 Jan 2009 21:47:38 -0500] rev 7654
store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.
The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.
The localrepo.branchheads function is reworked to use the data from the cache.
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 20:23:18 +0100] rev 7653
i18n: make local now builds .mo files