| mharbison72 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (6 lines) | |||
| M | tests/test-help.t (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| cmdlist = [b' '.join(c[0]) for c in cmdlist.values()] | cmdlist = [b' '.join(c[0]) for c in cmdlist.values()] | ||||
| ui.write(b"%s\n" % b"\n".join(sorted(cmdlist))) | ui.write(b"%s\n" % b"\n".join(sorted(cmdlist))) | ||||
| @command( | @command( | ||||
| b'diff', | b'diff', | ||||
| [ | [ | ||||
| (b'r', b'rev', [], _(b'revision'), _(b'REV')), | (b'r', b'rev', [], _(b'revision'), _(b'REV')), | ||||
| (b'', b'from', b'', _(b'revision to diff from'), _(b'REV')), | (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')), | ||||
| (b'', b'to', b'', _(b'revision to diff to'), _(b'REV')), | (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')), | ||||
| (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')), | (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')), | ||||
| ] | ] | ||||
| + diffopts | + diffopts | ||||
| + diffopts2 | + diffopts2 | ||||
| + walkopts | + walkopts | ||||
| + subrepoopts, | + subrepoopts, | ||||
| _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'), | ||||
| helpcategory=command.CATEGORY_FILE_CONTENTS, | helpcategory=command.CATEGORY_FILE_CONTENTS, | ||||
| helpbasic=True, | helpbasic=True, | ||||
| inferrepo=True, | inferrepo=True, | ||||
| intents={INTENT_READONLY}, | intents={INTENT_READONLY}, | ||||
| ) | ) | ||||
| def diff(ui, repo, *pats, **opts): | def diff(ui, repo, *pats, **opts): | ||||
| """diff repository (or selected files) | """diff repository (or selected files) | ||||
| Returns 0 on success, 1 if errors are encountered. | Returns 0 on success, 1 if errors are encountered. | ||||
| options: | options: | ||||
| (some details hidden, use --verbose to show complete help) | (some details hidden, use --verbose to show complete help) | ||||
| $ hg help diff | $ hg help diff | ||||
| hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... | hg diff [OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]... | ||||
| diff repository (or selected files) | diff repository (or selected files) | ||||
| Show differences between revisions for the specified files. | Show differences between revisions for the specified files. | ||||
| Differences between files are shown using the unified diff format. | Differences between files are shown using the unified diff format. | ||||
| Note: | Note: | ||||
| Use the -g/--git option to generate diffs in the git extended diff format. | Use the -g/--git option to generate diffs in the git extended diff format. | ||||
| For more information, read 'hg help diffs'. | For more information, read 'hg help diffs'. | ||||
| Returns 0 on success. | Returns 0 on success. | ||||
| options ([+] can be repeated): | options ([+] can be repeated): | ||||
| -r --rev REV [+] revision | -r --rev REV [+] revision | ||||
| --from REV revision to diff from | --from REV1 revision to diff from | ||||
| --to REV revision to diff to | --to REV2 revision to diff to | ||||
| -c --change REV change made by revision | -c --change REV change made by revision | ||||
| -a --text treat all files as text | -a --text treat all files as text | ||||
| -g --git use git extended diff format | -g --git use git extended diff format | ||||
| --binary generate binary diffs in git mode (default) | --binary generate binary diffs in git mode (default) | ||||
| --nodates omit dates from diff headers | --nodates omit dates from diff headers | ||||
| --noprefix omit a/ and b/ prefixes from filenames | --noprefix omit a/ and b/ prefixes from filenames | ||||
| -p --show-function show which function each change is in | -p --show-function show which function each change is in | ||||
| --reverse produce a diff that undoes the changes | --reverse produce a diff that undoes the changes | ||||