Commit Graph

5640 Commits

Author SHA1 Message Date
Bryan O'Sullivan
0ce5bba724 Merge with crew 2007-12-19 19:21:30 -08:00
Jesse Glick
e75d3a3d78 Issue 882: add standard hook to reject text files with CRLF.
While the win32text extension does LF <-> CRLF conversion, and will issue a
warning in case a file already in the repository uses CRLF, it provides no
mechanism for verifying that incoming changes use LF. In a large development
team with some Windows users, it is virtually guaranteed that someone will
forget to set up the encode filter correctly and accidentally check in a file
using CRLF, which can cause warnings for other Windows users when they next
fetch changes. Since this is a general problem it is desirable to have a
pre-commit (or -push) hook available to reject such accidents earlier rather
than trying to fix them up after the fact.
2007-12-19 17:02:31 -05:00
peter.arrenbrecht@gmail.com
86c52a7365 mq: add --currentuser and --user options to qnew and qrefresh
These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.
2007-12-19 22:36:18 +01:00
Patrick Mezard
0661d4b997 patch: simplify directory creation 2007-12-17 23:42:48 +01:00
Patrick Mezard
1fb759fad1 patch: write rej files for missing targets (issue 853) 2007-12-17 23:42:46 +01:00
Patrick Mezard
29045b226b patch: avoid file existence tests when possible in selectfile() 2007-12-17 23:06:04 +01:00
Patrick Mezard
c43b58242b patch: move diff parsing in iterhunks generator 2007-12-17 23:06:01 +01:00
Patrick Mezard
b4f670a426 patch: move NoHunk detection up with parsing code 2007-12-17 22:19:21 +01:00
Thomas Arendsen Hein
bb8be03dba merge with main 2007-12-17 13:45:30 +01:00
Christian Ebert
27cd5a7001 patchbomb: make "hg email -b" w/o destination work as advertised 2007-12-16 22:55:23 +01:00
Shun-ichi GOTO
903870798f Workaround for "Not enough space" error due to the bug of Windows.
Large write requests fail when stdout is switched to binary mode.
As a workaround, limit the data size to write once.
2007-12-14 16:47:41 +01:00
Steve Borho
dafb712d34 fix typo in sshargs
the original typo dated back to early 2005
2007-12-13 14:25:51 -06:00
Peter Arrenbrecht
977c33f8b5 mq: drop obsolete reference to 'qversion' 2007-12-13 20:35:42 +01:00
Steve Borho
caa5fee772 win32: fix ssh://host:port when using Plink
Moves ssh argument building to platform specific utils code.
The win32 version looks for plink in ssh command string and
uses '-P' in lieu of '-p' for specifying a port
2007-12-12 16:44:26 -06:00
Patrick Mezard
783aa75f49 patchbomb: prompt with ui.prompt()
Avoid Windows raw_input() issue introduced by 0f20f68c768c.
Found by Steve Borho <steve@borho.org>.
2007-12-10 22:41:18 +01:00
Matt Mackall
912ed4360f ignore: fix up comment parsing
- remove redundant newline bits
- change loop to use regex
- eliminate escaping of # in internal representation
2007-12-10 10:26:42 -06:00
Matt Mackall
f200ad645a demandload: give better diagnostic for call of an unloaded module 2007-12-10 10:24:47 -06:00
Matt Mackall
f72837d93d fancyopts: lots of cleanups 2007-12-10 10:24:36 -06:00
Matt Mackall
1c590a3f47 commit: avoid losing edits during commit
If a file is edited between the time we record file states in the repo
and update the dirstate, that change can be lost to hg status. Because
we invoke the editor between these two points, that window can be
arbitrarily large.

This greatly shrinks the window by recording the commit change
immediately. If our checkin fails, we simply invalidate the dirstate.
2007-12-10 10:24:29 -06:00
Matt Mackall
964d06fc69 rm: complain more about removing added files 2007-12-10 10:24:21 -06:00
Matt Mackall
ad0a02c7c8 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.
2007-12-10 10:24:14 -06:00
Matt Mackall
a172f3448b doc: correct preoutgoing description 2007-12-10 10:23:56 -06:00
Matt Mackall
2b6b8e4e67 dispatch: report OOM rather than traceback 2007-12-10 10:23:45 -06:00
Patrick Mezard
847791ee22 Merge with crew-stable 2007-12-09 20:46:32 +01:00
Patrick Mezard
7a15f92250 convert: move commands definition to ease demandload job (issue 860) 2007-12-09 15:25:36 +01:00
Patrick Mezard
9760500b06 convert: move commands definition to ease demandload job (issue 860) 2007-12-09 15:25:36 +01:00
Steve Borho
90a5a885a9 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)
2007-12-08 13:18:03 -06:00
Bryan O'Sullivan
58767a2b81 Merge with mpm 2007-12-07 21:46:08 -08:00
Steve Borho
2f5f0c75a9 win32: include zsh_completion in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
b092b562f9 win32: include contrib/vim in Windows package 2007-12-07 18:19:16 -06:00
Steve Borho
84bda28dba win32: use relative path to install source
Remove hard-coded path to the source repo to be packaged.
2007-12-07 18:19:16 -06:00
Steve Borho
a380954518 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.
2007-12-07 18:19:01 -06:00
Steve Borho
ae1da92108 win32: it is no longer necessary to bundle patch.exe
Mercurial can use it's built-in mpatch library
2007-12-07 18:18:11 -06:00
Steve Borho
478009f6bd win32: do not install bash hgmerge on Windows 2007-12-07 18:15:24 -06:00
Steve Borho
96b2ad022b win32: ignore all installers generated in Output/ 2007-12-07 18:14:16 -06:00
Matt Mackall
fda4cb5390 Merge with crew 2007-12-07 14:59:33 -06:00
Matt Mackall
06d5fbf2a5 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
2007-12-07 02:29:55 -06:00
Matt Mackall
9c9f979f96 copy: move rename logic 2007-12-07 02:03:42 -06:00
Matt Mackall
e777df13c0 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
2007-12-07 02:01:13 -06:00
Matt Mackall
7ccba02a77 copy: minor cleanups
- add after and dryrun variables
- add some comments
2007-12-07 02:01:10 -06:00
Matt Mackall
5078c44417 copy: propagate errors properly 2007-12-06 15:15:47 -06:00
David J. Mellor
b1df375d09 convert: fix SVN date parser dropping the final whole second digit 2007-12-06 13:10:25 -08:00
Matt Mackall
6d83b8c76f copy: refactor okaytocopy into walkpat
- rename core copy function to copyfile
- move origsrc details into copyfile
- turn okaytocopy loop into walkpat
2007-12-06 14:58:57 -06:00
Steve Borho
4b1652b29a 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.
2007-12-05 22:57:35 -06:00
Bryan O'Sullivan
d98a355588 Merge with stable 2007-12-06 13:11:36 -08:00
Christian Ebert
6965f3c58c highlight: adapt to hgweb_mode refactoring 2007-12-05 12:48:33 +01:00
Bryan O'Sullivan
ac5dac6d91 Merge with -stable 2007-12-06 09:55:56 -08:00
Steve Borho
465647eece workaround for raw_input() on Windows
Since change 0f20f68c768c, 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.
2007-12-03 17:28:26 -06:00
Patrick Mezard
8cbb871ee7 Merge with crew-stable 2007-12-04 23:28:10 +01:00
Patrick Mezard
a55f5fd7fe 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.
2007-12-04 23:10:13 +01:00