##// END OF EJS Templates
log: add support for bookmarks...
log: add support for bookmarks A bookmark can already be pushed with 'hg push origin -B topic-foo'. The pull command also supports bookmarks. This patch adds support for bookmarks using the '_opt2logrevset' code path. The list of changesets for a bookmark can now be obtained simply with: 'hg log -B topic-foo'. Reviewed-by: Elenie Godzaridis <arangradient@gmail.com> Differential Revision: https://phab.mercurial-scm.org/D8973

File last commit:

r45932:77b8588d default
r46123:2517df77 default
Show More
narrowcommands.py
659 lines | 22.6 KiB | text/x-python | PythonLexer
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # narrowcommands.py - command modifications for narrowhg extension
#
# Copyright 2017 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import itertools
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283 import os
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
from mercurial.i18n import _
from mercurial import (
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 bundle2,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 cmdutil,
commands,
discovery,
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471 encoding,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 error,
exchange,
extensions,
hg,
Gregory Szorc
narrowspec: move module into core...
r36178 narrowspec,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 node,
utils: move the `dirs` definition in pathutil (API)...
r43923 pathutil,
Augie Fackler
narrowcommands: use pycompat.{bytes,str}kwargs...
r36172 pycompat,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 registrar,
repair,
repoview,
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 requirements,
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283 sparse,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 util,
Pulkit Goyal
wireprotoserver: move narrow capabilities to wireprototypes.py...
r40110 wireprototypes,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 )
table = {}
command = registrar.command(table)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def setup():
"""Wraps user-facing mercurial commands with narrow-aware versions."""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 entry = extensions.wrapcommand(commands.table, b'clone', clonenarrowcmd)
Augie Fackler
formatting: blacken the codebase...
r43346 entry[1].append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'', b'narrow', None, _(b"create a narrow clone of select files"))
Augie Fackler
formatting: blacken the codebase...
r43346 )
entry[1].append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (
b'',
b'depth',
b'',
_(b"limit the history fetched by distance from heads"),
)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 entry[1].append((b'', b'narrowspec', b'', _(b"read narrowspecs from file")))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # TODO(durin42): unify sparse/narrow --include/--exclude logic a bit
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'sparse' not in extensions.enabled():
Augie Fackler
formatting: blacken the codebase...
r43346 entry[1].append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'', b'include', [], _(b"specifically fetch this file/directory"))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 entry[1].append(
Augie Fackler
formatting: blacken the codebase...
r43346 (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'',
b'exclude',
Augie Fackler
formatting: blacken the codebase...
r43346 [],
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"do not fetch this file/directory, even if included"),
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 entry = extensions.wrapcommand(commands.table, b'pull', pullnarrowcmd)
Augie Fackler
formatting: blacken the codebase...
r43346 entry[1].append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (
b'',
b'depth',
b'',
_(b"limit the history fetched by distance from heads"),
)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapcommand(commands.table, b'archive', archivenarrowcmd)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def clonenarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps clone command, so 'hg clone' first wraps localrepo.clone()."""
Augie Fackler
narrowcommands: use pycompat.{bytes,str}kwargs...
r36172 opts = pycompat.byteskwargs(opts)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 wrappedextraprepare = util.nullcontextmanager()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 narrowspecfile = opts[b'narrowspec']
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283
if narrowspecfile:
Matt Harbison
py3: rename pycompat.getcwd() to encoding.getcwd() (API)...
r39843 filepath = os.path.join(encoding.getcwd(), narrowspecfile)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b"reading narrowspec from '%s'\n") % filepath)
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283 try:
Pulkit Goyal
narrow: use util.readfile() and improve error message using --narrowspec...
r39501 fdata = util.readfile(filepath)
except IOError as inst:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"cannot read narrowspecs from '%s': %s")
Augie Fackler
formatting: blacken the codebase...
r43346 % (filepath, encoding.strtolocal(inst.strerror))
)
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 includes, excludes, profiles = sparse.parseconfig(ui, fdata, b'narrow')
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283 if profiles:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"cannot specify other files using '%include' in"
b" narrowspec"
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283
Gregory Szorc
narrow: validate spec files are well-formed during clone (BC)...
r39577 narrowspec.validatepatterns(includes)
narrowspec.validatepatterns(excludes)
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283 # narrowspec is passed so we should assume that user wants narrow clone
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 opts[b'narrow'] = True
opts[b'include'].extend(includes)
opts[b'exclude'].extend(excludes)
Pulkit Goyal
narrow: add a --narrowspec flag to clone command...
r39283
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if opts[b'narrow']:
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if opts.get(b'depth'):
kwargs[b'depth'] = opts[b'depth']
Augie Fackler
formatting: blacken the codebase...
r43346
wrappedextraprepare = extensions.wrappedfunction(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Gregory Szorc
narrow: don't wrap exchange.pull() during clone...
r39590 with wrappedextraprepare:
Augie Fackler
narrowcommands: use pycompat.{bytes,str}kwargs...
r36172 return orig(ui, repo, *args, **pycompat.strkwargs(opts))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def pullnarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps pull command to allow modifying narrow spec."""
wrappedextraprepare = util.nullcontextmanager()
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 if requirements.NARROW_REQUIREMENT in repo.requirements:
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs)
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if opts.get('depth'):
kwargs[b'depth'] = opts['depth']
Augie Fackler
formatting: blacken the codebase...
r43346
wrappedextraprepare = extensions.wrappedfunction(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
with wrappedextraprepare:
return orig(ui, repo, *args, **opts)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def archivenarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps archive command to narrow the default includes."""
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 if requirements.NARROW_REQUIREMENT in repo.requirements:
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 repo_includes, repo_excludes = repo.narrowpats
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 includes = set(opts.get('include', []))
excludes = set(opts.get('exclude', []))
Augie Fackler
narrow: make restrictpatterns a little more idiomatic...
r36117 includes, excludes, unused_invalid = narrowspec.restrictpatterns(
Augie Fackler
formatting: blacken the codebase...
r43346 includes, excludes, repo_includes, repo_excludes
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if includes:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 opts['include'] = includes
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if excludes:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 opts['exclude'] = excludes
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return orig(ui, repo, *args, **opts)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def pullbundle2extraprepare(orig, pullop, kwargs):
repo = pullop.repo
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 if requirements.NARROW_REQUIREMENT not in repo.requirements:
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return orig(pullop, kwargs)
Pulkit Goyal
wireprotoserver: move narrow capabilities to wireprototypes.py...
r40110 if wireprototypes.NARROWCAP not in pullop.remote.capabilities():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"server does not support narrow clones"))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 orig(pullop, kwargs)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'narrow'] = True
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 include, exclude = repo.narrowpats
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'oldincludepats'] = include
kwargs[b'oldexcludepats'] = exclude
Pulkit Goyal
narrow: only send includepats and excludepats if they are not empty...
r40528 if include:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'includepats'] = include
Pulkit Goyal
narrow: only send includepats and excludepats if they are not empty...
r40528 if exclude:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'excludepats'] = exclude
Pulkit Goyal
narrow: build the known set of nodes only when ellipses is enabled...
r39560 # calculate known nodes only in ellipses cases because in non-ellipses cases
# we have all the nodes
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 if wireprototypes.ELLIPSESCAP1 in pullop.remote.capabilities():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'known'] = [
Augie Fackler
formatting: blacken the codebase...
r43346 node.hex(ctx.node())
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for ctx in repo.set(b'::%ln', pullop.common)
Augie Fackler
formatting: blacken the codebase...
r43346 if ctx.node() != node.nullid
]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if not kwargs[b'known']:
Pulkit Goyal
narrow: build the known set of nodes only when ellipses is enabled...
r39560 # Mercurial serializes an empty list as '' and deserializes it as
# [''], so delete it instead to avoid handling the empty string on
# the server.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 del kwargs[b'known']
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
extensions.wrapfunction(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346 def _narrow(
ui,
repo,
remote,
commoninc,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
force,
):
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 oldmatch = narrowspec.match(repo.root, oldincludes, oldexcludes)
newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
# This is essentially doing "hg outgoing" to find all local-only
# commits. We will then check that the local-only commits don't
# have any changes to files that will be untracked.
unfi = repo.unfiltered()
Augie Fackler
formatting: blacken the codebase...
r43346 outgoing = discovery.findcommonoutgoing(unfi, remote, commoninc=commoninc)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b'looking for local changes to affected paths\n'))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 localnodes = []
for n in itertools.chain(outgoing.missing, outgoing.excluded):
if any(oldmatch(f) and not newmatch(f) for f in unfi[n].files()):
localnodes.append(n)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 revstostrip = unfi.revs(b'descendants(%ln)', localnodes)
hiddenrevs = repoview.filterrevs(repo, b'visible')
Augie Fackler
formatting: blacken the codebase...
r43346 visibletostrip = list(
repo.changelog.node(r) for r in (revstostrip - hiddenrevs)
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if visibletostrip:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.status(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'The following changeset(s) or their ancestors have '
b'local changes not on the remote:\n'
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 maxnodes = 10
if ui.verbose or len(visibletostrip) <= maxnodes:
for n in visibletostrip:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(b'%s\n' % node.short(n))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 else:
for n in visibletostrip[:maxnodes]:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(b'%s\n' % node.short(n))
Augie Fackler
formatting: blacken the codebase...
r43346 ui.status(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'...and %d more, use --verbose to list all\n')
Augie Fackler
formatting: blacken the codebase...
r43346 % (len(visibletostrip) - maxnodes)
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if not force:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'local changes found'),
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 hint=_(b'use --force-delete-local-changes to ignore'),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Kyle Lippincott
procutil: correct spelling of uninterruptable -> uninterruptible...
r41106 with ui.uninterruptible():
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 if revstostrip:
tostrip = [unfi.changelog.node(r) for r in revstostrip]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo[b'.'].node() in tostrip:
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 # stripping working copy, so move to a different commit first
Augie Fackler
formatting: blacken the codebase...
r43346 urev = max(
repo.revs(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'(::%n) - %ln + null',
repo[b'.'].node(),
visibletostrip,
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 hg.clean(repo, urev)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 overrides = {(b'devel', b'strip-obsmarkers'): False}
with ui.configoverride(overrides, b'narrow'):
repair.strip(ui, unfi, tostrip, topic=b'narrow')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 todelete = []
for f, f2, size in repo.store.datafiles():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if f.startswith(b'data/'):
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 file = f[5:-2]
if not newmatch(file):
todelete.append(f)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif f.startswith(b'meta/'):
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 dir = f[5:-13]
utils: move the `dirs` definition in pathutil (API)...
r43923 dirs = sorted(pathutil.dirs({dir})) + [dir]
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 include = True
for d in dirs:
visit = newmatch.visitdir(d)
if not visit:
include = False
break
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if visit == b'all':
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 break
if not include:
todelete.append(f)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 repo.destroying()
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with repo.transaction(b'narrowing'):
Martin von Zweigbergk
narrow: when narrowing, write new narrowspec before removing revlogs...
r41057 # Update narrowspec before removing revlogs, so repo won't be
# corrupt in case of crash
repo.setnarrowpats(newincludes, newexcludes)
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 for f in todelete:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b'deleting %s\n') % f)
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 util.unlinkpath(repo.svfs.join(f))
repo.store.markremoved(f)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Martin von Zweigbergk
narrow: reuse narrowspec.updateworkingcopy() when narrowing...
r41274 narrowspec.updateworkingcopy(repo, assumeclean=True)
narrowspec.copytoworkingcopy(repo)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
narrow: mark the critical chunks of narrowing/widening as unsafe...
r38547 repo.destroyed()
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
def _widen(
ui,
repo,
remote,
commoninc,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
):
Pulkit Goyal
narrow: don't do the dirstate dance if ellipses is not enabled...
r39999 # for now we assume that if a server has ellipses enabled, we will be
# exchanging ellipses nodes. In future we should add ellipses as a client
# side requirement (maybe) to distinguish a client is shallow or not and
# then send that information to server whether we want ellipses or not.
# Theoretically a non-ellipses repo should be able to use narrow
# functionality from an ellipses enabled server
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605 remotecap = remote.capabilities()
Augie Fackler
formatting: blacken the codebase...
r43346 ellipsesremote = any(
cap in remotecap for cap in wireprototypes.SUPPORTED_ELLIPSESCAP
)
Pulkit Goyal
narrow: use narrow_widen wireproto command to widen in case of ellipses...
r42605
# check whether we are talking to a server which supports old version of
# ellipses capabilities
Augie Fackler
formatting: blacken the codebase...
r43346 isoldellipses = (
ellipsesremote
and wireprototypes.ELLIPSESCAP1 in remotecap
and wireprototypes.ELLIPSESCAP not in remotecap
)
Pulkit Goyal
narrow: don't do the dirstate dance if ellipses is not enabled...
r39999
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs)
# The old{in,ex}cludepats have already been set by orig()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 kwargs[b'includepats'] = newincludes
kwargs[b'excludepats'] = newexcludes
Augie Fackler
formatting: blacken the codebase...
r43346
wrappedextraprepare = extensions.wrappedfunction(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
# define a function that narrowbundle2 can call after creating the
# backup bundle, but before applying the bundle from the server
def setnewnarrowpats():
repo.setnarrowpats(newincludes, newexcludes)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 repo.setnewnarrowpats = setnewnarrowpats
Pulkit Goyal
narrow: don't send the changelog information when widening without ellipses...
r39709 # silence the devel-warning of applying an empty changegroup
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 overrides = {(b'devel', b'all-warnings'): False}
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Pulkit Goyal
narrow: refactor code around widening complicated by previous patch...
r42606 common = commoninc[0]
Kyle Lippincott
procutil: correct spelling of uninterruptable -> uninterruptible...
r41106 with ui.uninterruptible():
Pulkit Goyal
narrow: don't do the dirstate dance if ellipses is not enabled...
r39999 if ellipsesremote:
ds = repo.dirstate
p1, p2 = ds.p1(), ds.p2()
with ds.parentchange():
ds.setparents(node.nullid, node.nullid)
Pulkit Goyal
narrow: refactor code around widening complicated by previous patch...
r42606 if isoldellipses:
Augie Fackler
cleanup: prefer nested context managers to \-continuations...
r41926 with wrappedextraprepare:
Pulkit Goyal
narrow: refactor code around widening complicated by previous patch...
r42606 exchange.pull(repo, remote, heads=common)
Pulkit Goyal
narrow: don't do the dirstate dance if ellipses is not enabled...
r39999 else:
Pulkit Goyal
narrow: refactor code around widening complicated by previous patch...
r42606 known = []
if ellipsesremote:
Augie Fackler
formatting: blacken the codebase...
r43346 known = [
ctx.node()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for ctx in repo.set(b'::%ln', common)
Augie Fackler
formatting: blacken the codebase...
r43346 if ctx.node() != node.nullid
]
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106 with remote.commandexecutor() as e:
Augie Fackler
formatting: blacken the codebase...
r43346 bundle = e.callcommand(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'narrow_widen',
Augie Fackler
formatting: blacken the codebase...
r43346 {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'oldincludes': oldincludes,
b'oldexcludes': oldexcludes,
b'newincludes': newincludes,
b'newexcludes': newexcludes,
b'cgversion': b'03',
b'commonheads': common,
b'known': known,
b'ellipses': ellipsesremote,
Augie Fackler
formatting: blacken the codebase...
r43346 },
).result()
Pulkit Goyal
narrow: the first version of narrow_widen wireprotocol command...
r40106
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 trmanager = exchange.transactionmanager(
repo, b'widen', remote.url()
)
with trmanager, repo.ui.configoverride(overrides, b'widen'):
Augie Fackler
formatting: blacken the codebase...
r43346 op = bundle2.bundleoperation(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo, trmanager.transaction, source=b'widen'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Pulkit Goyal
narrow: refactor code around widening complicated by previous patch...
r42606 # TODO: we should catch error.Abort here
bundle2.processbundle(repo, bundle, op=op)
if ellipsesremote:
with ds.parentchange():
ds.setparents(p1, p2)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with repo.transaction(b'widening'):
Martin von Zweigbergk
narrow: reuse narrowspec.updateworkingcopy() when widening...
r41273 repo.setnewnarrowpats()
narrowspec.updateworkingcopy(repo)
narrowspec.copytoworkingcopy(repo)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # TODO(rdamazio): Make new matcher format and update description
Augie Fackler
formatting: blacken the codebase...
r43346 @command(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'tracked',
Augie Fackler
formatting: blacken the codebase...
r43346 [
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'', b'addinclude', [], _(b'new paths to include')),
(b'', b'removeinclude', [], _(b'old paths to no longer include')),
Augie Fackler
formatting: blacken the codebase...
r43346 (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'',
b'auto-remove-includes',
Augie Fackler
formatting: blacken the codebase...
r43346 False,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'automatically choose unused includes to remove'),
Augie Fackler
formatting: blacken the codebase...
r43346 ),
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'', b'addexclude', [], _(b'new paths to exclude')),
(b'', b'import-rules', b'', _(b'import narrowspecs from a file')),
(b'', b'removeexclude', [], _(b'old paths to no longer exclude')),
Augie Fackler
formatting: blacken the codebase...
r43346 (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'',
b'clear',
Augie Fackler
formatting: blacken the codebase...
r43346 False,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'whether to replace the existing narrowspec'),
Augie Fackler
formatting: blacken the codebase...
r43346 ),
(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'',
b'force-delete-local-changes',
Augie Fackler
formatting: blacken the codebase...
r43346 False,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'forces deletion of local changes when narrowing'),
),
(
b'',
b'update-working-copy',
False,
_(b'update working copy when the store has changed'),
Augie Fackler
formatting: blacken the codebase...
r43346 ),
]
+ commands.remoteopts,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'[OPTIONS]... [REMOTE]'),
Augie Fackler
formatting: blacken the codebase...
r43346 inferrepo=True,
Rodrigo Damazio
help: adding a help category to narrow and remotefilelog commands...
r43451 helpcategory=command.CATEGORY_MAINTENANCE,
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def trackedcmd(ui, repo, remotepath=None, *pats, **opts):
"""show or change the current narrowspec
With no argument, shows the current narrowspec entries, one per line. Each
line will be prefixed with 'I' or 'X' for included or excluded patterns,
respectively.
The narrowspec is comprised of expressions to match remote files and/or
directories that should be pulled into your client.
The narrowspec has *include* and *exclude* expressions, with excludes always
trumping includes: that is, if a file matches an exclude expression, it will
be excluded even if it also matches an include expression.
Excluding files that were never included has no effect.
Each included or excluded entry is in the format described by
'hg help patterns'.
The options allow you to add or remove included and excluded expressions.
If --clear is specified, then all previous includes and excludes are DROPPED
and replaced by the new ones specified to --addinclude and --addexclude.
If --clear is specified without any further options, the narrowspec will be
empty and will not match any files.
Pulkit Goyal
tracked: add documentation about `--import-rules` flag...
r42146
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215 If --auto-remove-includes is specified, then those includes that don't match
any files modified by currently visible local commits (those not shared by
the remote) will be added to the set of explicitly specified includes to
remove.
Pulkit Goyal
tracked: add documentation about `--import-rules` flag...
r42146 --import-rules accepts a path to a file containing rules, allowing you to
add --addinclude, --addexclude rules in bulk. Like the other include and
exclude switches, the changes are applied immediately.
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 """
Augie Fackler
narrowcommands: more byteskwargs cleanup...
r36184 opts = pycompat.byteskwargs(opts)
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 if requirements.NARROW_REQUIREMENT not in repo.requirements:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'the tracked command is only supported on '
b'repositories cloned with --narrow'
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
# Before supporting, decide whether it "hg tracked --clear" should mean
# tracking no paths or all paths.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if opts[b'clear']:
raise error.Abort(_(b'the --clear option is not yet supported'))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471 # import rules from a file
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 newrules = opts.get(b'import_rules')
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471 if newrules:
try:
Matt Harbison
py3: rename pycompat.getcwd() to encoding.getcwd() (API)...
r39843 filepath = os.path.join(encoding.getcwd(), newrules)
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471 fdata = util.readfile(filepath)
except IOError as inst:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"cannot read narrowspecs from '%s': %s")
Augie Fackler
formatting: blacken the codebase...
r43346 % (filepath, encoding.strtolocal(inst.strerror))
)
includepats, excludepats, profiles = sparse.parseconfig(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui, fdata, b'narrow'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471 if profiles:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"including other spec files using '%include' "
b"is not supported in narrowspec"
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 opts[b'addinclude'].extend(includepats)
opts[b'addexclude'].extend(excludepats)
Pulkit Goyal
narrow: add '--import-rules' flag to tracked command...
r39471
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 addedincludes = narrowspec.parsepatterns(opts[b'addinclude'])
removedincludes = narrowspec.parsepatterns(opts[b'removeinclude'])
addedexcludes = narrowspec.parsepatterns(opts[b'addexclude'])
removedexcludes = narrowspec.parsepatterns(opts[b'removeexclude'])
autoremoveincludes = opts[b'auto_remove_includes']
Pulkit Goyal
narrow: rework logic to check whether we need to widen and narrow...
r40462
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 update_working_copy = opts[b'update_working_copy']
Augie Fackler
formatting: blacken the codebase...
r43346 only_show = not (
addedincludes
or removedincludes
or addedexcludes
or removedexcludes
or newrules
or autoremoveincludes
or update_working_copy
)
Pulkit Goyal
narrow: rework logic to check whether we need to widen and narrow...
r40462
oldincludes, oldexcludes = repo.narrowpats
# filter the user passed additions and deletions into actual additions and
# deletions of excludes and includes
Martin von Zweigbergk
narrow: replace filtering in list comprehension by set operations...
r40465 addedincludes -= oldincludes
removedincludes &= oldincludes
addedexcludes -= oldexcludes
removedexcludes &= oldexcludes
Pulkit Goyal
narrow: rework logic to check whether we need to widen and narrow...
r40462
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 widening = addedincludes or removedexcludes
narrowing = removedincludes or addedexcludes
# Only print the current narrowspec.
if only_show:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.pager(b'tracked')
fm = ui.formatter(b'narrow', opts)
Pulkit Goyal
narrowcommands: remove an unrequired `repo.narrowpats` call...
r40802 for i in sorted(oldincludes):
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 fm.startitem()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fm.write(b'status', b'%s ', b'I', label=b'narrow.included')
fm.write(b'pat', b'%s\n', i, label=b'narrow.included')
Pulkit Goyal
narrowcommands: remove an unrequired `repo.narrowpats` call...
r40802 for i in sorted(oldexcludes):
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 fm.startitem()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fm.write(b'status', b'%s ', b'X', label=b'narrow.excluded')
fm.write(b'pat', b'%s\n', i, label=b'narrow.excluded')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 fm.end()
return 0
Martin von Zweigbergk
narrow: detect if narrowspec was changed in a different share...
r41072 if update_working_copy:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with repo.wlock(), repo.lock(), repo.transaction(b'narrow-wc'):
Martin von Zweigbergk
narrow: drop explicit dirstate write...
r41212 narrowspec.updateworkingcopy(repo)
Martin von Zweigbergk
narrow: copy store narrowspec to working copy immediately...
r41265 narrowspec.copytoworkingcopy(repo)
Martin von Zweigbergk
narrow: detect if narrowspec was changed in a different share...
r41072 return 0
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215 if not (widening or narrowing or autoremoveincludes):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b"nothing to widen or narrow\n"))
Pulkit Goyal
narrow: rework logic to check whether we need to widen and narrow...
r40462 return 0
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 with repo.wlock(), repo.lock():
cmdutil.bailifchanged(repo)
# Find the revisions we have in common with the remote. These will
# be used for finding local-only changes for narrowing. They will
# also define the set of revisions to update for widening.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 remotepath = ui.expandpath(remotepath or b'default')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 url, branches = hg.parseurl(remotepath)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b'comparing with %s\n') % util.hidepassword(url))
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 remote = hg.peer(repo, opts, url)
Pulkit Goyal
narrow: check for servers' narrow support before doing anything (BC)...
r40000
# check narrow support before doing anything if widening needs to be
# performed. In future we should also abort if client is ellipses and
# server does not support ellipses
Pulkit Goyal
wireprotoserver: move narrow capabilities to wireprototypes.py...
r40110 if widening and wireprototypes.NARROWCAP not in remote.capabilities():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"server does not support narrow clones"))
Pulkit Goyal
narrow: check for servers' narrow support before doing anything (BC)...
r40000
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 commoninc = discovery.findcommonincoming(repo, remote)
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215 if autoremoveincludes:
Augie Fackler
formatting: blacken the codebase...
r43346 outgoing = discovery.findcommonoutgoing(
repo, remote, commoninc=commoninc
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b'looking for unused includes to remove\n'))
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215 localfiles = set()
for n in itertools.chain(outgoing.missing, outgoing.excluded):
localfiles.update(repo[n].files())
suggestedremovals = []
for include in sorted(oldincludes):
match = narrowspec.match(repo.root, [include], oldexcludes)
if not any(match(f) for f in localfiles):
suggestedremovals.append(include)
if suggestedremovals:
for s in suggestedremovals:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(b'%s\n' % s)
Augie Fackler
formatting: blacken the codebase...
r43346 if (
ui.promptchoice(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(
b'remove these unused includes (yn)?'
b'$$ &Yes $$ &No'
)
Augie Fackler
formatting: blacken the codebase...
r43346 )
== 0
):
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215 removedincludes.update(suggestedremovals)
narrowing = True
else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.status(_(b'found no unused includes\n'))
Martin von Zweigbergk
narrow: add option for automatically removing unused includes...
r43215
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if narrowing:
newincludes = oldincludes - removedincludes
newexcludes = oldexcludes | addedexcludes
Augie Fackler
formatting: blacken the codebase...
r43346 _narrow(
ui,
repo,
remote,
commoninc,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 opts[b'force_delete_local_changes'],
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # _narrow() updated the narrowspec and _widen() below needs to
# use the updated values as its base (otherwise removed includes
# and addedexcludes will be lost in the resulting narrowspec)
oldincludes = newincludes
oldexcludes = newexcludes
if widening:
newincludes = oldincludes | addedincludes
newexcludes = oldexcludes - removedexcludes
Augie Fackler
formatting: blacken the codebase...
r43346 _widen(
ui,
repo,
remote,
commoninc,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
return 0