| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/subrepoutil.py (32 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import stringutil | ||||
| nullstate = (b'', b'', b'empty') | nullstate = (b'', b'', b'empty') | ||||
| if pycompat.TYPE_CHECKING: | |||||
| from typing import ( | |||||
| Any, | |||||
| Dict, | |||||
| List, | |||||
| Optional, | |||||
| Set, | |||||
| Tuple, | |||||
| ) | |||||
| from . import ( | |||||
| context, | |||||
| localrepo, | |||||
| match as matchmod, | |||||
| scmutil, | |||||
| subrepo, | |||||
| ui as uimod, | |||||
| ) | |||||
| Substate = Dict[bytes, Tuple[bytes, bytes, bytes]] | |||||
| def state(ctx, ui): | def state(ctx, ui): | ||||
| # type: (context.changectx, uimod.ui) -> Substate | |||||
| """return a state dict, mapping subrepo paths configured in .hgsub | """return a state dict, mapping subrepo paths configured in .hgsub | ||||
| to tuple: (source from .hgsub, revision from .hgsubstate, kind | to tuple: (source from .hgsub, revision from .hgsubstate, kind | ||||
| (key in types dict)) | (key in types dict)) | ||||
| """ | """ | ||||
| p = config.config() | p = config.config() | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| def read(f, sections=None, remap=None): | def read(f, sections=None, remap=None): | ||||
| % (repo.pathto(b'.hgsubstate'), (i + 1)) | % (repo.pathto(b'.hgsubstate'), (i + 1)) | ||||
| ) | ) | ||||
| rev[path] = revision | rev[path] = revision | ||||
| except IOError as err: | except IOError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| def remap(src): | def remap(src): | ||||
| # type: (bytes) -> bytes | |||||
| for pattern, repl in p.items(b'subpaths'): | for pattern, repl in p.items(b'subpaths'): | ||||
| # Turn r'C:\foo\bar' into r'C:\\foo\\bar' since re.sub | # Turn r'C:\foo\bar' into r'C:\\foo\\bar' since re.sub | ||||
| # does a string decode. | # does a string decode. | ||||
| repl = stringutil.escapestr(repl) | repl = stringutil.escapestr(repl) | ||||
| # However, we still want to allow back references to go | # However, we still want to allow back references to go | ||||
| # through unharmed, so we turn r'\\1' into r'\1'. Again, | # through unharmed, so we turn r'\\1' into r'\1'. Again, | ||||
| # extra escapes are needed because re.sub string decodes. | # extra escapes are needed because re.sub string decodes. | ||||
| repl = re.sub(br'\\\\([0-9]+)', br'\\\1', repl) | repl = re.sub(br'\\\\([0-9]+)', br'\\\1', repl) | ||||
| try: | try: | ||||
| src = re.sub(pattern, repl, src, 1) | src = re.sub(pattern, repl, src, 1) | ||||
| except re.error as e: | except re.error as e: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"bad subrepository pattern in %s: %s") | _(b"bad subrepository pattern in %s: %s") | ||||
| % ( | % ( | ||||
| p.source(b'subpaths', pattern), | p.source(b'subpaths', pattern), | ||||
| stringutil.forcebytestr(e), | stringutil.forcebytestr(e), | ||||
| ) | ) | ||||
| ) | ) | ||||
| return src | return src | ||||
| state = {} | state = {} | ||||
| for path, src in p.items(b''): | for path, src in p.items(b''): # type: bytes | ||||
| kind = b'hg' | kind = b'hg' | ||||
| if src.startswith(b'['): | if src.startswith(b'['): | ||||
| if b']' not in src: | if b']' not in src: | ||||
| raise error.Abort(_(b'missing ] in subrepository source')) | raise error.Abort(_(b'missing ] in subrepository source')) | ||||
| kind, src = src.split(b']', 1) | kind, src = src.split(b']', 1) | ||||
| kind = kind[1:] | kind = kind[1:] | ||||
| src = src.lstrip() # strip any extra whitespace after ']' | src = src.lstrip() # strip any extra whitespace after ']' | ||||
| src = remap(src) | src = remap(src) | ||||
| state[util.pconvert(path)] = (src.strip(), rev.get(path, b''), kind) | state[util.pconvert(path)] = (src.strip(), rev.get(path, b''), kind) | ||||
| return state | return state | ||||
| def writestate(repo, state): | def writestate(repo, state): | ||||
| # type: (localrepo.localrepository, Substate) -> None | |||||
| """rewrite .hgsubstate in (outer) repo with these subrepo states""" | """rewrite .hgsubstate in (outer) repo with these subrepo states""" | ||||
| lines = [ | lines = [ | ||||
| b'%s %s\n' % (state[s][1], s) | b'%s %s\n' % (state[s][1], s) | ||||
| for s in sorted(state) | for s in sorted(state) | ||||
| if state[s][1] != nullstate[1] | if state[s][1] != nullstate[1] | ||||
| ] | ] | ||||
| repo.wwrite(b'.hgsubstate', b''.join(lines), b'') | repo.wwrite(b'.hgsubstate', b''.join(lines), b'') | ||||
| def submerge(repo, wctx, mctx, actx, overwrite, labels=None): | def submerge(repo, wctx, mctx, actx, overwrite, labels=None): | ||||
| # type: (localrepo.localrepository, context.workingctx, context.changectx, context.changectx, bool, Optional[Any]) -> Substate | |||||
| # TODO: type the `labels` arg | |||||
| """delegated from merge.applyupdates: merging of .hgsubstate file | """delegated from merge.applyupdates: merging of .hgsubstate file | ||||
| in working context, merging context and ancestor context""" | in working context, merging context and ancestor context""" | ||||
| if mctx == actx: # backwards? | if mctx == actx: # backwards? | ||||
| actx = wctx.p1() | actx = wctx.p1() | ||||
| s1 = wctx.substate | s1 = wctx.substate | ||||
| s2 = mctx.substate | s2 = mctx.substate | ||||
| sa = actx.substate | sa = actx.substate | ||||
| sm = {} | sm = {} | ||||
| sm[s] = r | sm[s] = r | ||||
| # record merged .hgsubstate | # record merged .hgsubstate | ||||
| writestate(repo, sm) | writestate(repo, sm) | ||||
| return sm | return sm | ||||
| def precommit(ui, wctx, status, match, force=False): | def precommit(ui, wctx, status, match, force=False): | ||||
| # type: (uimod.ui, context.workingcommitctx, scmutil.status, matchmod.basematcher, bool) -> Tuple[List[bytes], Set[bytes], Substate] | |||||
| """Calculate .hgsubstate changes that should be applied before committing | """Calculate .hgsubstate changes that should be applied before committing | ||||
| Returns (subs, commitsubs, newstate) where | Returns (subs, commitsubs, newstate) where | ||||
| - subs: changed subrepos (including dirty ones) | - subs: changed subrepos (including dirty ones) | ||||
| - commitsubs: dirty subrepos which the caller needs to commit recursively | - commitsubs: dirty subrepos which the caller needs to commit recursively | ||||
| - newstate: new state dict which the caller must write to .hgsubstate | - newstate: new state dict which the caller must write to .hgsubstate | ||||
| This also updates the given status argument. | This also updates the given status argument. | ||||
| status.modified + status.added + status.removed | status.modified + status.added + status.removed | ||||
| ): | ): | ||||
| status.removed.insert(0, b'.hgsubstate') | status.removed.insert(0, b'.hgsubstate') | ||||
| return subs, commitsubs, newstate | return subs, commitsubs, newstate | ||||
| def reporelpath(repo): | def reporelpath(repo): | ||||
| # type: (localrepo.localrepository) -> bytes | |||||
| """return path to this (sub)repo as seen from outermost repo""" | """return path to this (sub)repo as seen from outermost repo""" | ||||
| parent = repo | parent = repo | ||||
| while util.safehasattr(parent, b'_subparent'): | while util.safehasattr(parent, b'_subparent'): | ||||
| parent = parent._subparent | parent = parent._subparent | ||||
| return repo.root[len(pathutil.normasprefix(parent.root)) :] | return repo.root[len(pathutil.normasprefix(parent.root)) :] | ||||
| def subrelpath(sub): | def subrelpath(sub): | ||||
| # type: (subrepo.abstractsubrepo) -> bytes | |||||
| """return path to this subrepo as seen from outermost repo""" | """return path to this subrepo as seen from outermost repo""" | ||||
| return sub._relpath | return sub._relpath | ||||
| def _abssource(repo, push=False, abort=True): | def _abssource(repo, push=False, abort=True): | ||||
| # type: (localrepo.localrepository, bool, bool) -> Optional[bytes] | |||||
| """return pull/push path of repo - either based on parent repo .hgsub info | """return pull/push path of repo - either based on parent repo .hgsub info | ||||
| or on the top repo config. Abort or return None if no source found.""" | or on the top repo config. Abort or return None if no source found.""" | ||||
| if util.safehasattr(repo, b'_subparent'): | if util.safehasattr(repo, b'_subparent'): | ||||
| source = util.url(repo._subsource) | source = util.url(repo._subsource) | ||||
| if source.isabs(): | if source.isabs(): | ||||
| return bytes(source) | return bytes(source) | ||||
| source.path = posixpath.normpath(source.path) | source.path = posixpath.normpath(source.path) | ||||
| parent = _abssource(repo._subparent, push, abort=False) | parent = _abssource(repo._subparent, push, abort=False) | ||||
| path = os.path.abspath(path) | path = os.path.abspath(path) | ||||
| return path | return path | ||||
| if abort: | if abort: | ||||
| raise error.Abort(_(b"default path for subrepository not found")) | raise error.Abort(_(b"default path for subrepository not found")) | ||||
| def newcommitphase(ui, ctx): | def newcommitphase(ui, ctx): | ||||
| # type: (uimod.ui, context.changectx) -> int | |||||
| commitphase = phases.newcommitphase(ui) | commitphase = phases.newcommitphase(ui) | ||||
| substate = getattr(ctx, "substate", None) | substate = getattr(ctx, "substate", None) | ||||
| if not substate: | if not substate: | ||||
| return commitphase | return commitphase | ||||
| check = ui.config(b'phases', b'checksubrepos') | check = ui.config(b'phases', b'checksubrepos') | ||||
| if check not in (b'ignore', b'follow', b'abort'): | if check not in (b'ignore', b'follow', b'abort'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'invalid phases.checksubrepos configuration: %s') % check | _(b'invalid phases.checksubrepos configuration: %s') % check | ||||