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.
Details
- Reviewers
pulkit - Group Reviewers
hg-reviewers - Commits
- rHG0795bbe8ed19: unshelve: add help text on --interactive in verbose mode
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
mercurial/commands.py | ||
---|---|---|
6214 | s/repo/working directory/ | |
6215–6218 | "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). |
mercurial/commands.py | ||
---|---|---|
6215–6218 | Thanks for the review. Updated the description accordingly. |
Since, we already has --interactive pushed for the upcoming release, queuing this on stable branch.
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)
s/repo/working directory/