Closed by commit rHG3fb0493812c0: abort: added support for unshelve (authored
by taapas1128).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15866&id=15882
CHANGES SINCE LAS
taapas1128 updated this revision to Diff 15866.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15863&id=15866
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 updated this revision to Diff 15863.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15861&id=15863
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 updated this revision to Diff 15861.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15860&id=15861
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
pulkit added inline comments.
INLINE COMMENTS
> shelve.py:648
> +'please update to some commit\n'))
> +return (state, opts)
> +
we can prevent returning opts here. One user does not need it and other one is
passing by reference.
REPOSITORY
rHG Mercurial
C
taapas1128 added a comment.
updated that.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
To: taapas1128, #hg-reviewers
Cc: mharbison72, pulkit, mercurial-devel
__
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15860.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15859&id=15860
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
h
pulkit added a comment.
The commit message is outdated.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
To: taapas1128, #hg-reviewers
Cc: mharbison72, pulkit, mercurial-devel
taapas1128 updated this revision to Diff 15859.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15857&id=15859
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 marked 5 inline comments as done.
taapas1128 updated this revision to Diff 15857.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15833&id=15857
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
http
pulkit added inline comments.
INLINE COMMENTS
> shelve.py:628
>
> -def unshelveabort(ui, repo, state, opts):
> +def _loadshelvedstate(ui, repo, continuef=False, abortf=False, **opts):
> +try:
continuef and abortf can be read from opts, no need to pass them separately.
Also, `opts` should
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15833.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15806&id=15833
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
h
taapas1128 added a comment.
@mharbison72 Thanks for the suggestions. I have amended the patch accordingly.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
To: taapas1128, #hg-reviewers
Cc
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15806.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15781&id=15806
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
h
mharbison72 added inline comments.
INLINE COMMENTS
> test-shelve2.t:1
> -#testcases stripbased phasebased
> +#testcases stripbased phasebased abortflag abortcommand
>
Shouldn't these be 2 lines, to maximize the test coverage? Presumably
`--abort` and `hg abort` can work with either phase or
mharbison72 added inline comments.
INLINE COMMENTS
> test-shelve2.t:734
> + abort: merge does not support 'hg abort' (stripbased !)
> + (use 'hg commit' or 'hg merge --abort') (stripbased !)
>[255]
I think that you can eliminate the duplication with this:
abort: no unshelve in progress
taapas1128 updated this revision to Diff 15781.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15768&id=15781
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 updated this revision to Diff 15768.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15756&id=15768
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 updated this revision to Diff 15756.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15753&id=15756
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 edited the summary of this revision.
taapas1128 updated this revision to Diff 15753.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15734&id=15756
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
h
pulkit added inline comments.
INLINE COMMENTS
> shelve.py:630
> +if not state:
> +try:
> +state = shelvedstate.load(repo)
Let's take this code out into a new function and reuse that function at both
the places instead of duplicating code.
REPOSITORY
rHG Mercurial
CHA
taapas1128 updated this revision to Diff 15734.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15666&id=15756
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 added a comment.
I have rebased it.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel
__
pulkit added a comment.
This patch needs to be rebased on tip of hg-committed as shelve is in core
now.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
To: taapas1128, #hg-reviewers
Cc:
taapas1128 updated this revision to Diff 15666.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6579?vs=15665&id=15666
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6579/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6579
AFFECTED FI
taapas1128 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds the support for shelve in `hg abort` plan.
`unshelveabort()` has been modified for independent calls.
Results are shown as tests.
REPOSITO
26 matches
Mail list logo
