Thomas Arendsen Hein
3cd6fe199f
merge with crew-stable
2007-12-26 23:03:32 +01:00
Thomas Arendsen Hein
94bdbd585c
Fix misleading error and prompts during update/merge (issue556)
2007-12-26 22:47:16 +01:00
Maxim Dounin
bd23432b17
convert: allow repo root to be matched in filemap
...
For consistency with "rename subdir ." syntax in filemap, also support
"rename . subdir".
2007-12-25 21:14:11 -08:00
Patrick Mezard
a802f4255a
patch: be more tolerant to diffstat failures (issue 865)
...
Sometimes, revisions cannot be represented by a regular diff, only a git diff
would capture binary files or permission changes. diffstat cannot handle git
patches and will output "0 files changed" when fed with an empty diff. We
cannot consider the latter to be an error, unless we rewrite diffstat to handle
these correctly.
2007-12-25 22:21:51 +01:00
Kirill Smelkov
ce6e0fe0b0
.hgignore += tags & cscope files
2007-12-25 18:48:43 +03:00
Patrick Mezard
cf0ec16a92
Merge with crew-stable
2007-12-25 22:23:58 +01:00
Thomas Arendsen Hein
b29abebc1e
merge with crew-stable
2007-12-25 14:30:10 +01:00
Thomas Arendsen Hein
462c1975db
Fix chmod of writable but unowned files (issue530)
...
This could happen e.g. in group writable local repositories where a file
should become executable on update.
(Patch by Benoit Boissinot attached to issue530)
2007-12-25 14:05:26 +01:00
Mirko Friedenhagen
2a87bfec34
server: append to logfiles
2007-12-24 17:21:40 +01:00
Patrick Mezard
2c06488c05
Move diffing missing file test and remove test-notfound
...
No point to have a test dedicated to this diff behaviour.
2007-12-24 12:22:33 +01:00
Patrick Mezard
fd1268357e
commands: add exits(1) if a specified file cannot be added (issue 891)
2007-12-24 12:14:43 +01:00
Patrick Mezard
7af6ee2ffb
test-hgweb-commands: replace all "XX years ago" occurences
2007-12-24 01:50:07 +01:00
Lee Cantey
8c88af89e3
Switch to using cat with EOF doc instead of trying to quote newlines for echo.
2007-12-21 14:26:20 -08:00
Thomas Arendsen Hein
cb74375be7
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
2007-12-21 21:50:19 +01:00
Thomas Arendsen Hein
4a19a0186d
merge with crew-stable
2007-12-21 12:14:35 +01:00
Thomas Arendsen Hein
98901c4f4d
Fix test-convert-darcs output on Debian etch (issue779)
...
The CR characters of darcs get confused the output.
Additionally this darcs version printed:
darcs: <stdin>: hGetLine: end of file
2007-12-21 12:07:02 +01:00
Thomas Arendsen Hein
3aa5d6c16c
Use common readlink.py instead of own implementations per test script.
2007-12-21 10:24:03 +01:00
Thomas Arendsen Hein
becde51102
Use test -h instead of test -L for portability
...
Citing from the GNU autoconf manual:
"either form conforms to Posix 1003.1-2001, but older shells like Solaris 8
/bin/sh support only -h"
2007-12-21 09:51:19 +01:00
Patrick Mezard
b349162295
test-hgweb: fix css update
2007-12-21 00:14:45 +01:00
Patrick Mezard
d1b62d9bf5
test-win32text: avoid unix2dos, printf extensions
2007-12-21 00:13:00 +01:00
Jesse Glick
09abfa016d
Atom/RSS logo display problem using min font size.
...
Using Minimum Font Size = 18 on Firefox, the Atom and RSS logos in a changeset
web page look crushed together. No need to specify an absolute width for text;
just use sensible padding instead.
2007-12-20 07:05:40 -05:00
Jesse Glick
47211365ca
man 5 hgrc implied you need to use external tools to do CRLF translation.
...
This is no longer true; win32text provides a much better in-process alternative.
2007-12-20 07:46:47 -08:00
Bryan O'Sullivan
044477626b
Merge with mpm
2007-12-19 19:23:18 -08:00
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
Arun Thomas
2948ac84bf
Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc.
...
If .hgrc specifies SMTP/TLS and a username without specifying a password,
prompt for a password.
2007-12-19 11:56:19 -05:00
Christian Ebert
7241bd8d3a
highlight: fix more tracebacks by forcing util._encoding to hgweb.encoding
...
This is needed in case util._encoding and hgweb.encoding conflict.
Extreme example:
HGENCODING=UTF-8
[web]
encoding = ascii
Note:
display of files whose encoding differs from HGENCODING or hgweb.encoding
behaves not exactly the same way as with highlight turned off as replacement
chars are either converted or replaced.
2007-12-19 10:11:32 +01:00
Matt Mackall
fbfe5cbaab
fix spelling error
2007-12-18 15:40:46 -06:00
Matt Mackall
1de0ed9a08
Merge with stable
2007-12-18 15:17:11 -06:00
John Coomes
e9eb2749fb
hg tag: run tag hook just once
2007-12-18 12:45:30 -08:00
John Coomes
5c790a2f5f
hg tag: run tag hook just once
2007-12-18 12:45:30 -08:00
Christian Ebert
f996d70387
patchbomb: break lines > 80 chars (coding style)
2007-12-18 22:50:27 +01:00
Matt Mackall
c29af0c762
changelog: inline trivial call for extra data unescaping
2007-12-27 23:55:40 -06:00
Matt Mackall
295be4678d
changelog: remove extract function
2007-12-27 23:55:40 -06:00
Matt Mackall
c9efd52e9e
util: simplify unique
2007-12-27 23:55:40 -06:00
Matt Mackall
50455803c5
remove unused util.localsub function
2007-12-27 23:55:40 -06:00
Matt Mackall
3d2020e6ca
add debugfsinfo to check fs capabilities
2007-12-27 23:55:40 -06:00
Matt Mackall
1baaf41264
atomictempfile: avoid chmod weirdness on Linux vfat
2007-12-27 23:55:40 -06:00
Matt Mackall
bdea7ebd1b
checkexec: fix VFAT tempfile droppings with more modern Linux kernels
...
More recent Linux kernels don't pretend to allow any bogus chmods on
VFAT.
2007-12-27 23:55:40 -06:00
Matt Mackall
efd0dc7e97
bisect: use proper locking when updating bisect.state
2007-12-27 23:55:40 -06:00
Matt Mackall
2c1d9d3334
bisect: remove class
...
- rename core function to _bisect
- rename command function to bisect
- move state management to bisect
2007-12-27 23:55:40 -06:00
Matt Mackall
4374a62a6f
bisect: keep history of all bad revisions
...
- use a single state dict
- find the minimum bad revision
2007-12-27 23:55:40 -06:00
Matt Mackall
98edd8fe9d
bisect: use more standard command syntax and help
2007-12-27 23:55:40 -06:00
Matt Mackall
20c9eec942
bisect: move reporting out of core bisect function
2007-12-27 23:55:40 -06:00
Matt Mackall
c2150b8bfe
bisect: add skip command
...
- read/write skip lines in state
- skip candidates in skipnodes
- move bisect begin logic to next
- add skip command
2007-12-27 23:55:40 -06:00
Matt Mackall
7caa218038
bisect: simplify state handling and init
...
- use a single bisect.state file
- unify init and reset (delete the state)
- move write into good/bad
2007-12-27 23:55:39 -06:00
Matt Mackall
b3662ecbfa
bisect: remove unused imports
2007-12-27 23:55:39 -06:00
Matt Mackall
6b799c897d
bisect: rename autobad/good/next
2007-12-27 23:55:39 -06:00
Matt Mackall
f29636dd67
bisect: slightly improve the help message
2007-12-27 23:55:39 -06:00