Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 28 Feb 2009 12:25:14 +0100] rev 7806
help: better explanations for some of the template filters
In particular, provide some example data for some of the common filters.
Thanks go to timeless again for pointing out where we were lacking.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 28 Feb 2009 12:23:23 +0100] rev 7805
help: better explanation for some of the environment variables
In particular, the precedence for usernames is explained in more detail.
Thanks to timeless for pointing out the deficiencies here.
timeless <timeless@gmail.com> [Sat, 28 Feb 2009 12:21:41 +0100] rev 7804
help: some language fixes for help topics
Matt Mackall <mpm@selenic.com> [Fri, 27 Feb 2009 08:13:42 -0600] rev 7803
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 25 Jan 2009 19:15:49 +0100] rev 7802
merge with stable
Martin Geisler <mg@daimi.au.dk> [Tue, 24 Feb 2009 18:09:16 +0100] rev 7801
setup: run hg with empty HGRCPATH for robustness.
Otherwise a bad hgrc file can make the version detection fail.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 24 Feb 2009 16:05:43 +0100] rev 7800
contrib: add hgwebdir.wsgi, to serve as a better example
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 24 Feb 2009 16:01:29 +0100] rev 7799
contrib: bring hgwebdir.fcgi up-to-date with current WSGI practices
Steve Borho <steve@borho.org> [Sat, 21 Feb 2009 17:46:06 -0600] rev 7798
catch CTRL-D at password prompt
We caught this exception in ui.prompt(), but not here. Without
this, hitting CTRL-D at the password prompt gives a long traceback.
Pascal Quantin <pascal.quantin@gmail.com> [Wed, 04 Feb 2009 22:12:55 +0100] rev 7797
Update Beyond Compare's configuration
If there is already a Beyond Compare's instance running when performing a merge
from Mercurial, BCompare.exe will exit immediately and the merge will fail.
Use the /solo switch to make it always wait (it will open each comparison in
it's own window instead of in tabs)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 22 Feb 2009 23:03:42 +0100] rev 7796
merge with crew
David Soria Parra <dsp@php.net> [Sun, 22 Feb 2009 19:23:09 +0100] rev 7795
bookmarks: add force option to command syntax description
Martin Geisler <mg@daimi.au.dk> [Sun, 22 Feb 2009 22:06:47 +0100] rev 7794
i18n: updates to the Danish translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 20 Feb 2009 23:48:09 +0900] rev 7793
i18n: update Japanese translation
this finished translation for:
- online help for all core commands
- all other help topics, except of "templating"
Frank Wierzbicki <fwierzbicki@gmail.com> [Wed, 18 Feb 2009 13:19:30 +0100] rev 7792
tests: use same popen strategy for jython as for nt
Brodie Rao <me+hg@dackz.net> [Tue, 17 Feb 2009 18:47:28 -0500] rev 7791
Makefile: remove locale folder during clean
Martin Geisler <mg@daimi.au.dk> [Wed, 18 Feb 2009 00:44:38 +0100] rev 7790
setup: use sys.executable to call hg
Executing ".\hg" does not work on Windows, but we can instead ask
Python to execute hg.
Martin Geisler <mg@daimi.au.dk> [Tue, 17 Feb 2009 23:58:56 +0100] rev 7789
bookmarks: escape literal backslashes in docstring
Dongsheng Song <dongsheng.song@gmail.com> [Tue, 17 Feb 2009 23:13:48 +0800] rev 7788
i18n: updated Chinese translation
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 19:35:07 -0600] rev 7787
Introduce HG_PREPEND to solve pretxn races
- add writepending to flush delayed writes to separate file
- add support in hooks for lazy evaluation of callable parameters
- add HG_PENDING to pretxn hooks
- call writepending if hook is used
- pass repo root to hook environment
- if HG_PENDING = repo root, we're in pretxn hook
- read pending data to make pending changesets visible
- filter HG_PENDING in tests/printenv.py
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 18 Jan 2009 19:59:51 +0100] rev 7786
rebase: pull --rebase updates if there is nothing to rebase
Mads Kiilerich <mads@kiilerich.com> [Tue, 10 Feb 2009 22:47:38 +0100] rev 7785
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7784
audit: check for casefolding of .hg (issue1450)
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7783
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7782
mq: handle empty patches more gracefully (issue1501)
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7781
keepalive: borrow code from newer httplib to patch ValueError (issue1088)
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7780
rename: simplify forced renaming
This should help work around virus scanner issues with rename on Windows.
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7779
log: ignore --removed if no files specified (issue1166)
Otherwise we filter out merge changesets with no changed files
Matt Mackall <mpm@selenic.com> [Mon, 16 Feb 2009 17:37:23 -0600] rev 7778
Don't fail on clone on win98 (issue1492)
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 15 Feb 2009 20:18:29 +0200] rev 7777
zeroconf: don't allow ipv6 addresses
Martin Geisler <mg@daimi.au.dk> [Mon, 16 Feb 2009 01:41:01 +0100] rev 7776
hgk: select first changeset at startup (issue1382)
Martin Geisler <mg@daimi.au.dk> [Mon, 16 Feb 2009 00:09:47 +0100] rev 7775
pure/mpatch: use StringIO instead of mmap (issue1493)
This is more portable than memory mapping /dev/zero: Windows obviously
does not have /dev/zero and mapping /dev/zero failed on Mac OS X.
Stefan Rusek <stefan@rusek.org> [Wed, 11 Feb 2009 21:47:57 +0100] rev 7774
Handle when the slicemap option is an empty string
In the cmdtable for the convert extension, the default value for splicefile is
empty string, while mapfile (the class that reads splicemaps) expects either a
real path or None. This patch changes mapfile to expect a real path or logical
false (False, None, empty string, etc.)
Simon Heimberg <simohe@besonet.ch> [Sun, 08 Feb 2009 13:46:04 +0100] rev 7773
test suite: saver check if bzr is installed
Test if bzrlib.__doc__ is not empty. Ignores an empty lib.
Augie Fackler <durin42@gmail.com> [Tue, 10 Feb 2009 13:26:00 -0600] rev 7772
fancyopts: Parse options that occur after arguments.
This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required.
Fixes issue1402.
Doc fixes for mq by mpm.
Augie Fackler <durin42@gmail.com> [Tue, 10 Feb 2009 16:31:52 -0600] rev 7771
tests: Add a test for the behavior of 'hg export -- -2'
Peter van Dijk <mercurial-bugs@selenic.com> [Sun, 15 Feb 2009 11:14:20 -0600] rev 7770
fix disappearing symlinks [issue1509]
Mads Kiilerich <mads@kiilerich.com> [Tue, 10 Feb 2009 16:11:48 +0100] rev 7769
test-merge-tools: Don't use tac
"tac" was a bad tool - is not available on all platforms.
The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
Matt Mackall <mpm@selenic.com> [Sun, 15 Feb 2009 10:50:48 -0600] rev 7768
merge: mark kept local files as readded on linear update (issue539)
Will Maier <willmaier@ml1.net> [Mon, 09 Feb 2009 07:55:42 -0600] rev 7767
Use shutil.copystat in copyfile().
Gilles Moris <gilles.moris@free.fr> [Sun, 08 Feb 2009 15:58:39 +0100] rev 7766
Update tcsh completion scripts with new commands and for new help output.
Also make the build script executable.
Simon Heimberg <simohe@besonet.ch> [Sun, 08 Feb 2009 08:44:33 +0100] rev 7765
resolve: accepts walkopts (-I and -X)
timeless <timeless@gmail.com> [Sun, 15 Feb 2009 12:56:38 +0100] rev 7764
help: better formatting in "Date Formats" section
Jim Correia <jim.correia@pobox.com> [Sat, 14 Feb 2009 22:41:18 +0100] rev 7763
log-like commands now use -G for --graph, -g for --git
Jim Correia <jim.correia@pobox.com> [Sat, 14 Feb 2009 22:40:39 +0100] rev 7762
add --git option to commands supporting --patch (log, incoming, history, tip)
No short -g form, since it would conflict with -g from the graphlog extension.
Martin Geisler <mg@daimi.au.dk> [Sat, 14 Feb 2009 01:07:44 +0100] rev 7761
i18n: add python-format comments to Japanese translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 14 Feb 2009 01:56:34 +0900] rev 7760
i18n: add Japanese translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 13 Feb 2009 13:52:34 +0100] rev 7759
tests: fix for test-identify returning 255
Gilles Moris <gilles.moris@free.fr> [Sat, 07 Feb 2009 19:41:05 +0100] rev 7758
extdiff: add --change option to display single changeset diff
This is the counterpart for extdiff of 9c6ae2e09e11.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 13 Feb 2009 11:32:33 +0100] rev 7757
identify: have consistent output for local repositories
Also, add some extensive testing for it (hardly any in the suite so far).
Martin Geisler <mg@daimi.au.dk> [Thu, 12 Feb 2009 18:26:09 +0100] rev 7756
i18n: wrapped long lines in Italian translation
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 17 Jan 2009 14:14:44 +0100] rev 7755
i18n: add Italian translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Feb 2009 11:52:31 +0100] rev 7754
record: minimize number of status calls
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Feb 2009 12:35:48 +0100] rev 7753
patch: no need to instantiate a match catch-all in diff()
Steve Borho <steve@borho.org> [Wed, 28 Jan 2009 20:06:59 -0600] rev 7752
close sockets on httprepository deletion (issue1487)
With this destructor in place, I no longer see tracebacks
on the server after using win32 clients for pull, push, etc.
Dongsheng Song <dongsheng.song@gmail.com> [Tue, 10 Feb 2009 13:57:34 +0800] rev 7751
i18n: updated Chinese translation
Sune Foldager <cryo@cyanite.org> [Tue, 10 Feb 2009 14:22:25 +0100] rev 7750
hgweb: add guid to rss items
Sune Foldager <cryo@cyanite.org> [Tue, 10 Feb 2009 14:21:27 +0100] rev 7749
hgweb: add atom error template
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
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 15:28:42 +0100] rev 7652
i18n: beginnings of a Danish translation
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 00:14:36 +0100] rev 7651
i18n: encode output in user's local encoding
This makes the translated output obey the HGENCODING environment
variable or the preferred encoding as set by the LANG or LC_ALL
environment variables.
Python 2.4 has a lgettext method which is similar, except that it
doesn't know about HGENCODING or the settings in .hgrc.
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 00:12:35 +0100] rev 7650
i18n: lookup .mo files in private locale/ directory
This default is to look for /usr/share/locale/xx/LC_MESSAGES/hg.mo for
language xx, but this code will instead do the lookup from locale/ or
mercurial/locale/ relative to the root of the Mercurial source tree.
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 00:11:54 +0100] rev 7649
i18n: new build_mo command for setup.py
This command will generate .mo files under locale/ for the .po files
found under i18n/.
Martin Geisler <mg@daimi.au.dk> [Thu, 15 Jan 2009 00:10:54 +0100] rev 7648
i18n: let Makefile generate i18n/hg.pot
The target update-pot extracts strings using pygettext and updates the
i18n/hg.pot file. The translators can then use msgmerge to merge the
new strings in hg.pot with their xx.po file when they want to.
The setup.py file now includes files under both templates/ and i18n/
as data files.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Jan 2009 11:41:59 +0100] rev 7647
recover when no version information is available
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 13:51:43 -0600] rev 7646
error: move SignatureError
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 13:35:35 -0600] rev 7645
dispatch: sort exception handlers
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 11:48:05 -0600] rev 7644
error: move SignalInterrupt
now derived from KeyboardInterrupt to simplify catches
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 11:39:38 -0600] rev 7643
error: move UnknownCommand and AmbiguousCommand
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 11:28:30 -0600] rev 7642
sshrepo: change raise_ to abort
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 11:28:28 -0600] rev 7641
error: move UnexpectedOutput (now ResponseError)
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 11:09:14 -0600] rev 7640
error: move lock errors
rename LockException to LockError
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 10:59:08 -0600] rev 7639
mq: remove import of revlog
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 10:53:41 -0600] rev 7638
bookmarks; clean up imports and function wrapping
Matt Mackall <mpm@selenic.com> [Mon, 12 Jan 2009 10:42:31 -0600] rev 7637
error: move repo errors
rename NoCapability to CapabilityError
Matt Mackall <mpm@selenic.com> [Sun, 11 Jan 2009 23:04:24 -0600] rev 7636
error: move ParseError
Matt Mackall <mpm@selenic.com> [Sun, 11 Jan 2009 23:00:09 -0600] rev 7635
kill imerge.py
It's been broken for a while.
Matt Mackall <mpm@selenic.com> [Sun, 11 Jan 2009 22:55:36 -0600] rev 7634
revlog: kill from-style imports
They're slow.
Matt Mackall <mpm@selenic.com> [Sun, 11 Jan 2009 22:48:28 -0600] rev 7633
errors: move revlog errors
- create error.py for exception classes to reduce demandloading
- move revlog exceptions to it
- change users to import error and drop revlog import if possible
Matt Mackall <mpm@selenic.com> [Sat, 10 Jan 2009 18:02:38 -0600] rev 7632
refactor version code
- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code
This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.
Patrick Mezard <pmezard@gmail.com> [Tue, 13 Jan 2009 23:17:19 +0100] rev 7631
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 13 Jan 2009 22:41:06 +0100] rev 7630
merge: fix execute bit update issue introduced by 89207edf3973
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 13 Jan 2009 13:43:42 +0100] rev 7629
transplant: move docstrings before imports (see issue1466)
Stepan Koltsov <yozh@mx1.ru> [Tue, 13 Jan 2009 10:44:16 +0100] rev 7628
diff: add --change option to display single changeset diff (issue1420)
Martin Geisler <mg@daimi.au.dk> [Sat, 03 Jan 2009 17:15:21 +0100] rev 7627
mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
Martin Geisler <mg@daimi.au.dk> [Sat, 03 Jan 2009 17:15:21 +0100] rev 7626
churn: lowercase output
This changes the continuously updated progress bar -- not something a
script would rely on.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 12 Jan 2009 17:51:57 +0100] rev 7625
bdiff: add comment about normalization
Stefan Ring <stefan@complang.tuwien.ac.at> [Mon, 12 Jan 2009 13:20:09 +0100] rev 7624
Improved hgweb test.
The hgweb fix in 069b29656401 aimed at restoring the "back" link in hgweb's
filelog that has been lost in 62e0bb41e682. However, the previous version of
this test ran the filelog command on a file with only a single filelog entry.
In this case, the previous hgweb version did not exhibit the bug. The error
condition is now correctly tested with a filelog of 2 entries.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 12 Jan 2009 09:57:52 +0100] rev 7623
tests: use killdaemons.py in test-highlight
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 12 Jan 2009 09:16:03 +0100] rev 7622
use dict.iteritems() rather than dict.items()
This should be faster and more future-proof. Calls where the result is to be
sorted using util.sort() have been left unchanged. Calls to .items() on
configparser objects have been left as-is, too.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 12 Jan 2009 09:07:02 +0100] rev 7621
mq: allow qpop if popped revisions are not working dir parents
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 12 Jan 2009 09:53:55 +0100] rev 7620
mq: refactor the pop code to be more readable and allow more changes
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 12 Jan 2009 09:13:45 +0100] rev 7619
merge with crew-stable
Jim Hague <jim.hague@acm.org> [Fri, 09 Jan 2009 22:15:08 +0000] rev 7618
Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail.
During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18
contrib/sendbugmail.pl arrived in its place.
For notification emails to work properly, sendbugmail.pl requires as
its second parameter the Bugzilla user who made the commit. Otherwise
the user will not be recognised as the committer, and will receive
notification emails about the commit regardless of their preference
about being notified on their own commits. This parameter should be given
to processmail also, but wasn't for historical reasons.
Add new config with the local Bugzilla install directory, and provide
defaults for the notify string which should work for most setups.
Still permit notify string to be specified, and for backwards
compatibility with any extant notify strings try first interpolating
notify string with old-style single bug ID argument. Add new 2.18
support version to introduce sendbugmail.pl.
In other words, this update should be backwards-compatible with existing
installations, but offers simplified setup in most cases. And as a bonus
Bugzilla notification emails will be dispatched correctly; notifiers will
not receive an email unless configured to do so.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 09 Jan 2009 18:12:53 +0100] rev 7617
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 09 Jan 2009 01:37:54 +0100] rev 7616
use enumerate instead of zip
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 09 Jan 2009 01:36:35 +0100] rev 7615
patch: export shouldn't close files received as a parameter
We rely on __del__ to close the fd instead. Patchbomb was relying
on this behaviour, fix it.
Thanks to Manuel Barkhau for reporting it.