This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6685

unshelve: changes how date is set on interactive mode
ClosedPublic

Authored by navaneeth.suresh on Jul 24 2019, 8:43 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGaaad4fe55ad1: unshelve: changes how date is set on interactive mode
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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 10:48 AM
pulkit added inline comments.
mercurial/shelve.py
832

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

navaneeth.suresh marked an inline comment as done.Jul 24 2019, 2:21 PM
pulkit added inline comments.Jul 25 2019, 5:22 AM
mercurial/shelve.py
832

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

navaneeth.suresh marked an inline comment as done.Jul 25 2019, 8:11 AM
pulkit accepted this revision.Jul 25 2019, 8:48 AM
This revision is now accepted and ready to land.Jul 25 2019, 8:48 AM
pulkit added a comment.Jul 26 2019, 10:40 AM

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.

ryancoop987 added a subscriber: ryancoop987.Oct 21 2021, 3:43 AM

This is the update for need you roblox robux generator no human verification easily got it this fun

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)

Diff 16039

mercurial/shelve.py

commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, commitfunc = getcommitfunc(shelvectx.extra(), interactive=True,
editor=True) editor=True)
newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False, newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False,
cmdutil.recordfilter, *pats, cmdutil.recordfilter, *pats,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
snode = repo.commit(text=shelvectx.description(), snode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(), extra=shelvectx.extra(),
user=shelvectx.user(), user=shelvectx.user(),
date=shelvectx.date()) date=opts.get('date'))
pulkitUnsubmitted
Done

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

pulkit: IIUC `opts.get('date')` will be `None` here always.
pulkitUnsubmitted
Done

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

pulkit: We can just skip passing the date and it will automatically use the current date.
m = scmutil.matchfiles(repo, repo[snode].files()) m = scmutil.matchfiles(repo, repo[snode].files())
if snode: if snode:
_shelvecreatedcommit(repo, snode, basename, m) _shelvecreatedcommit(repo, snode, basename, m)
return newnode, bool(snode) return newnode, bool(snode)
def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx, def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx,
tmpwctx, shelvectx, branchtorestore, tmpwctx, shelvectx, branchtorestore,