| mharbison72 |
| hg-reviewers |
The new --from/--to options should be enough to support all the
uses cases and are easier to understand, so there is no reason that
I'm aware of to use -r anymore.
| 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 (2 lines) | |||
| M | relnotes/next (3 lines) | |||
| M | tests/test-help.t (1 line) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if ui.verbose: | if ui.verbose: | ||||
| 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 (DEPRECATED)'), _(b'REV')), | ||||
| (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')), | (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')), | ||||
| (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')), | (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, | ||||
| `command-templates.oneline-summary.<command>`, where `<command>` | `command-templates.oneline-summary.<command>`, where `<command>` | ||||
| can be e.g. `rebase`. As part of this effort, the default format | can be e.g. `rebase`. As part of this effort, the default format | ||||
| from `hg rebase` was reorganized a bit. | from `hg rebase` was reorganized a bit. | ||||
| * `hg strip`, from the strip extension, is now a core command, `hg | * `hg strip`, from the strip extension, is now a core command, `hg | ||||
| debugstrip`. The extension remains for compatibility. | debugstrip`. The extension remains for compatibility. | ||||
| * `hg diff` now supports `--from <rev>` and `--to <rev>` arguments as | * `hg diff` now supports `--from <rev>` and `--to <rev>` arguments as | ||||
| clearer alternatives to `-r <revs>`. | clearer alternatives to `-r <revs>`. `-r <revs>` has been | ||||
| deprecated. | |||||
| * The memory footprint per changeset during pull/unbundle | * The memory footprint per changeset during pull/unbundle | ||||
| operations has been further reduced. | operations has been further reduced. | ||||
| == New Experimental Features == | == New Experimental Features == | ||||
| * `experimental.single-head-per-branch:public-changes-only` can be used | * `experimental.single-head-per-branch:public-changes-only` can be used | ||||
| 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 | |||||
| --from REV1 revision to diff from | --from REV1 revision to diff from | ||||
| --to REV2 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 | ||||