hg pdiff#

show diff combining committed and uncommitted changes#

hg pdiff

This command is provided by the evolve extension.

This show the combined diff of the current working copy parent commit and the uncommitted change in the working copy itself. The diff displayed match the content of the commit that a bare `hg amend` will creates.

See `hg help diff` for details.

Options

-a

--text

treat all files as text

-g

--git

use git extended diff format

--binary

generate binary diffs in git mode (default)

--nodates

omit dates from diff headers

--noprefix

omit a/ and b/ prefixes from filenames

-p

--show-function

show which function each change is in

--reverse

produce a diff that undoes the changes

-w

--ignore-all-space

ignore white space when comparing lines

-b

--ignore-space-change

ignore changes in the amount of white space

-B

--ignore-blank-lines

ignore changes whose lines are all blank

-Z

--ignore-space-at-eol

ignore changes in whitespace at EOL

-U

--unified NUM

number of lines of context to show

--stat

output diffstat-style summary of changes

--root DIR

produce diffs relative to subdirectory

-I

--include PATTERN [+]

include names matching the given patterns

-X

--exclude PATTERN [+]

exclude names matching the given patterns

-S

--subrepos

recurse into subrepositories

--mq

operate on patch repository

Options marked [+] can be repeated.