Bill Barry <after.fallout@gmail.com> [Thu, 12 Feb 2009 09:36:15 -0700] rev 7819
dispatch: extract command execution block into method
This pulls the pre-command hook/command/post-command hook workflow out of
the method it is in and puts it into its own method so that it potentially
could be exposed for extensions to wrap.
Benoit Allard <benoit@aeteurope.nl> [Thu, 05 Feb 2009 23:47:31 +0100] rev 7818
bookmarks: change NAME to REV
Alex Unden <alu@zpuppet.org> [Fri, 27 Feb 2009 02:01:45 -0800] rev 7817
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
David Soria Parra <dsp@php.net> [Sun, 01 Mar 2009 00:30:01 +0100] rev 7816
bookmarks: Set current bookmark if we create a new one on the tip
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
Matt Mackall <mpm@selenic.com> [Mon, 02 Mar 2009 19:19:12 -0600] rev 7815
convert: change hg.saverev default to False
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
Matt Mackall <mpm@selenic.com> [Mon, 02 Mar 2009 19:19:09 -0600] rev 7814
tag: force load of tag cache
Mads Kiilerich <mads@kiilerich.com> [Fri, 27 Feb 2009 19:10:38 +0100] rev 7813
run-tests.py: avoid using popen2.Popen4 - use subprocess instead
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.
Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated. Use the subprocess module.
Mads Kiilerich <mads@kiilerich.com> [Fri, 27 Feb 2009 17:52:31 +0100] rev 7812
test-convert-cvs*: mute output from "cvs up"
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 28 Feb 2009 13:15:58 +0100] rev 7811
i18n: update italian translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 02 Mar 2009 23:11:15 +0100] rev 7810
merge with crew-stable
Stefan Rusek <stefan@rusek.org> [Mon, 02 Mar 2009 23:07:56 +0100] rev 7809
include i18n files in the win32 installer
The .mo files for translations should be included in the Windows installer.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 28 Feb 2009 12:33:24 +0100] rev 7808
help: get rid of double spaces
timeless <timeless@gmail.com> [Sat, 28 Feb 2009 12:38:45 +0100] rev 7807
help: miscellaneous language fixes
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