equal
deleted
inserted
replaced
605 |
605 |
606 name = getshelvename(repo, parent, opts) |
606 name = getshelvename(repo, parent, opts) |
607 activebookmark = _backupactivebookmark(repo) |
607 activebookmark = _backupactivebookmark(repo) |
608 extra = {b'internal': b'shelve'} |
608 extra = {b'internal': b'shelve'} |
609 if includeunknown: |
609 if includeunknown: |
610 _includeunknownfiles(repo, pats, opts, extra) |
610 with repo.dirstate.changing_files(repo): |
|
611 _includeunknownfiles(repo, pats, opts, extra) |
611 |
612 |
612 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): |
613 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): |
613 # In non-bare shelve we don't store newly created branch |
614 # In non-bare shelve we don't store newly created branch |
614 # at bundled commit |
615 # at bundled commit |
615 repo.dirstate.setbranch(repo[b'.'].branch()) |
616 repo.dirstate.setbranch(repo[b'.'].branch()) |