diff: don't crash when diffing a revision with a deleted subrepo (issue3153) When a user requested a diff between a revision (r1) that contained a subrepo and another (r2) that did not, mercurial would crash if r1 was specified before r2 but would execute the diff otherwise. This fixes this behavior by skipping the missing subrepo in the diff.

status: add missing ":" to help text

dispatch: remove extra newline The return statement belongs to the lines above.

annotate: show full changeset hash when invoked with --debug and -c

merge with stable

largefiles: fix 'hg status' abort after merge If a largefile is introduced on the branch that is merged into the working copy, then 'hg status' would abort with an error like: $ hg status abort: .hglf/foo@33fdd332ec64: not found in manifest! The problem was that the largefiles status code only looked in the first parent for the largefile. Largefiles are now always reported as modified if they don't exist in the first parent -- this matches the behavior of localrepo.status for normal files.

largefiles: use lfutil functions Using regular expressions to cut off a (fixed) string prefix is overly complicated and wasteful.