Matt Mackall <mpm@selenic.com> [Mon, 09 Mar 2009 11:41:38 -0500] rev 7834
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Mar 2009 20:16:03 +0100] rev 7833
verify: find correct first corrupted cset for missing/corrupted revlogs
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Mar 2009 20:04:56 +0100] rev 7832
verify: do not abort on fully corrupted revlog
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Mar 2009 00:59:41 +0100] rev 7831
hgweb: fix allow_read permissions when a user is specified
Thanks to Juan Pablo Aroztegi for reporting and debugging it.
Mads Kiilerich <mads@kiilerich.com> [Thu, 05 Mar 2009 14:53:59 +0100] rev 7830
test-identify: require no-outer-repo
The test expects "There is no Mercurial repository here (.hg not found)"
Benoit Allard <benoit@aeteurope.nl> [Thu, 05 Mar 2009 10:38:39 +0100] rev 7829
update copyright date in version information
Dongsheng Song <dongsheng.song@gmail.com> [Thu, 05 Mar 2009 14:44:13 +0800] rev 7828
Typo fix
Steve Borho <steve@borho.org> [Wed, 04 Mar 2009 22:56:17 -0600] rev 7827
update copyright in ReadMe.html
Matt Mackall <mpm@selenic.com> [Fri, 06 Mar 2009 09:15:47 -0600] rev 7826
setup.py: fix version detection for tarball
- don't do version detection if there's no .hg directory
- shrink try: clause
- don't write __version__.py if version is unknown
(we might overwrite the real version)
Matt Mackall <mpm@selenic.com> [Wed, 04 Mar 2009 19:04:21 -0600] rev 7825
Added signature for changeset
11efa41037e2
Matt Mackall <mpm@selenic.com> [Wed, 04 Mar 2009 19:04:20 -0600] rev 7824
Added tag 1.2 for changeset
11efa41037e2
Frank Kingswood <frank@kingswood-consulting.co.uk> [Tue, 03 Mar 2009 21:32:23 +0000] rev 7823
convert: Perforce source for conversion to Mercurial
Matt Mackall <mpm@selenic.com> [Wed, 04 Mar 2009 18:42:24 -0600] rev 7822
remove tests for long-gone imerge extension
Augie Fackler <durin42@gmail.com> [Wed, 04 Mar 2009 13:06:16 -0600] rev 7821
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes
issue1533.
Matt Mackall <mpm@selenic.com> [Wed, 04 Mar 2009 17:02:16 -0600] rev 7820
audit: be even pickier (
issue1450)
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