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