equal
deleted
inserted
replaced
461 includeunknown = (opts.get('unknown', False) and |
461 includeunknown = (opts.get('unknown', False) and |
462 not opts.get('addremove', False)) |
462 not opts.get('addremove', False)) |
463 |
463 |
464 name = getshelvename(repo, parent, opts) |
464 name = getshelvename(repo, parent, opts) |
465 activebookmark = _backupactivebookmark(repo) |
465 activebookmark = _backupactivebookmark(repo) |
466 extra = {} |
466 extra = {'internal': 'shelve'} |
467 if includeunknown: |
467 if includeunknown: |
468 _includeunknownfiles(repo, pats, opts, extra) |
468 _includeunknownfiles(repo, pats, opts, extra) |
469 |
469 |
470 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): |
470 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): |
471 # In non-bare shelve we don't store newly created branch |
471 # In non-bare shelve we don't store newly created branch |
749 addedbefore = frozenset(s.added) |
749 addedbefore = frozenset(s.added) |
750 if not (s.modified or s.added or s.removed): |
750 if not (s.modified or s.added or s.removed): |
751 return tmpwctx, addedbefore |
751 return tmpwctx, addedbefore |
752 ui.status(_("temporarily committing pending changes " |
752 ui.status(_("temporarily committing pending changes " |
753 "(restore with 'hg unshelve --abort')\n")) |
753 "(restore with 'hg unshelve --abort')\n")) |
754 commitfunc = getcommitfunc(extra=None, interactive=False, |
754 extra = {'internal': 'shelve'} |
|
755 commitfunc = getcommitfunc(extra=extra, interactive=False, |
755 editor=False) |
756 editor=False) |
756 tempopts = {} |
757 tempopts = {} |
757 tempopts['message'] = "pending changes temporary commit" |
758 tempopts['message'] = "pending changes temporary commit" |
758 tempopts['date'] = opts.get('date') |
759 tempopts['date'] = opts.get('date') |
759 with ui.configoverride({('ui', 'quiet'): True}): |
760 with ui.configoverride({('ui', 'quiet'): True}): |