| hg-reviewers |
This is similar to what the narrow extension does. The main
difference is we don't have an explicit --narrow argument to opt
into narrow: we assume that --include or --exclude translate to
a narrow store and working directory.
The added test demonstrates that extra files are being transferred
and the clone isn't yet narrow. That's because exchangev2 doesn't
yet support narrow.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/fastcheckout.py (38 lines) | |||
| M | tests/test-fastcheckout.t (53 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Sep 13 2018, 9:38 PM |
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| cmdutil, | cmdutil, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| hg, | hg, | ||||
| localrepo, | |||||
| merge as mergemod, | merge as mergemod, | ||||
| narrowspec, | |||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repository, | |||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| ) | ) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| cmdtable = {} | cmdtable = {} | ||||
| command = registrar.command(cmdtable) | command = registrar.command(cmdtable) | ||||
| @command( | @command( | ||||
| 'fastcheckout', | 'fastcheckout', | ||||
| [ | [ | ||||
| ('C', 'clean', False, _('discard uncommitted changes (no backup)')), | ('C', 'clean', False, _('discard uncommitted changes (no backup)')), | ||||
| ('', 'include', [], _('pattern of files to include in checkout')), | |||||
| ('', 'exclude', [], _('pattern of files to not include in checkout')), | |||||
| ('', 'purge', False, | ('', 'purge', False, | ||||
| _('purge the working directory of untracked files'), | _('purge the working directory of untracked files'), | ||||
| ), | ), | ||||
| ('', 'purge-all', False, | ('', 'purge-all', False, | ||||
| _('purge the working directory of untracked and ignored files')), | _('purge the working directory of untracked and ignored files')), | ||||
| ], | ], | ||||
| _('SOURCE REV [DEST]'), | _('SOURCE REV [DEST]'), | ||||
| norepo=True) | norepo=True) | ||||
| ``--clean`` will discard uncommitted changes and the working directory | ``--clean`` will discard uncommitted changes and the working directory | ||||
| state will match the state of files in the requested revision. | state will match the state of files in the requested revision. | ||||
| ``--purge`` can be used to purge the working directory of untracked | ``--purge`` can be used to purge the working directory of untracked | ||||
| files, similar to running :hg:`purge`. ``--purge-all`` can be used to | files, similar to running :hg:`purge`. ``--purge-all`` can be used to | ||||
| purge the working directory of both untracked and ignored files, similar | purge the working directory of both untracked and ignored files, similar | ||||
| to running :hg:`purge --all`. | to running :hg:`purge --all`. | ||||
| ``include`` and ``exclude`` define patterns of paths to include and | |||||
| exclude in the working directory, respectively. A path is included in | |||||
| the working directory if it matches a pattern in ``include`` but not | |||||
| ``exclude``. Only ``path`` and ``rootfilesin`` patterns are supported. | |||||
| If the pattern doesn't contain a ``:`` / prefix, it is assumed to be a | |||||
| ``path`` pattern. If ``include`` is not provided, it defaults to all | |||||
| paths. | |||||
| The source repository must support modern versions of the Mercurial | The source repository must support modern versions of the Mercurial | ||||
| wire protocol. | wire protocol. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if dest: | if dest: | ||||
| dest = ui.expandpath(dest) | dest = ui.expandpath(dest) | ||||
| else: | else: | ||||
| dest = hg.defaultdest(source) | dest = hg.defaultdest(source) | ||||
| if dest: | if dest: | ||||
| ui.status(_('destination directory: %s\n') % dest) | ui.status(_('destination directory: %s\n') % dest) | ||||
| dest = util.urllocalpath(dest) | dest = util.urllocalpath(dest) | ||||
| if not dest: | if not dest: | ||||
| raise error.Abort(_('empty destination path is not valid')) | raise error.Abort(_('empty destination path is not valid')) | ||||
| destvfs = vfsmod.vfs(dest, expandpath=True) | destvfs = vfsmod.vfs(dest, expandpath=True) | ||||
| includepats = narrowspec.parsepatterns(opts['include']) | |||||
| excludepats = narrowspec.parsepatterns(opts['exclude']) | |||||
| overrides = { | overrides = { | ||||
| ('experimental', 'httppeer.advertise-v2'): True, | ('experimental', 'httppeer.advertise-v2'): True, | ||||
| } | } | ||||
| with ui.configoverride(overrides): | with ui.configoverride(overrides): | ||||
| return dofastcheckout(ui, source, rev, destvfs, | return dofastcheckout(ui, source, rev, destvfs, | ||||
| purge=opts.get('purge', False), | purge=opts.get('purge', False), | ||||
| purgeall=opts.get('purgeall', False), | purgeall=opts.get('purgeall', False), | ||||
| clean=opts.get('clean', False)) | clean=opts.get('clean', False), | ||||
| includepats=includepats, | |||||
| excludepats=excludepats) | |||||
| def getpeer(ui, source): | def getpeer(ui, source): | ||||
| peer = hg.peer(ui, {}, source) | peer = hg.peer(ui, {}, source) | ||||
| if not peer.capable('command-changesetdata'): | if not peer.capable('command-changesetdata'): | ||||
| raise error.Abort(_('source repository does not support modern wire ' | raise error.Abort(_('source repository does not support modern wire ' | ||||
| 'protocol features needed for fast checkouts')) | 'protocol features needed for fast checkouts')) | ||||
| return peer | return peer | ||||
| def dofastcheckout(ui, source, rev, destvfs, purge=False, purgeall=False, | def dofastcheckout(ui, source, rev, destvfs, purge=False, purgeall=False, | ||||
| clean=False): | clean=False, includepats=None, excludepats=None): | ||||
| # Empty sets need to be None to force a full clone/checkout. | |||||
| if not includepats and not excludepats: | |||||
| includepats, excludepats = None, None | |||||
| createdrepo = False | createdrepo = False | ||||
| peer = None | peer = None | ||||
| if not destvfs.lexists(): | if not destvfs.lexists(): | ||||
| # TODO perform partial clone here. | # TODO perform partial clone here. | ||||
| peer = getpeer(ui, source) | peer = getpeer(ui, source) | ||||
| ui.write(_('fetching data from %s\n') % peer.url()) | ui.write(_('fetching data from %s\n') % peer.url()) | ||||
| hg.clone(ui, {}, peer, destvfs.base, pull=True, | hg.clone(ui, {}, peer, destvfs.base, pull=True, | ||||
| update=False, revs=[rev]) | update=False, revs=[rev], | ||||
| storeincludepats=includepats, storeexcludepats=excludepats) | |||||
| createdrepo = True | createdrepo = True | ||||
| repo = hg.repository(ui, destvfs.base) | repo = hg.repository(ui, destvfs.base) | ||||
| try: | try: | ||||
| scmutil.revsingle(repo, rev) | scmutil.revsingle(repo, rev) | ||||
| haverev = True | haverev = True | ||||
| except error.RepoLookupError: | except error.RepoLookupError: | ||||
| haverev = False | haverev = False | ||||
| if not haverev: | if not haverev: | ||||
| if not peer: | if not peer: | ||||
| peer = getpeer(ui, source) | peer = getpeer(ui, source) | ||||
| ui.write(_('fetching data from %s\n') % peer.url()) | ui.write(_('fetching data from %s\n') % peer.url()) | ||||
| with peer.commandexecutor() as e: | with peer.commandexecutor() as e: | ||||
| pullrev = e.callcommand('lookup', {'key': rev}).result() | pullrev = e.callcommand('lookup', {'key': rev}).result() | ||||
| exchange.pull(repo, peer, heads=[pullrev]) | exchange.pull(repo, peer, heads=[pullrev], | ||||
| includepats=includepats, excludepats=excludepats) | |||||
| if not createdrepo and (purge or purgeall): | if not createdrepo and (purge or purgeall): | ||||
| ui.write(_('purging working directory\n')) | ui.write(_('purging working directory\n')) | ||||
| matcher = scmutil.match(repo[None]) | matcher = scmutil.match(repo[None]) | ||||
| purgecount = len(mergemod.purge(repo, matcher, ignored=purgeall, | purgecount = len(mergemod.purge(repo, matcher, ignored=purgeall, | ||||
| abortonerror=True)) | abortonerror=True)) | ||||
| ui.write(_('purged %d items from working directory\n') % purgecount) | ui.write(_('purged %d items from working directory\n') % purgecount) | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| cmdutil.clearunfinished(repo) | cmdutil.clearunfinished(repo) | ||||
| ctx = scmutil.revsingle(repo, rev, rev) | ctx = scmutil.revsingle(repo, rev, rev) | ||||
| ui.write(_('updating to %s\n') % ctx) | ui.write(_('updating to %s\n') % ctx) | ||||
| ret = hg.updatetotally(ui, repo, ctx.rev(), ctx.rev(), | ret = hg.updatetotally(ui, repo, ctx.rev(), ctx.rev(), | ||||
| clean=clean, updatecheck='none') | clean=clean, updatecheck='none') | ||||
| return ret | return ret | ||||
| def featuresetup(ui, features): | |||||
| features.add(repository.NARROW_REQUIREMENT) | |||||
| def extsetup(ui): | |||||
| localrepo.featuresetupfuncs.add(featuresetup) | |||||
| $ echo modified > dest0/dir1/py3.py | $ echo modified > dest0/dir1/py3.py | ||||
| $ hg fastcheckout --clean http://localhost:$HGPORT 6a9937924 dest0 | $ hg fastcheckout --clean http://localhost:$HGPORT 6a9937924 dest0 | ||||
| updating to 6a9937924083 | updating to 6a9937924083 | ||||
| 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ cat dest0/dir1/py3.py | $ cat dest0/dir1/py3.py | ||||
| 0 | 0 | ||||
| Bad value to --include results in error | |||||
| $ hg fastcheckout --include glob:* http://localhost:$HGPORT 6a9937924 badinclude | |||||
| abort: invalid prefix on narrow pattern: glob:* | |||||
| (narrow patterns must begin with one of the following: path:, rootfilesin:) | |||||
| [255] | |||||
| $ hg fastcheckout --include glob:* http://localhost:$HGPORT 6a9937924 dest0 | |||||
| abort: invalid prefix on narrow pattern: glob:* | |||||
| (narrow patterns must begin with one of the following: path:, rootfilesin:) | |||||
| [255] | |||||
| Bad value to --exclude results in error | |||||
| $ hg fastcheckout --exclude glob:* http://localhost:$HGPORT 6a9937924 badexclude | |||||
| abort: invalid prefix on narrow pattern: glob:* | |||||
| (narrow patterns must begin with one of the following: path:, rootfilesin:) | |||||
| [255] | |||||
| $ hg fastcheckout --exclude glob:* http://localhost:$HGPORT 6a9937924 dest0 | |||||
| abort: invalid prefix on narrow pattern: glob:* | |||||
| (narrow patterns must begin with one of the following: path:, rootfilesin:) | |||||
| [255] | |||||
| Narrow file clone works | |||||
| $ hg fastcheckout --include path:dir0 http://localhost:$HGPORT 15c769176a narrow-dest0 | |||||
| fetching data from http://localhost:$HGPORT | |||||
| new changesets 6a9937924083:15c769176aab | |||||
| updating to 15c769176aab | |||||
| 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| #if reporevlogstore | |||||
| $ find narrow-dest0/.hg/store -type f | sort | |||||
| narrow-dest0/.hg/store/00changelog.i | |||||
| narrow-dest0/.hg/store/00manifest.i | |||||
| narrow-dest0/.hg/store/data/dir0/child0/c.c.i | |||||
| narrow-dest0/.hg/store/data/dir0/child0/py0.py.i | |||||
| narrow-dest0/.hg/store/data/dir0/child1/py1.py.i | |||||
| narrow-dest0/.hg/store/data/dir0/child1/py2.py.i | |||||
| narrow-dest0/.hg/store/data/dir0/file0.txt.i | |||||
| narrow-dest0/.hg/store/data/dir1/file1.txt.i | |||||
| narrow-dest0/.hg/store/data/dir1/file2.txt.i | |||||
| narrow-dest0/.hg/store/data/dir1/py3.py.i | |||||
| narrow-dest0/.hg/store/data/foo.i | |||||
| narrow-dest0/.hg/store/fncache | |||||
| narrow-dest0/.hg/store/narrowspec | |||||
| narrow-dest0/.hg/store/phaseroots | |||||
| narrow-dest0/.hg/store/undo | |||||
| narrow-dest0/.hg/store/undo.backupfiles | |||||
| narrow-dest0/.hg/store/undo.phaseroots | |||||
| #endif | |||||
| Should not have any server-side errors | Should not have any server-side errors | ||||
| $ cat error.log | $ cat error.log | ||||