This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6676

unshelve: add help text on --interactive in verbose mode
ClosedPublic

Authored by navaneeth.suresh on Jul 23 2019, 2:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0795bbe8ed19: unshelve: add help text on --interactive in verbose mode
Summary

This is a follow-up patch to rHG9eace8d6d537. This modifies the
help text of unshelve in verbose mode to mention the details
about --interactive flag.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 added a subscriber: mharbison72.Jul 23 2019, 12:50 PM
mharbison72 added inline comments.
mercurial/commands.py
6192

s/repo/working directory/

6193–6196

"Shelve" is an action, so "stored shelve" and "whole shelve" read awkwardly. Maybe stick to the phrase "shelved change" from above?

Minor bikeshedding, but it might also be better to say something like "The working directory is updated with the selected changes, and only the unselected changes remain shelved", rather than saying the shelved store is modified with remaining changes (since they were already there).

navaneeth.suresh marked 2 inline comments as done.Jul 23 2019, 1:39 PM
navaneeth.suresh added inline comments.
mercurial/commands.py
6193–6196

Thanks for the review. Updated the description accordingly.

navaneeth.suresh marked an inline comment as done.Jul 23 2019, 1:49 PM
pulkit added a subscriber: pulkit.Jul 24 2019, 5:02 AM

Since, we already has --interactive pushed for the upcoming release, queuing this on stable branch.

pulkit accepted this revision.Jul 24 2019, 5:02 AM
This revision is now accepted and ready to land.Jul 24 2019, 5:02 AM
mharbison72 added a comment.Jul 24 2019, 7:53 AM

Maybe I’m looking at something wrong, but it looks like a couple references to “the shelve” snuck in after the last edit in diff 16017.

pulkit added a comment.Jul 24 2019, 8:04 AM
In D6676#97793, @mharbison72 wrote:

Maybe I’m looking at something wrong, but it looks like a couple references to “the shelve” snuck in after the last edit in diff 16017.

Ah, forgot to mention, I edited the Note: part in flight a bit.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6213,9 +6213,11 @@ def unshelve(ui, repo, *shelved, **opts)
 
        Selected changes can be unshelved with ``--interactive`` flag.
        The working directory is updated with the selected changes, and
-           only the unselected changes remain shelved.     Note that the user will
-           get into conflicts  whenever the  shelved change has conflicts with
-           the working directory regardless of the changes requested by the user    .
+           only the unselected changes remain shelved.
+            Note: The whole shelve is applied to working directory first before
+           running interactively. So, this will bring up all the conflicts between
+           working directory and the shelve, irrespective of which changes will be
+           unshelved    .
     """
     with repo.wlock():
         return shelvemod.dounshelve(ui, repo, *shelved, **opts)

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)

Diff 16008

mercurial/commands.py

defaults to 10 but can be overridden using the ``shelve.maxbackups`` defaults to 10 but can be overridden using the ``shelve.maxbackups``
configuration option. configuration option.
.. container:: verbose .. container:: verbose
Timestamp in seconds is used to decide order of backups. More Timestamp in seconds is used to decide order of backups. More
than ``maxbackups`` backups are kept, if same timestamp than ``maxbackups`` backups are kept, if same timestamp
prevents from deciding exact order of them, for safety. prevents from deciding exact order of them, for safety.
Selected changes can be unshelved with ``--interactive`` flag. The repo
mharbison72Unsubmitted
Done

s/repo/working directory/

mharbison72: s/repo/working directory/
is updated with the requested changes by the user and the stored shelve
is modified with the remaining changes.
""" """
with repo.wlock(): with repo.wlock():
mharbison72Unsubmitted
Done

"Shelve" is an action, so "stored shelve" and "whole shelve" read awkwardly. Maybe stick to the phrase "shelved change" from above?

Minor bikeshedding, but it might also be better to say something like "The working directory is updated with the selected changes, and only the unselected changes remain shelved", rather than saying the shelved store is modified with remaining changes (since they were already there).

mharbison72: "Shelve" is an action, so "stored shelve" and "whole shelve" read awkwardly. Maybe stick to…
navaneeth.sureshAuthorUnsubmitted
Done

Thanks for the review. Updated the description accordingly.

navaneeth.suresh: Thanks for the review. Updated the description accordingly.
return shelvemod.dounshelve(ui, repo, *shelved, **opts) return shelvemod.dounshelve(ui, repo, *shelved, **opts)
statemod.addunfinished( statemod.addunfinished(
'unshelve', fname='shelvedstate', continueflag=True, 'unshelve', fname='shelvedstate', continueflag=True,
abortfunc=shelvemod.hgabortunshelve, abortfunc=shelvemod.hgabortunshelve,
cmdmsg=_('unshelve already in progress'), cmdmsg=_('unshelve already in progress'),
) )