This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9555

docs: prefer `hg diff --from/--to` over `-r`
ClosedPublic

Authored by martinvonz on Dec 9 2020, 10:09 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG8837498ae6e0: docs: prefer `hg diff --from/--to` over `-r`
Summary

This patch includes updating away from the broken `hg diff -r
'date(...)'` (see not in previous patch).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 9 2020, 10:09 PM
mharbison72 requested changes to this revision.Dec 9 2020, 11:51 PM
mharbison72 added a subscriber: mharbison72.

I can fix this in flight if the answer to my question in D9554 is that it's by design, but flagging this for now.

mercurial/commands.py
2525

I think you accidentally dropped ^ along with :.

This revision now requires changes to proceed.Dec 9 2020, 11:51 PM
martinvonz added inline comments.Dec 9 2020, 11:55 PM
mercurial/commands.py
2525

Yep, I definitely did not mean to remove that.

mharbison72 accepted this revision.Dec 10 2020, 12:17 AM
This revision is now accepted and ready to land.Dec 10 2020, 12:17 AM
martinvonz added a commit: rHG8837498ae6e0: docs: prefer `hg diff --from/--to` over `-r`.Dec 10 2020, 12:20 AM
Closed by commit rHG8837498ae6e0: docs: prefer `hg diff --from/--to` over `-r` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (12 lines)

Diff 24159

mercurial/commands.py

Examples: Examples:
- compare a file in the current working directory to its parent:: - compare a file in the current working directory to its parent::
hg diff foo.c hg diff foo.c
- compare two historical versions of a directory, with rename info:: - compare two historical versions of a directory, with rename info::
hg diff --git -r 1.0:1.2 lib/ hg diff --git --from 1.0 --to 1.2 lib/
- get change stats relative to the last change on some date:: - get change stats relative to the last change on some date::
hg diff --stat -r "date('may 2')" hg diff --stat --from "date('may 2')"
- diff all newly-added files that contain a keyword:: - diff all newly-added files that contain a keyword::
hg diff "set:added() and grep(GNU)" hg diff "set:added() and grep(GNU)"
- compare a revision and its parents:: - compare a revision and its parents::
hg diff -c 9353 # compare against first parent hg diff -c 9353 # compare against first parent
hg diff -r 9353^:9353 # same using revset syntax hg diff --from 9353^ --to 9353 # same using revset syntax
mharbison72Unsubmitted
Not Done

I think you accidentally dropped ^ along with :.

mharbison72: I think you accidentally dropped `^` along with `:`.
martinvonzAuthorUnsubmitted
Done

Yep, I definitely did not mean to remove that.

martinvonz: Yep, I definitely did not mean to remove that.
hg diff -r 9353^2:9353 # compare against the second parent hg diff --from 9353^2 --to 9353 # compare against the second parent
Returns 0 on success. Returns 0 on success.
""" """
cmdutil.check_at_most_one_arg(opts, 'rev', 'change') cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
revs = opts.get(b'rev') revs = opts.get(b'rev')
change = opts.get(b'change') change = opts.get(b'change')
the first and only parent. the first and only parent.
The command:: The command::
hg graft -r 345 --base 234 hg graft -r 345 --base 234
is thus pretty much the same as:: is thus pretty much the same as::
hg diff -r 234 -r 345 | hg import hg diff --from 234 --to 345 | hg import
but using merge to resolve conflicts and track moved files. but using merge to resolve conflicts and track moved files.
The result of a merge can thus be backported as a single commit by The result of a merge can thus be backported as a single commit by
specifying one of the merge parents as base, and thus effectively specifying one of the merge parents as base, and thus effectively
grafting the changes from the other side. grafting the changes from the other side.
It is also possible to collapse multiple changesets and clean up history It is also possible to collapse multiple changesets and clean up history