Patchwork D6688: unshelve: make basename as a mandatory argument for unshelvecontinue()

login
register
mail settings
Submitter phabricator
Date July 24, 2019, 12:52 p.m.
Message ID <differential-rev-PHID-DREV-rsdve6bvytnzh26mphrk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41046/
State Superseded
Headers show

Comments

phabricator - July 24, 2019, 12:52 p.m.
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6688

AFFECTED FILES
  mercurial/shelve.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
phabricator - July 24, 2019, 2:49 p.m.
pulkit added a comment.


  Can you explain in commit description as why this is done?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6688/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6688

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
phabricator - July 24, 2019, 5:46 p.m.
navaneeth.suresh added a comment.


  In D6688#97859 <https://phab.mercurial-scm.org/D6688#97859>, @pulkit wrote:
  
  > Can you explain in commit description as why this is done?
  
  This patch will become obsolete after D6684 <https://phab.mercurial-scm.org/D6684>. Should I abandon this?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6688/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6688

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
phabricator - July 25, 2019, 9:24 a.m.
pulkit added a comment.


  In D6688#97899 <https://phab.mercurial-scm.org/D6688#97899>, @navaneeth.suresh wrote:
  
  > In D6688#97859 <https://phab.mercurial-scm.org/D6688#97859>, @pulkit wrote:
  >
  >> Can you explain in commit description as why this is done?
  >
  > This patch will become obsolete after D6684 <https://phab.mercurial-scm.org/D6684>. Should I abandon this?
  
  Yes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6688/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6688

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
phabricator - July 25, 2019, 12:10 p.m.
navaneeth.suresh added a comment.
navaneeth.suresh abandoned this revision.


  Abandoning since changes in D6679 <https://phab.mercurial-scm.org/D6679> will make this obsolete.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6688/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6688

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -699,7 +699,7 @@ 
             if shfile.exists():
                 shfile.movetobackup()
         cleanupoldbackups(repo)
-def unshelvecontinue(ui, repo, state, opts, basename=None):
+def unshelvecontinue(ui, repo, state, opts, basename):
     """subcommand to continue an in-progress unshelve"""
     # We're finishing off a merge. First parent is our original
     # parent, second is the temporary "fake" commit we're unshelving.