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