| quark |
| Restricted Project |
shellquote() is no longer in the util module since 70f45f28c04e (util:
drop deprecated forwarding to procutil (API), 2018-05-10).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | remotefilelog/repack.py (3 lines) | |||
| M | remotefilelog/shallowrepo.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| util, | util, | ||||
| vfs, | vfs, | ||||
| ) | ) | ||||
| from mercurial.node import ( | from mercurial.node import ( | ||||
| nullid, | nullid, | ||||
| short, | short, | ||||
| ) | ) | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial.utils import procutil | |||||
| from . import ( | from . import ( | ||||
| constants, | constants, | ||||
| contentstore, | contentstore, | ||||
| datapack, | datapack, | ||||
| historypack, | historypack, | ||||
| metadatastore, | metadatastore, | ||||
| shallowutil, | shallowutil, | ||||
| ) | ) | ||||
| def backgroundrepack(repo, incremental=True, packsonly=False): | def backgroundrepack(repo, incremental=True, packsonly=False): | ||||
| cmd = [_hgexecutable(), '-R', repo.origroot, 'repack'] | cmd = [_hgexecutable(), '-R', repo.origroot, 'repack'] | ||||
| msg = _("(running background repack)\n") | msg = _("(running background repack)\n") | ||||
| if incremental: | if incremental: | ||||
| cmd.append('--incremental') | cmd.append('--incremental') | ||||
| msg = _("(running background incremental repack)\n") | msg = _("(running background incremental repack)\n") | ||||
| if packsonly: | if packsonly: | ||||
| cmd.append('--packsonly') | cmd.append('--packsonly') | ||||
| cmd = ' '.join(map(util.shellquote, cmd)) | cmd = ' '.join(map(procutil.shellquote, cmd)) | ||||
| repo.ui.warn(msg) | repo.ui.warn(msg) | ||||
| runshellcommand(cmd, os.environ) | runshellcommand(cmd, os.environ) | ||||
| def fullrepack(repo, options=None): | def fullrepack(repo, options=None): | ||||
| """If ``packsonly`` is True, stores creating only loose objects are skipped. | """If ``packsonly`` is True, stores creating only loose objects are skipped. | ||||
| """ | """ | ||||
| if util.safehasattr(repo, 'shareddatastores'): | if util.safehasattr(repo, 'shareddatastores'): | ||||
| # shallowrepo.py - shallow repository that uses remote filelogs | # shallowrepo.py - shallow repository that uses remote filelogs | ||||
| # | # | ||||
| # Copyright 2013 Facebook, Inc. | # Copyright 2013 Facebook, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from hgext3rd.extutil import runshellcommand | from hgext3rd.extutil import runshellcommand | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial.node import hex, nullid, nullrev | from mercurial.node import hex, nullid, nullrev | ||||
| from mercurial import error, localrepo, util, match, scmutil | from mercurial import error, localrepo, util, match, scmutil | ||||
| from mercurial.utils import procutil | |||||
| from . import ( | from . import ( | ||||
| connectionpool, | connectionpool, | ||||
| fileserverclient, | fileserverclient, | ||||
| remotefilelog, | remotefilelog, | ||||
| remotefilectx, | remotefilectx, | ||||
| ) | ) | ||||
| import constants, shallowutil | import constants, shallowutil | ||||
| from contentstore import remotefilelogcontentstore, unioncontentstore | from contentstore import remotefilelogcontentstore, unioncontentstore | ||||
| opts=None): | opts=None): | ||||
| """Runs prefetch in background with optional repack | """Runs prefetch in background with optional repack | ||||
| """ | """ | ||||
| cmd = [_hgexecutable(), '-R', repo.origroot, 'prefetch'] | cmd = [_hgexecutable(), '-R', repo.origroot, 'prefetch'] | ||||
| if repack: | if repack: | ||||
| cmd.append('--repack') | cmd.append('--repack') | ||||
| if revs: | if revs: | ||||
| cmd += ['-r', revs] | cmd += ['-r', revs] | ||||
| cmd = ' '.join(map(util.shellquote, cmd)) | cmd = ' '.join(map(procutil.shellquote, cmd)) | ||||
| runshellcommand(cmd, os.environ) | runshellcommand(cmd, os.environ) | ||||
| def prefetch(self, revs, base=None, pats=None, opts=None): | def prefetch(self, revs, base=None, pats=None, opts=None): | ||||
| """Prefetches all the necessary file revisions for the given revs | """Prefetches all the necessary file revisions for the given revs | ||||
| Optionally runs repack in background | Optionally runs repack in background | ||||
| """ | """ | ||||
| with repo._lock(repo.svfs, 'prefetchlock', True, None, None, | with repo._lock(repo.svfs, 'prefetchlock', True, None, None, | ||||