merge default heads in crew and main

merge stable heads in crew and main

eol: improve help on whether EOLs are changed in working copy or repository Improved help to make it more clear for users which changes are only changes in the working copy and which changes that will go into the repository (on the following commit). Futhermore a note on when the rules will be applied to the working directory.

churn: ignore trailing and leading spaces (issue2546)

merge with stable

make_file: always return a fresh file handle that can be closed Currently, cmdutil.make_file() will return a freshly made file handle, except when given a pattern of '-'. If callers would want to close the handle, they would have to make sure that it's neither sys.stdin or sys.stdout. Instead, returning a duplicate of either of the two ensures that make_file() lives up to its name and creates a new file handle regardless of the input.

merge with stable

hook: fix import path handling for repo=None

hook: assume relative path to hook is given from repo root

subrepo: backed out changeset 2245fcd0e160