branch: reword help text We're not necessarily talking about *the* active branch, just any old branch.

archive: adjust help text

annotate: add missing period to help

addremove: make help match add

add: mention .hgignore in help

bundle: warn for --base with --all

bundle: fix error for --all with destination Before it complained about --base

bundle: fix grammar in help text

bundle: clarify help text The file might not be compressed; the interactions between -a, --base, and a named or default repository weren't clear.

cmdutil: do not duplicate stdout by makefileobj() It made output order unpredictable because two separate buffers are flushed individually. Let's use a thin wrapper that just sends close() to black hole.

cmdutil: reimplement file wrapper that disables close() There's no need to dynamically create wrappedfileobj class and define close() as lambda. Also, __iter__() was missing.

export: remove useless comparison between file object and string It was introduced at 31aa2e5b0750, where "template" argument could be a file object. After that, a306837f8c87 added "len(template)", so "template" must be a string now. Therefore, "fp != template" should always be True. It seems 31aa2e5b0750 was intended to work around a bug in TortoiseHg, and I'm sure I've fixed it completely in TortoiseHg source. https://selenic.com/pipermail/mercurial-devel/2011-February/028467.html

export: do not print '<fdopen>' as an output filename Because makefileobj() duplicates or wraps stdout, "fp != sys.stdout" didn't work correctly. Python doc states that special file objects are named in the form '<...>', and absolute filenames should never start with '<', we can ignore names start with '<'. We can't test fp.fileno() because fp may be a command-server channel. https://docs.python.org/2.7/library/stdtypes.html#file.name In the test output, "exporting patch:" line is printed after patch content. This is caused by fdopen() and will be fixed by the subsequent patch.

commandserver: implement name() to clarify channel is not a plain file Because unknown attributes are delegated to the underlying file object, commandserver channels said they were '<stdout>' or '<stdin>' even though they weren't. This patch makes them say '<X-channel>'.

histedit: delete to drop The default behaviour to forbid this makes a lot of sense for novice users because it's safeguarding them from dangerous behavior but making it configurable will be apprieciated by power users in at least one big organization. It allows an user to look an histedit rules from declarative perspective and make the rules reflect the state after histedit. If we can move lines t move commits why can't we drop lines to drop commits? Let's put this behind config knob and inform users about this feature the very moment they are trying to use it so they can choose desired behaviour.

clonebundles: fix bundlespec typo

record: fix hunk handling to remember the current function

record: turn on showfunc Always try to give diff context when doing an interactive record

parsers: use PyTuple_Pack instead of manual list-filling Suggested by Yuya.

tags: mention --quiet switch in help (issue4920)

merge with stable

histedit: omit useless message from update (edit) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

histedit: omit useless message from update (_histedit) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

histedit: omit useless message from update (histeditaction) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

update: add quietempty flag to _showstats if called with quietempty=True, suppress: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

histedit: omit useless message from abort specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

hg: add quietempty flag to _showstats if called with quietempty=True, suppress: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

patch: disable nobinary when HGPLAIN=1 The diff output without binaries is definitely great for interactive users - a binary patch is not meaningful for them. Although setting diff.nobinary flag can break the automation. Let's force full output for automation.

help: add missed last new line to "internals" topic Caught by test-gendoc.t.

dirstate: make delaywrite sleep until the next multiple of n seconds Rather than sleep for 2 seconds, we sleep until the next even-numbered second, which has the same effect, but makes tests faster. This removes test-largefiles-update as the long pole of the test suite.