merge: make debug output easier to read I always found it hard to figure out what the debug code meant without the separators.

sshrepo: add more safe characters (issue2983) Extended the list of safe characters introduced in 86fc364ca5f8 to include everything from pipes._safechars, which is only available on Unix platforms. Place "-" at the end of the range to avoid backslash-escape. New characters: @%+=:,

merge with stable

sshrepo: don't quote obviously safe strings (issue2983) This restores compatibility with hg-over-ssh servers that don't parse commandlines as sh does but works ok in the most common cases.

bookmarks: update and updatecurrentbookmark return status This makes bookmarks.update() and bookmarks.updatecurrentbookmark() return True or False to indicate whether the bookmark was updated or not. This allows callers to e.g. abort if the update failed.

bookmarks: clarify help for use of merge and update

merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

merge: remove excess creation of changectx

largefiles: optimize performance of status on largefiles repos (issue3136)

Describe all files related to the standard commands.

branch: warn on branching

bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]

bookmarks: shadow divergent bookmarks of foo with foo@n

help: properly underline annotate config heading

merge with stable