Commit Graph

5692 Commits

Author SHA1 Message Date
Matt Mackall
614e20b215 util: remove set_exec and set_link methods 2007-12-27 22:47:41 -06:00
Matt Mackall
f21286882c patch: use util.set_flags 2007-12-27 22:29:21 -06:00
Matt Mackall
ab5d78ce60 convert/svn: use util.set_flags 2007-12-27 22:29:17 -06:00
Matt Mackall
d9e4ee2c04 merge: use util.set_flags 2007-12-27 22:27:48 -06:00
Matt Mackall
49c18f282e wwrite: simplify with util.set_flags
- always attempt to delete the file (gets rid of read-only message)
- always write as a normal file
- use set_flags to convert to link or set exec
2007-12-27 22:27:47 -06:00
Matt Mackall
717ff7e6f8 util: add new set_flags method
This is more efficient than calling set_link and set_exec
2007-12-27 22:27:45 -06:00
Matt Mackall
2af988f28f add --debug to test-merge-types 2007-12-27 22:27:43 -06:00
Matt Mackall
7edaa19dd3 merge: simplify merge tests, fix exec flag bug
If local changed exec bit and remote changed file contents, exec bit
change would be lost.
2007-12-27 22:27:37 -06:00
Patrick Mezard
3cc8f21213 hg: fail upon copy/link errors while cloning locally 2007-12-27 22:28:41 +01:00
Maxim Dounin
54de122616 convert: svn-sink: copy and set properties after adding dirs/files
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
2007-12-27 03:14:46 +03:00
Maxim Dounin
a8a4715876 convert: don't read ~/.cvsrc in test-convert-cvs 2007-12-27 19:59:44 +03:00
Thomas Arendsen Hein
d02cbcaa88 merge with crew-stable 2007-12-27 13:39:59 +01:00
Thomas Arendsen Hein
e6f1571179 Tests for 2d14cb7e2a9e and a60a6bd11ed6 (interactive prompts during merge) 2007-12-27 13:39:03 +01:00
Thomas Arendsen Hein
0a782ae200 Make ui.prompt repeat on "unrecognized response" again (issue897)
(this was accidentally changed in 18945c2eb022)
2007-12-27 10:32:33 +01:00
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
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
Peter Arrenbrecht
18fb9f5e5e Fix income/pull with bundle and -R (issue 820).
Uses ui.setconfig() to tell bundlerepo where the main repo is. This is
needed for when the --repository option is used.

Adds tests to test-bundle and a new test script
test-mq-pull-from-bundle, which plays out the situation that initially
made me detect this bug

(hg -R .hg/patches pull ../bundle.hg).
2007-12-18 14:11:13 -06: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
69c7eeabfc patchbomb: make "hg email -b" w/o destination work as advertised 2007-12-16 22:55:23 +01:00