Patchwork D6685: unshelve: changes how date is set on interactive mode

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

Comments

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

REVISION SUMMARY
  On an interactive unshelve, the remaining changes are shelved again
  for later. This patch modifies the date of remaining shelved change
  to the time of interactive shelve.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/shelve.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
phabricator - July 24, 2019, 2:48 p.m.
pulkit added inline comments.

INLINE COMMENTS

> shelve.py:832
>                          user=shelvectx.user(),
> -                        date=shelvectx.date())
> +                        date=opts.get('date'))
>      m = scmutil.matchfiles(repo, repo[snode].files())

IIUC `opts.get('date')` will be `None` here always.

REPOSITORY
  rHG Mercurial

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

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

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

INLINE COMMENTS

> shelve.py:831
>                          user=shelvectx.user(),
> -                        date=shelvectx.date())
> +                        date=dateutil.makedate())
>      m = scmutil.matchfiles(repo, repo[snode].files())

We can just skip passing the date and it will automatically use the current date.

REPOSITORY
  rHG Mercurial

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

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

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


  > the remaining changes are shelved again for later.
  
  the shelve is updated with remaining changes.
  
  (mentioning update is important because we are not creating a new shelve, we are updating that shelve)
  
  > This patch modifies the date of remaining shelved change to the time of interactive shelve.
  
  This patch sets the date of updated shelve to the time when unshelve was performed.

REPOSITORY
  rHG Mercurial

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

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

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
phabricator - Oct. 21, 2021, 7:43 a.m.
Herald added a subscriber: mercurial-patches.
ryancoop987 added a comment.


  This is the update for need you roblox robux generator no human verification <https://free-robuxnoverification.com> easily got it this fun

REPOSITORY
  rHG Mercurial

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

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

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

Patch

diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -829,7 +829,7 @@ 
     snode = repo.commit(text=shelvectx.description(),
                         extra=shelvectx.extra(),
                         user=shelvectx.user(),
-                        date=shelvectx.date())
+                        date=opts.get('date'))
     m = scmutil.matchfiles(repo, repo[snode].files())
     if snode:
         _shelvecreatedcommit(repo, snode, basename, m)