| Submitter | phabricator |
|---|---|
| Date | July 23, 2019, 6:38 a.m. |
| Message ID | <differential-rev-PHID-DREV-i6tqn2zpllth67rr2til-req@mercurial-scm.org> |
| Download | mbox | patch |
| Permalink | /patch/41013/ |
| State | Superseded |
| Headers | show |
Comments
mharbison72 added inline comments. INLINE COMMENTS > commands.py:6214 > + > + Selected changes can be unshelved with ``--interactive`` flag. The repo > + is updated with the requested changes by the user and the stored shelve s/repo/working directory/ > commands.py:6215-6218 > + is updated with the requested changes by the user and the stored shelve > + is modified with the remaining changes. Note that the user will get into > + conflicts whenever the whole shelve has conflicts with the repo > + regardless of the changes they have requested. "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). REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6676/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6676 To: navaneeth.suresh, #hg-reviewers Cc: mharbison72, mercurial-devel
navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > mharbison72 wrote in commands.py: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). Thanks for the review. Updated the description accordingly. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6676/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6676 To: navaneeth.suresh, #hg-reviewers Cc: mharbison72, mercurial-devel
pulkit added a comment. Since, we already has `--interactive` pushed for the upcoming release, queuing this on stable branch. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6676/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6676 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mharbison72, mercurial-devel
mharbison72 added a comment. 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. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6676/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6676 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: pulkit, mharbison72, mercurial-devel
pulkit added a comment.
In D6676#97793 <https://phab.mercurial-scm.org/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)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6676/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6676
To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mharbison72, mercurial-devel
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6188,6 +6188,10 @@ Timestamp in seconds is used to decide order of backups. More than ``maxbackups`` backups are kept, if same timestamp prevents from deciding exact order of them, for safety. + + Selected changes can be unshelved with ``--interactive`` flag. The repo + is updated with the requested changes by the user and the stored shelve + is modified with the remaining changes. """ with repo.wlock(): return shelvemod.dounshelve(ui, repo, *shelved, **opts)