This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8295

rebase: mention -r argument in synopsis
ClosedPublic

Authored by martinvonz on Mar 13 2020, 10:37 PM.

Details

Reviewers
mharbison72
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc4c97cabfc16: rebase: mention -r argument in synopsis
Summary

I'm guessing that we simply forgot to mention it there. I was
wondering if maybe -r was experimental as long as evolution is, but
that doesn't seem to be the case (-r is not marked experimental).

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.Mar 13 2020, 10:37 PM
martinvonz added a parent revision: D8291: rebase: remove unused defaults argument values from _definedestmap().Mar 13 2020, 10:37 PM
martinvonz retitled this revision from rebase: mention -r argument in synposis to rebase: mention -r argument in synopsis.
martinvonz added a child revision: D8292: rebase: accept multiple --source arguments (BC).
mharbison72 accepted this revision.Mar 13 2020, 11:42 PM
mharbison72 added a subscriber: mharbison72.

Weird, I thought this was dependent on evolve too. But I guess if that were really the case, it would have be implemented in a wrapper in evolve. I suppose it works without evolve if using --keep, but I never use that.

pulkit accepted this revision.Mar 14 2020, 5:01 AM
This revision is now accepted and ready to land.Mar 14 2020, 5:01 AM
martinvonz added a commit: rHGc4c97cabfc16: rebase: mention -r argument in synopsis.Mar 14 2020, 5:32 AM
Closed by commit rHGc4c97cabfc16: rebase: mention -r argument in synopsis (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute added a subscriber: marmoute.Mar 14 2020, 5:34 AM
In D8295#123832, @mharbison72 wrote:

Weird, I thought this was dependent on evolve too. But I guess if that were really the case, it would have be implemented in a wrapper in evolve. I suppose it works without evolve if using --keep, but I never use that.

It is more that without the ability to create orphan, the flag usefulness is much more limited.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 20794

hgext/rebase.py

b'automatically rebase orphan revisions ' b'automatically rebase orphan revisions '
b'in the specified revset (EXPERIMENTAL)' b'in the specified revset (EXPERIMENTAL)'
), ),
), ),
] ]
+ cmdutil.dryrunopts + cmdutil.dryrunopts
+ cmdutil.formatteropts + cmdutil.formatteropts
+ cmdutil.confirmopts, + cmdutil.confirmopts,
_(b'[-s REV | -b REV] [-d REV] [OPTION]'), _(b'[-s REV | -b REV | [-r REV]...] [-d REV] [OPTION]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
) )
def rebase(ui, repo, **opts): def rebase(ui, repo, **opts):
"""move changeset (and descendants) to a different branch """move changeset (and descendants) to a different branch
Rebase uses repeated merging to graft changesets from one part of Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be history (the source) onto another (the destination). This can be
useful for linearizing *local* changes relative to a master useful for linearizing *local* changes relative to a master