Matt Mackall <mpm@selenic.com> [Mon, 10 Dec 2007 10:24:21 -0600] rev 5636
rm: complain more about removing added files
Matt Mackall <mpm@selenic.com> [Mon, 10 Dec 2007 10:24:14 -0600] rev 5635
merge: make return codes more sensible
Commands that call merge were exiting with a return code equal to the
number of unresolved files. We now return 1 if there are unresolved
files.
Matt Mackall <mpm@selenic.com> [Mon, 10 Dec 2007 10:23:56 -0600] rev 5634
doc: correct preoutgoing description
Matt Mackall <mpm@selenic.com> [Mon, 10 Dec 2007 10:23:45 -0600] rev 5633
dispatch: report OOM rather than traceback
Patrick Mezard <pmezard@gmail.com> [Sun, 09 Dec 2007 20:46:32 +0100] rev 5632
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 09 Dec 2007 15:25:36 +0100] rev 5631
convert: move commands definition to ease demandload job (issue 860)
Steve Borho <steve@borho.org> [Sat, 08 Dec 2007 13:18:03 -0600] rev 5630
win32: remove text man pages from Windows package
The HTML versions are still packaged, and do not suffer from
eoln problems. This solves
issue531 (addition through subtraction)
Bryan O'Sullivan <bos@serpentine.com> [Fri, 07 Dec 2007 21:46:08 -0800] rev 5629
Merge with mpm
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:19:16 -0600] rev 5628
win32: include zsh_completion in Windows package
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:19:16 -0600] rev 5627
win32: include contrib/vim in Windows package
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:19:16 -0600] rev 5626
win32: use relative path to install source
Remove hard-coded path to the source repo to be packaged.
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:19:01 -0600] rev 5625
win32: move default install path inside program files
All of the 'space in path' problems have been resolved, so
we can install Mercurial the Windows standard location. The
{pf} InnoSetup variable is locale aware.
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:18:11 -0600] rev 5624
win32: it is no longer necessary to bundle patch.exe
Mercurial can use it's built-in mpatch library
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:15:24 -0600] rev 5623
win32: do not install bash hgmerge on Windows
Steve Borho <steve@borho.org> [Fri, 07 Dec 2007 18:14:16 -0600] rev 5622
win32: ignore all installers generated in Output/
Patrick Mezard <pmezard@gmail.com> [Sun, 09 Dec 2007 15:25:36 +0100] rev 5621
convert: move commands definition to ease demandload job (issue 860)
Matt Mackall <mpm@selenic.com> [Fri, 07 Dec 2007 14:59:33 -0600] rev 5620
Merge with crew
Steve Borho <steve@borho.org> [Wed, 05 Dec 2007 22:57:35 -0600] rev 5619
win32: favor local mercurial.ini over registry key
Hopefully this is the best of both worlds. Multiple py2exe based
installers can coexist on one machine, while source and lib based
Mercurial users can still use a registry key in lieu of resorting to
HGRCPATH.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Dec 2007 13:11:36 -0800] rev 5618
Merge with stable
David J. Mellor <dmellor@whistlingcat.com> [Thu, 06 Dec 2007 13:10:25 -0800] rev 5617
convert: fix SVN date parser dropping the final whole second digit
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Dec 2007 12:48:33 +0100] rev 5616
highlight: adapt to hgweb_mode refactoring
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Dec 2007 09:55:56 -0800] rev 5615
Merge with -stable
Jim Hague <jim.hague@acm.org> [Tue, 23 Oct 2007 10:39:24 +0000] rev 5614
Fix bdiff test failures on AIX.
The test fails when, in the call to calloc(), the number of elements (bn)
is 0. In that case, calloc() on AIX will return NULL, while the code expects
a valid heap pointer. Both results are permissible under C99, Unix98 etc.
Work around by ensuring that at least 1 element is requested.
Steve Borho <steve@borho.org> [Mon, 03 Dec 2007 17:28:26 -0600] rev 5613
workaround for raw_input() on Windows
Since change
a3fe91b4f6eb, Mercurial has set_binary() on stdin, stdout, and stderr.
On Windows, this had the side effect of causing raw_input() to emit trailing carriage
returns on it's returned strings. This was causing web authentication problems.
Patrick Mezard <pmezard@gmail.com> [Tue, 04 Dec 2007 23:28:10 +0100] rev 5612
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 04 Dec 2007 23:10:13 +0100] rev 5611
utils_win32: calling SHGetPathFromIDList under NT is useless and broken
The call was done under NT when running as a service (CGI script for instance) and always crash, even in interactive processes.
Matt Mackall <mpm@selenic.com> [Fri, 07 Dec 2007 02:29:55 -0600] rev 5610
copy: handle rename internally
- add rename parameter
- don't collect copied list
- report "moving" rather than "copying"
- remove renamed files
- don't return copied list
- simplify callers
Matt Mackall <mpm@selenic.com> [Fri, 07 Dec 2007 02:03:42 -0600] rev 5609
copy: move rename logic
Matt Mackall <mpm@selenic.com> [Fri, 07 Dec 2007 02:01:13 -0600] rev 5608
copy: simplify inner copy
- save dirstate lookup and exists check
- do all fs work inside a single dryrun clause
- move unlinking into inner copy section
- move target dir creation
- eliminate undelete mess
- fix a bug on mv a -> b -> a after merge
Matt Mackall <mpm@selenic.com> [Fri, 07 Dec 2007 02:01:10 -0600] rev 5607
copy: minor cleanups
- add after and dryrun variables
- add some comments