merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts

util: remove set_exec and set_link methods

patch: use util.set_flags

convert/svn: use util.set_flags

merge: use util.set_flags

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

util: add new set_flags method This is more efficient than calling set_link and set_exec

add --debug to test-merge-types

merge: simplify merge tests, fix exec flag bug If local changed exec bit and remote changed file contents, exec bit change would be lost.

hg: fail upon copy/link errors while cloning locally

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().

convert: don't read ~/.cvsrc in test-convert-cvs

merge with crew-stable

merge with crew-stable

convert: allow repo root to be matched in filemap For consistency with "rename subdir ." syntax in filemap, also support "rename . subdir".

.hgignore += tags & cscope files

Merge with crew-stable

merge with crew-stable

server: append to logfiles

Move diffing missing file test and remove test-notfound No point to have a test dedicated to this diff behaviour.

commands: add exits(1) if a specified file cannot be added (issue 891)

test-hgweb-commands: replace all "XX years ago" occurences

Switch to using cat with EOF doc instead of trying to quote newlines for echo.

Use skipped: instead of hghave: for skipping tests, use this in test-merge-types

merge with crew-stable

Use common readlink.py instead of own implementations per test script.

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"

test-hgweb: fix css update

test-win32text: avoid unix2dos, printf extensions

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.

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.

Merge with mpm

Merge with crew

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.

patchbomb: make "hg email -b" w/o destination work as advertised

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.

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)

Make ui.prompt repeat on "unrecognized response" again (issue897) (this was accidentally changed in ca0d02222d6a)

Fix misleading error and prompts during update/merge (issue556)

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.

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)

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

fix spelling error

Merge with stable

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).

Add output markers to test-bundle so it's easier to spot the source of output diffs.

hgk: add black and blue as preferred colors

Remove spurious escape attempt in hg.1.txt