archive: add support for progress extension

progress: test setting progress.width This also makes the tests readable in a 80-character terminal which is why I made the change to both tests.

tests: add filtercr.py helper for progress tests The two tests that used filtercr.py already used a slightly different version, which explains why test-convert-svn-move.t changed after switching to using $TESTDIR/filtercr.py.

test-archive: whitespace cleanup

progress: explain format strings to translators

subrepo: re-backout 2245fcd0e160, remove test 7397a53219c9 re-removed the bad fix but not the test.

subrepo: re-backout 2245fcd0e160 This bug got introduced into default simultaneously with its backout, so future merges didn't eradicate it.

merge with stable

tag: abort if not at a branch head (issue2552) Since it's usually only desirable to make tag commits on top of branch heads, abort if the working dir parent is not a branch head. -f/--force may be passed to commit at a non-head anyway. Does not abort if working dir parent is a named branch head but not a topological head.

tag: fix uncommitted merge check and error message (issue2542) This patch corrects the check for tagging on an uncommitted merge. We should never commit a new tag changeset on an uncommitted merge, whether or not --rev is specified. It also changes the error message from: abort: cannot partially commit a merge (do not specify files or patterns) to the much more accurate (and terse): abort: uncommitted merge Local tags are ok.

tag: don't check .hgtags status if --local passed Local tags don't create a commit, so we don't need to check the status of .hgtags.

progress: refactor for readability and show XXs instead of 0mXXs.

progress: Add estimated time remaining for long tasks Output looks roughly like this: updating [======================> ] 1547/4842 0m13s output will either show h:m or m:s

progress: react more reasonably to nested progress topics Previously, we'd reset the entire progress bar state when a topic was completed, even if it wasn't the outermost progress topic. Now we print the state of the next progress topic on the stack if one is left rather than reset the progress bar.

Merge with stable

util: work around behavior change in Python 2.7.1

merge with stable

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

bundle progress: offer best-guess deterministic progress information This uses the same strategy as progress for pulls, estimating manifests based on changeset count and estimating file count by files list in each changeset.