facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

shelve: move unknown files handling to a separate function

Browse Source 
This change has nothing to do with future obsshelve introduction,
it is done just for readability purposes.
This commit is contained in:
Kostia Balytskyi 2016-11-10 03:20:28 -08:00
parent 0796e063c2
commit 082c8bc2de
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hgext/shelve.py
View File

@ -335,6 +335,13 @@ def _shelvecreatedcommit(repo, node, name):
fp=shelvedfile(repo, name, 'patch').opener('wb'),
opts=mdiff.diffopts(git=True))
def _includeunknownfiles(repo, pats, opts, extra):
s = repo.status(match=scmutil.match(repo[None], pats, opts),
unknown=True)
if s.unknown:
extra['shelve_unknown'] = '\0'.join(s.unknown)
repo[None].add(s.unknown)
def _docreatecmd(ui, repo, pats, opts):
wctx = repo[None]
parents = wctx.parents()
@ -364,13 +371,9 @@ def _docreatecmd(ui, repo, pats, opts):
not opts.get('addremove', False))
name = getshelvename(repo, parent, opts)
extra={}
extra = {}
if includeunknown:
s = repo.status(match=scmutil.match(repo[None], pats, opts),
unknown=True)
if s.unknown:
extra['shelve_unknown'] = '\0'.join(s.unknown)
repo[None].add(s.unknown)
_includeunknownfiles(repo, pats, opts, extra)
if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
# In non-bare shelve we don't store newly created branch