Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/shelve.py @ 42689:aaad4fe55ad1
unshelve: changes how date is set on interactive mode
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.
Differential Revision: https://phab.mercurial-scm.org/D6685
| author | Navaneeth Suresh <navaneeths1998@gmail.com> |
|---|---|
| date | Wed, 24 Jul 2019 18:10:50 +0530 |
| parents | c9114885c14b |
| children | d5cdce3d9164 |
comparison
equal
deleted
inserted
replaced
| 42688:c9114885c14b | 42689:aaad4fe55ad1 |
|---|---|
| 833 newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False, | 833 newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False, |
| 834 cmdutil.recordfilter, *pats, | 834 cmdutil.recordfilter, *pats, |
| 835 **pycompat.strkwargs(opts)) | 835 **pycompat.strkwargs(opts)) |
| 836 snode = repo.commit(text=shelvectx.description(), | 836 snode = repo.commit(text=shelvectx.description(), |
| 837 extra=shelvectx.extra(), | 837 extra=shelvectx.extra(), |
| 838 user=shelvectx.user(), | 838 user=shelvectx.user()) |
| 839 date=shelvectx.date()) | |
| 840 m = scmutil.matchfiles(repo, repo[snode].files()) | 839 m = scmutil.matchfiles(repo, repo[snode].files()) |
| 841 if snode: | 840 if snode: |
| 842 _shelvecreatedcommit(repo, snode, basename, m) | 841 _shelvecreatedcommit(repo, snode, basename, m) |
| 843 | 842 |
| 844 return newnode, bool(snode) | 843 return newnode, bool(snode) |