Mercurial > hg
changeset 42012:9b78bbb76111
shelve: refactor _shelvecreatedcommit's match object into calling site
We might need to use this match object again to move the dirstate in
case the user requested to `--keep` the changes.
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Fri, 22 Mar 2019 13:03:26 -0400 |
| parents | 22278dae287c |
| children | 50d5e64ec561 |
| files | hgext/shelve.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/shelve.py Fri Mar 22 11:24:23 2019 -0400 +++ b/hgext/shelve.py Fri Mar 22 13:03:26 2019 -0400 @@ -420,14 +420,11 @@ else: ui.status(_("nothing changed\n")) -def _shelvecreatedcommit(repo, node, name): +def _shelvecreatedcommit(repo, node, name, match): info = {'node': nodemod.hex(node)} shelvedfile(repo, name, 'shelve').writeinfo(info) bases = list(mutableancestors(repo[node])) shelvedfile(repo, name, 'hg').writebundle(bases, node) - # Create a matcher so that prefetch doesn't attempt to fetch the entire - # repository pointlessly. - match = scmutil.matchfiles(repo, repo[node].files()) with shelvedfile(repo, name, patchextension).opener('wb') as fp: cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True), match=match) @@ -501,7 +498,10 @@ _nothingtoshelvemessaging(ui, repo, pats, opts) return 1 - _shelvecreatedcommit(repo, node, name) + # Create a matcher so that prefetch doesn't attempt to fetch + # the entire repository pointlessly + match = scmutil.matchfiles(repo, repo[node].files()) + _shelvecreatedcommit(repo, node, name, match) if ui.formatted(): desc = stringutil.ellipsis(desc, ui.termwidth())