subrepo.py
1929 lines
| 69.5 KiB
| text/x-python
|
PythonLexer
/ mercurial / subrepo.py
|
r8812 | # subrepo.py - sub-repository handling for Mercurial | ||
# | ||||
|
r10324 | # Copyright 2009-2010 Matt Mackall <mpm@selenic.com> | ||
|
r8812 | # | ||
# This software may be used and distributed according to the terms of the | ||||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r8812 | |||
|
r25980 | from __future__ import absolute_import | ||
|
r23540 | import copy | ||
|
r25980 | import errno | ||
import os | ||||
import posixpath | ||||
import re | ||||
import stat | ||||
import subprocess | ||||
import sys | ||||
import tarfile | ||||
|
r19788 | import xml.dom.minidom | ||
|
r25980 | |||
from .i18n import _ | ||||
from . import ( | ||||
cmdutil, | ||||
config, | ||||
error, | ||||
exchange, | ||||
match as matchmod, | ||||
node, | ||||
pathutil, | ||||
phases, | ||||
scmutil, | ||||
util, | ||||
) | ||||
|
r9092 | hg = None | ||
|
r14050 | propertycache = util.propertycache | ||
|
r8813 | |||
|
r10177 | nullstate = ('', '', 'empty') | ||
|
r8812 | |||
|
r18940 | def _expandedabspath(path): | ||
''' | ||||
get a path or url and if it is a path expand it and return an absolute path | ||||
''' | ||||
expandedpath = util.urllocalpath(util.expandpath(path)) | ||||
u = util.url(expandedpath) | ||||
if not u.scheme: | ||||
path = util.normpath(os.path.abspath(u.path)) | ||||
return path | ||||
|
r18936 | |||
def _getstorehashcachename(remotepath): | ||||
'''get a unique filename for the store hash cache of a remote repository''' | ||||
|
r18940 | return util.sha1(_expandedabspath(remotepath)).hexdigest()[0:12] | ||
|
r18936 | |||
|
r18109 | class SubrepoAbort(error.Abort): | ||
"""Exception class used to avoid handling a subrepo error more than once""" | ||||
|
r18263 | def __init__(self, *args, **kw): | ||
|
r18296 | error.Abort.__init__(self, *args, **kw) | ||
|
r18263 | self.subrepo = kw.get('subrepo') | ||
|
r18964 | self.cause = kw.get('cause') | ||
|
r18109 | |||
def annotatesubrepoerror(func): | ||||
def decoratedmethod(self, *args, **kargs): | ||||
try: | ||||
res = func(self, *args, **kargs) | ||||
|
r25660 | except SubrepoAbort as ex: | ||
|
r18109 | # This exception has already been handled | ||
raise ex | ||||
|
r25660 | except error.Abort as ex: | ||
|
r18263 | subrepo = subrelpath(self) | ||
|
r18297 | errormsg = str(ex) + ' ' + _('(in subrepo %s)') % subrepo | ||
|
r18109 | # avoid handling this exception by raising a SubrepoAbort exception | ||
|
r18964 | raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, | ||
cause=sys.exc_info()) | ||||
|
r18109 | return res | ||
return decoratedmethod | ||||
|
r11775 | def state(ctx, ui): | ||
|
r11571 | """return a state dict, mapping subrepo paths configured in .hgsub | ||
to tuple: (source from .hgsub, revision from .hgsubstate, kind | ||||
(key in types dict)) | ||||
""" | ||||
|
r8812 | p = config.config() | ||
|
r25768 | repo = ctx.repo() | ||
|
r8812 | def read(f, sections=None, remap=None): | ||
if f in ctx: | ||||
|
r13017 | try: | ||
data = ctx[f].data() | ||||
|
r25660 | except IOError as err: | ||
|
r13017 | if err.errno != errno.ENOENT: | ||
raise | ||||
# handle missing subrepo spec files as removed | ||||
|
r24645 | ui.warn(_("warning: subrepo spec file \'%s\' not found\n") % | ||
|
r25769 | repo.pathto(f)) | ||
|
r13017 | return | ||
p.parse(f, data, sections, remap, read) | ||||
|
r10174 | else: | ||
|
r26587 | raise error.Abort(_("subrepo spec file \'%s\' not found") % | ||
|
r25769 | repo.pathto(f)) | ||
|
r10174 | if '.hgsub' in ctx: | ||
read('.hgsub') | ||||
|
r8812 | |||
|
r11775 | for path, src in ui.configitems('subpaths'): | ||
p.set('subpaths', path, src, ui.configsource('subpaths', path)) | ||||
|
r8812 | rev = {} | ||
if '.hgsubstate' in ctx: | ||||
try: | ||||
|
r16596 | for i, l in enumerate(ctx['.hgsubstate'].data().splitlines()): | ||
|
r16595 | l = l.lstrip() | ||
if not l: | ||||
continue | ||||
|
r16596 | try: | ||
revision, path = l.split(" ", 1) | ||||
except ValueError: | ||||
|
r26587 | raise error.Abort(_("invalid subrepository revision " | ||
|
r24645 | "specifier in \'%s\' line %d") | ||
|
r25769 | % (repo.pathto('.hgsubstate'), (i + 1))) | ||
|
r8812 | rev[path] = revision | ||
|
r25660 | except IOError as err: | ||
|
r8812 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r15149 | def remap(src): | ||
|
r11775 | for pattern, repl in p.items('subpaths'): | ||
|
r11961 | # Turn r'C:\foo\bar' into r'C:\\foo\\bar' since re.sub | ||
# does a string decode. | ||||
repl = repl.encode('string-escape') | ||||
# However, we still want to allow back references to go | ||||
# through unharmed, so we turn r'\\1' into r'\1'. Again, | ||||
# extra escapes are needed because re.sub string decodes. | ||||
repl = re.sub(r'\\\\([0-9]+)', r'\\\1', repl) | ||||
|
r11775 | try: | ||
src = re.sub(pattern, repl, src, 1) | ||||
|
r25660 | except re.error as e: | ||
|
r26587 | raise error.Abort(_("bad subrepository pattern in %s: %s") | ||
|
r11775 | % (p.source('subpaths', pattern), e)) | ||
|
r15149 | return src | ||
|
r11775 | |||
|
r15149 | state = {} | ||
for path, src in p[''].items(): | ||||
kind = 'hg' | ||||
if src.startswith('['): | ||||
if ']' not in src: | ||||
|
r26587 | raise error.Abort(_('missing ] in subrepo source')) | ||
|
r15149 | kind, src = src.split(']', 1) | ||
kind = kind[1:] | ||||
|
r15150 | src = src.lstrip() # strip any extra whitespace after ']' | ||
if not util.url(src).isabs(): | ||||
|
r25768 | parent = _abssource(repo, abort=False) | ||
|
r15150 | if parent: | ||
parent = util.url(parent) | ||||
parent.path = posixpath.join(parent.path or '', src) | ||||
parent.path = posixpath.normpath(parent.path) | ||||
joined = str(parent) | ||||
# Remap the full joined path and use it if it changes, | ||||
# else remap the original source. | ||||
remapped = remap(joined) | ||||
if remapped == joined: | ||||
src = remap(src) | ||||
else: | ||||
src = remapped | ||||
|
r15149 | src = remap(src) | ||
|
r15723 | state[util.pconvert(path)] = (src.strip(), rev.get(path, ''), kind) | ||
|
r8812 | |||
return state | ||||
|
r8813 | |||
def writestate(repo, state): | ||||
|
r11571 | """rewrite .hgsubstate in (outer) repo with these subrepo states""" | ||
|
r24858 | lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state) | ||
if state[s][1] != nullstate[1]] | ||||
|
r14443 | repo.wwrite('.hgsubstate', ''.join(lines), '') | ||
|
r8813 | |||
|
r13322 | def submerge(repo, wctx, mctx, actx, overwrite): | ||
|
r11571 | """delegated from merge.applyupdates: merging of .hgsubstate file | ||
in working context, merging context and ancestor context""" | ||||
|
r8814 | if mctx == actx: # backwards? | ||
actx = wctx.p1() | ||||
s1 = wctx.substate | ||||
s2 = mctx.substate | ||||
sa = actx.substate | ||||
sm = {} | ||||
|
r9782 | repo.ui.debug("subrepo merge %s %s %s\n" % (wctx, mctx, actx)) | ||
|
r9779 | def debug(s, msg, r=""): | ||
if r: | ||||
|
r10177 | r = "%s:%s:%s" % r | ||
|
r9782 | repo.ui.debug(" subrepo %s: %s %s\n" % (s, msg, r)) | ||
|
r9779 | |||
|
r18364 | for s, l in sorted(s1.iteritems()): | ||
|
r11470 | a = sa.get(s, nullstate) | ||
|
r11463 | ld = l # local state with possible dirty flag for compares | ||
|
r11470 | if wctx.sub(s).dirty(): | ||
|
r11463 | ld = (l[0], l[1] + "+") | ||
|
r11470 | if wctx == actx: # overwrite | ||
a = ld | ||||
|
r11463 | |||
|
r8814 | if s in s2: | ||
r = s2[s] | ||||
|
r11463 | if ld == r or r == a: # no change or local is newer | ||
|
r8814 | sm[s] = l | ||
continue | ||||
|
r11463 | elif ld == a: # other side changed | ||
|
r9782 | debug(s, "other changed, get", r) | ||
|
r13322 | wctx.sub(s).get(r, overwrite) | ||
|
r8814 | sm[s] = r | ||
|
r11463 | elif ld[0] != r[0]: # sources differ | ||
|
r9048 | if repo.ui.promptchoice( | ||
|
r8814 | _(' subrepository sources for %s differ\n' | ||
|
r19226 | 'use (l)ocal source (%s) or (r)emote source (%s)?' | ||
'$$ &Local $$ &Remote') % (s, l[0], r[0]), 0): | ||||
|
r9782 | debug(s, "prompt changed, get", r) | ||
|
r13322 | wctx.sub(s).get(r, overwrite) | ||
|
r8814 | sm[s] = r | ||
|
r11463 | elif ld[1] == a[1]: # local side is unchanged | ||
|
r9782 | debug(s, "other side changed, get", r) | ||
|
r13322 | wctx.sub(s).get(r, overwrite) | ||
|
r8814 | sm[s] = r | ||
else: | ||||
|
r19811 | debug(s, "both sides changed") | ||
|
r21401 | srepo = wctx.sub(s) | ||
|
r19811 | option = repo.ui.promptchoice( | ||
_(' subrepository %s diverged (local revision: %s, ' | ||||
'remote revision: %s)\n' | ||||
'(M)erge, keep (l)ocal or keep (r)emote?' | ||||
'$$ &Merge $$ &Local $$ &Remote') | ||||
|
r21401 | % (s, srepo.shortid(l[1]), srepo.shortid(r[1])), 0) | ||
|
r19811 | if option == 0: | ||
wctx.sub(s).merge(r) | ||||
sm[s] = l | ||||
debug(s, "merge with", r) | ||||
elif option == 1: | ||||
sm[s] = l | ||||
debug(s, "keep local subrepo revision", l) | ||||
else: | ||||
wctx.sub(s).get(r, overwrite) | ||||
sm[s] = r | ||||
debug(s, "get remote subrepo revision", r) | ||||
|
r11463 | elif ld == a: # remote removed, local unchanged | ||
|
r9782 | debug(s, "remote removed, remove") | ||
|
r8814 | wctx.sub(s).remove() | ||
|
r14417 | elif a == nullstate: # not present in remote or ancestor | ||
debug(s, "local added, keep") | ||||
sm[s] = l | ||||
continue | ||||
|
r8814 | else: | ||
|
r9048 | if repo.ui.promptchoice( | ||
|
r8814 | _(' local changed subrepository %s which remote removed\n' | ||
|
r19226 | 'use (c)hanged version or (d)elete?' | ||
'$$ &Changed $$ &Delete') % s, 0): | ||||
|
r9782 | debug(s, "prompt remove") | ||
|
r8814 | wctx.sub(s).remove() | ||
|
r13857 | for s, r in sorted(s2.items()): | ||
|
r8814 | if s in s1: | ||
continue | ||||
elif s not in sa: | ||||
|
r9782 | debug(s, "remote added, get", r) | ||
|
r10175 | mctx.sub(s).get(r) | ||
|
r8814 | sm[s] = r | ||
elif r != sa[s]: | ||||
|
r9048 | if repo.ui.promptchoice( | ||
|
r8814 | _(' remote changed subrepository %s which local removed\n' | ||
|
r19226 | 'use (c)hanged version or (d)elete?' | ||
'$$ &Changed $$ &Delete') % s, 0) == 0: | ||||
|
r9782 | debug(s, "prompt recreate", r) | ||
|
r24110 | mctx.sub(s).get(r) | ||
|
r8814 | sm[s] = r | ||
# record merged .hgsubstate | ||||
writestate(repo, sm) | ||||
|
r19637 | return sm | ||
|
r8814 | |||
|
r13417 | def _updateprompt(ui, sub, dirty, local, remote): | ||
if dirty: | ||||
msg = (_(' subrepository sources for %s differ\n' | ||||
|
r22590 | 'use (l)ocal source (%s) or (r)emote source (%s)?' | ||
|
r19226 | '$$ &Local $$ &Remote') | ||
|
r13417 | % (subrelpath(sub), local, remote)) | ||
else: | ||||
|
r16683 | msg = (_(' subrepository sources for %s differ (in checked out ' | ||
'version)\n' | ||||
|
r22590 | 'use (l)ocal source (%s) or (r)emote source (%s)?' | ||
|
r19226 | '$$ &Local $$ &Remote') | ||
|
r13417 | % (subrelpath(sub), local, remote)) | ||
|
r19226 | return ui.promptchoice(msg, 0) | ||
|
r13417 | |||
|
r24785 | def reporelpath(repo): | ||
"""return path to this (sub)repo as seen from outermost repo""" | ||||
parent = repo | ||||
while util.safehasattr(parent, '_subparent'): | ||||
parent = parent._subparent | ||||
return repo.root[len(pathutil.normasprefix(parent.root)):] | ||||
|
r12752 | def subrelpath(sub): | ||
|
r11571 | """return path to this subrepo as seen from outermost repo""" | ||
|
r24673 | return sub._relpath | ||
|
r11112 | |||
|
r12753 | def _abssource(repo, push=False, abort=True): | ||
"""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.""" | ||||
|
r14963 | if util.safehasattr(repo, '_subparent'): | ||
|
r14076 | source = util.url(repo._subsource) | ||
|
r14766 | if source.isabs(): | ||
return str(source) | ||||
|
r13771 | source.path = posixpath.normpath(source.path) | ||
|
r12753 | parent = _abssource(repo._subparent, push, abort=False) | ||
if parent: | ||||
|
r15498 | parent = util.url(util.pconvert(parent)) | ||
|
r15055 | parent.path = posixpath.join(parent.path or '', source.path) | ||
|
r13771 | parent.path = posixpath.normpath(parent.path) | ||
return str(parent) | ||||
|
r12753 | else: # recursion reached top repo | ||
|
r14963 | if util.safehasattr(repo, '_subtoppath'): | ||
|
r12852 | return repo._subtoppath | ||
|
r12753 | if push and repo.ui.config('paths', 'default-push'): | ||
return repo.ui.config('paths', 'default-push') | ||||
if repo.ui.config('paths', 'default'): | ||||
return repo.ui.config('paths', 'default') | ||||
|
r23666 | if repo.shared(): | ||
|
r18510 | # chop off the .hg component to get the default path form | ||
return os.path.dirname(repo.sharedpath) | ||||
|
r12753 | if abort: | ||
|
r26587 | raise error.Abort(_("default path for subrepository not found")) | ||
|
r8814 | |||
|
r24724 | def _sanitize(ui, vfs, ignore): | ||
|
r24726 | for dirname, dirs, names in vfs.walk(): | ||
|
r21567 | for i, d in enumerate(dirs): | ||
if d.lower() == ignore: | ||||
del dirs[i] | ||||
break | ||||
|
r25771 | if vfs.basename(dirname).lower() != '.hg': | ||
|
r21564 | continue | ||
|
r20104 | for f in names: | ||
if f.lower() == 'hgrc': | ||||
|
r21564 | ui.warn(_("warning: removing potentially hostile 'hgrc' " | ||
|
r24726 | "in '%s'\n") % vfs.join(dirname)) | ||
vfs.unlink(vfs.reljoin(dirname, f)) | ||||
|
r20104 | |||
|
r25600 | def subrepo(ctx, path, allowwdir=False): | ||
|
r11571 | """return instance of the right subrepo class for subrepo in path""" | ||
|
r8813 | # subrepo inherently violates our import layering rules | ||
# because it wants to make repo objects from deep inside the stack | ||||
# so we manually delay the circular imports to not break | ||||
# scripts that don't use our demand-loading | ||||
|
r9092 | global hg | ||
|
r25980 | from . import hg as h | ||
|
r8814 | hg = h | ||
|
r8813 | |||
|
r24302 | pathutil.pathauditor(ctx.repo().root)(path) | ||
|
r16756 | state = ctx.substate[path] | ||
|
r10177 | if state[2] not in types: | ||
|
r26587 | raise error.Abort(_('unknown subrepo type %s') % state[2]) | ||
|
r25600 | if allowwdir: | ||
state = (state[0], ctx.subrev(path), state[2]) | ||||
|
r10177 | return types[state[2]](ctx, path, state[:2]) | ||
|
r8813 | |||
|
r25416 | def nullsubrepo(ctx, path, pctx): | ||
"""return an empty subrepo in pctx for the extant subrepo in ctx""" | ||||
# subrepo inherently violates our import layering rules | ||||
# because it wants to make repo objects from deep inside the stack | ||||
# so we manually delay the circular imports to not break | ||||
# scripts that don't use our demand-loading | ||||
global hg | ||||
|
r25980 | from . import hg as h | ||
|
r25416 | hg = h | ||
pathutil.pathauditor(ctx.repo().root)(path) | ||||
state = ctx.substate[path] | ||||
if state[2] not in types: | ||||
|
r26587 | raise error.Abort(_('unknown subrepo type %s') % state[2]) | ||
|
r25416 | subrev = '' | ||
if state[2] == 'hg': | ||||
subrev = "0" * 40 | ||||
return types[state[2]](pctx, path, (state[0], subrev)) | ||||
|
r20176 | def newcommitphase(ui, ctx): | ||
commitphase = phases.newcommitphase(ui) | ||||
substate = getattr(ctx, "substate", None) | ||||
if not substate: | ||||
return commitphase | ||||
check = ui.config('phases', 'checksubrepos', 'follow') | ||||
if check not in ('ignore', 'follow', 'abort'): | ||||
|
r26587 | raise error.Abort(_('invalid phases.checksubrepos configuration: %s') | ||
|
r20176 | % (check)) | ||
if check == 'ignore': | ||||
return commitphase | ||||
maxphase = phases.public | ||||
maxsub = None | ||||
for s in sorted(substate): | ||||
sub = ctx.sub(s) | ||||
subphase = sub.phase(substate[s][1]) | ||||
if maxphase < subphase: | ||||
maxphase = subphase | ||||
maxsub = s | ||||
if commitphase < maxphase: | ||||
if check == 'abort': | ||||
|
r26587 | raise error.Abort(_("can't commit in %s phase" | ||
|
r20176 | " conflicting %s from subrepository %s") % | ||
(phases.phasenames[commitphase], | ||||
phases.phasenames[maxphase], maxsub)) | ||||
ui.warn(_("warning: changes are committed in" | ||||
" %s phase from subrepository %s\n") % | ||||
(phases.phasenames[maxphase], maxsub)) | ||||
return maxphase | ||||
return commitphase | ||||
|
r11559 | # subrepo classes need to implement the following abstract class: | ||
class abstractsubrepo(object): | ||||
|
r24671 | def __init__(self, ctx, path): | ||
"""Initialize abstractsubrepo part | ||||
``ctx`` is the context referring this subrepository in the | ||||
parent repository. | ||||
|
r26781 | ``path`` is the path to this subrepository as seen from | ||
|
r24671 | innermost repository. | ||
""" | ||||
self.ui = ctx.repo().ui | ||||
self._ctx = ctx | ||||
self._path = path | ||||
|
r23536 | |||
|
r18937 | def storeclean(self, path): | ||
""" | ||||
returns true if the repository has not changed since it was last | ||||
cloned from or pushed to a given repository. | ||||
""" | ||||
return False | ||||
|
r13174 | def dirty(self, ignoreupdate=False): | ||
"""returns true if the dirstate of the subrepo is dirty or does not | ||||
match current stored state. If ignoreupdate is true, only check | ||||
whether the subrepo has uncommitted changes in its dirstate. | ||||
|
r11559 | """ | ||
raise NotImplementedError | ||||
|
r24470 | def dirtyreason(self, ignoreupdate=False): | ||
"""return reason string if it is ``dirty()`` | ||||
Returned string should have enough information for the message | ||||
of exception. | ||||
This returns None, otherwise. | ||||
""" | ||||
if self.dirty(ignoreupdate=ignoreupdate): | ||||
return _("uncommitted changes in subrepository '%s'" | ||||
) % subrelpath(self) | ||||
|
r24471 | def bailifchanged(self, ignoreupdate=False): | ||
"""raise Abort if subrepository is ``dirty()`` | ||||
""" | ||||
dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate) | ||||
if dirtyreason: | ||||
|
r26587 | raise error.Abort(dirtyreason) | ||
|
r24471 | |||
|
r16072 | def basestate(self): | ||
"""current working directory base state, disregarding .hgsubstate | ||||
state and working directory modifications""" | ||||
raise NotImplementedError | ||||
|
r12506 | def checknested(self, path): | ||
|
r12162 | """check if path is a subrepository within this repository""" | ||
return False | ||||
|
r11559 | def commit(self, text, user, date): | ||
"""commit the current changes to the subrepo with the given | ||||
log message. Use given user and date if possible. Return the | ||||
new state of the subrepo. | ||||
""" | ||||
raise NotImplementedError | ||||
|
r20176 | def phase(self, state): | ||
"""returns phase of specified state in the subrepository. | ||||
""" | ||||
return phases.public | ||||
|
r11559 | def remove(self): | ||
"""remove the subrepo | ||||
|
r8813 | |||
|
r11559 | (should verify the dirstate is not dirty first) | ||
""" | ||||
raise NotImplementedError | ||||
|
r13322 | def get(self, state, overwrite=False): | ||
|
r11559 | """run whatever commands are needed to put the subrepo into | ||
this state | ||||
""" | ||||
raise NotImplementedError | ||||
|
r13413 | def merge(self, state): | ||
|
r11559 | """merge currently-saved state with the new state.""" | ||
raise NotImplementedError | ||||
|
r15708 | def push(self, opts): | ||
|
r11572 | """perform whatever action is analogous to 'hg push' | ||
|
r11559 | |||
This may be a no-op on some systems. | ||||
""" | ||||
raise NotImplementedError | ||||
|
r23963 | def add(self, ui, match, prefix, explicitonly, **opts): | ||
|
r12270 | return [] | ||
|
r11559 | |||
|
r23537 | def addremove(self, matcher, prefix, opts, dry_run, similarity): | ||
|
r23572 | self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) | ||
|
r23537 | return 1 | ||
|
r23576 | def cat(self, match, prefix, **opts): | ||
|
r21041 | return 1 | ||
|
r12166 | def status(self, rev2, **opts): | ||
|
r22914 | return scmutil.status([], [], [], [], [], [], []) | ||
|
r12166 | |||
|
r18006 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | ||
|
r12167 | pass | ||
|
r12272 | def outgoing(self, ui, dest, opts): | ||
return 1 | ||||
|
r12274 | def incoming(self, ui, source, opts): | ||
return 1 | ||||
|
r12322 | def files(self): | ||
"""return filename iterator""" | ||||
raise NotImplementedError | ||||
def filedata(self, name): | ||||
"""return file data""" | ||||
raise NotImplementedError | ||||
def fileflags(self, name): | ||||
"""return file flags""" | ||||
return '' | ||||
|
r25121 | def getfileset(self, expr): | ||
"""Resolve the fileset expression for this repo""" | ||||
return set() | ||||
|
r25228 | def printfiles(self, ui, m, fm, fmt, subrepos): | ||
|
r24413 | """handle the files command for this subrepo""" | ||
return 1 | ||||
|
r23575 | def archive(self, archiver, prefix, match=None): | ||
|
r17108 | if match is not None: | ||
files = [f for f in self.files() if match(f)] | ||||
else: | ||||
files = self.files() | ||||
|
r13144 | total = len(files) | ||
relpath = subrelpath(self) | ||||
|
r23575 | self.ui.progress(_('archiving (%s)') % relpath, 0, | ||
unit=_('files'), total=total) | ||||
|
r13144 | for i, name in enumerate(files): | ||
|
r12323 | flags = self.fileflags(name) | ||
|
r25658 | mode = 'x' in flags and 0o755 or 0o644 | ||
|
r12323 | symlink = 'l' in flags | ||
|
r24924 | archiver.addfile(prefix + self._path + '/' + name, | ||
|
r12323 | mode, symlink, self.filedata(name)) | ||
|
r23575 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, | ||
unit=_('files'), total=total) | ||||
self.ui.progress(_('archiving (%s)') % relpath, None) | ||||
|
r18967 | return total | ||
|
r12323 | |||
|
r15410 | def walk(self, match): | ||
''' | ||||
walk recursively through the directory tree, finding all files | ||||
matched by the match function | ||||
''' | ||||
pass | ||||
|
r12323 | |||
|
r23577 | def forget(self, match, prefix): | ||
|
r16527 | return ([], []) | ||
|
r12323 | |||
|
r23578 | def removefiles(self, matcher, prefix, after, force, subrepos): | ||
|
r23325 | """remove the matched files from the subrepository and the filesystem, | ||
possibly by force and/or after the file has been removed from the | ||||
filesystem. Return 0 on success, 1 on any warning. | ||||
""" | ||||
return 1 | ||||
|
r23579 | def revert(self, substate, *pats, **opts): | ||
self.ui.warn('%s: reverting %s subrepos is unsupported\n' \ | ||||
|
r16468 | % (substate[0], substate[2])) | ||
|
r16429 | return [] | ||
|
r21400 | def shortid(self, revid): | ||
return revid | ||||
|
r25591 | def verify(self): | ||
'''verify the integrity of the repository. Return 0 on success or | ||||
warning, 1 on any error. | ||||
''' | ||||
return 0 | ||||
|
r24672 | @propertycache | ||
def wvfs(self): | ||||
"""return vfs to access the working directory of this subrepository | ||||
""" | ||||
return scmutil.vfs(self._ctx.repo().wvfs.join(self._path)) | ||||
|
r24673 | @propertycache | ||
def _relpath(self): | ||||
"""return path to this subrepository as seen from outermost repository | ||||
""" | ||||
|
r24785 | return self.wvfs.reljoin(reporelpath(self._ctx.repo()), self._path) | ||
|
r24673 | |||
|
r11559 | class hgsubrepo(abstractsubrepo): | ||
|
r8813 | def __init__(self, ctx, path, state): | ||
|
r24671 | super(hgsubrepo, self).__init__(ctx, path) | ||
|
r8813 | self._state = state | ||
|
r24302 | r = ctx.repo() | ||
|
r8813 | root = r.wjoin(path) | ||
|
r23364 | create = not r.wvfs.exists('%s/.hg' % path) | ||
|
r17873 | self._repo = hg.repository(r.baseui, root, create=create) | ||
|
r24877 | |||
# Propagate the parent's --hidden option | ||||
if r is r.unfiltered(): | ||||
self._repo = self._repo.unfiltered() | ||||
|
r23573 | self.ui = self._repo.ui | ||
|
r17873 | for s, k in [('ui', 'commitsubrepos')]: | ||
v = r.ui.config(s, k) | ||||
if v: | ||||
|
r23574 | self.ui.setconfig(s, k, v, 'subrepo') | ||
|
r25848 | # internal config: ui._usedassubrepo | ||
|
r23574 | self.ui.setconfig('ui', '_usedassubrepo', 'True', 'subrepo') | ||
|
r14281 | self._initrepo(r, state[0], create) | ||
|
r18939 | def storeclean(self, path): | ||
|
r21885 | lock = self._repo.lock() | ||
try: | ||||
return self._storeclean(path) | ||||
finally: | ||||
lock.release() | ||||
def _storeclean(self, path): | ||||
|
r18939 | clean = True | ||
itercache = self._calcstorehash(path) | ||||
|
r25172 | for filehash in self._readstorehashcache(path): | ||
if filehash != next(itercache, None): | ||||
clean = False | ||||
break | ||||
if clean: | ||||
# if not empty: | ||||
|
r18939 | # the cached and current pull states have a different size | ||
|
r25172 | clean = next(itercache, None) is None | ||
|
r18939 | return clean | ||
def _calcstorehash(self, remotepath): | ||||
'''calculate a unique "store hash" | ||||
This method is used to to detect when there are changes that may | ||||
require a push to a given remote path.''' | ||||
# sort the files that will be hashed in increasing (likely) file size | ||||
filelist = ('bookmarks', 'store/phaseroots', 'store/00changelog.i') | ||||
|
r18940 | yield '# %s\n' % _expandedabspath(remotepath) | ||
|
r23365 | vfs = self._repo.vfs | ||
|
r18939 | for relname in filelist: | ||
|
r23365 | filehash = util.sha1(vfs.tryread(relname)).hexdigest() | ||
yield '%s = %s\n' % (relname, filehash) | ||||
|
r18939 | |||
|
r23367 | @propertycache | ||
def _cachestorehashvfs(self): | ||||
return scmutil.vfs(self._repo.join('cache/storehash')) | ||||
|
r18939 | def _readstorehashcache(self, remotepath): | ||
'''read the store hash cache for a given remote repository''' | ||||
|
r23369 | cachefile = _getstorehashcachename(remotepath) | ||
return self._cachestorehashvfs.tryreadlines(cachefile, 'r') | ||||
|
r18939 | |||
def _cachestorehash(self, remotepath): | ||||
'''cache the current store hash | ||||
Each remote repo requires its own store hash cache, because a subrepo | ||||
store may be "clean" versus a given remote repo, but not versus another | ||||
''' | ||||
|
r23372 | cachefile = _getstorehashcachename(remotepath) | ||
|
r18939 | lock = self._repo.lock() | ||
|
r21886 | try: | ||
storehash = list(self._calcstorehash(remotepath)) | ||||
|
r23372 | vfs = self._cachestorehashvfs | ||
vfs.writelines(cachefile, storehash, mode='w', notindexed=True) | ||||
|
r21886 | finally: | ||
lock.release() | ||||
|
r18939 | |||
|
r25572 | def _getctx(self): | ||
'''fetch the context for this subrepo revision, possibly a workingctx | ||||
''' | ||||
if self._ctx.rev() is None: | ||||
return self._repo[None] # workingctx if parent is workingctx | ||||
else: | ||||
rev = self._state[1] | ||||
return self._repo[rev] | ||||
|
r18109 | @annotatesubrepoerror | ||
|
r14281 | def _initrepo(self, parentrepo, source, create): | ||
self._repo._subparent = parentrepo | ||||
self._repo._subsource = source | ||||
|
r8813 | |||
|
r10666 | if create: | ||
|
r21891 | lines = ['[paths]\n'] | ||
|
r10666 | |||
def addpathconfig(key, value): | ||||
|
r12753 | if value: | ||
|
r21891 | lines.append('%s = %s\n' % (key, value)) | ||
|
r23574 | self.ui.setconfig('paths', key, value, 'subrepo') | ||
|
r10666 | |||
|
r12753 | defpath = _abssource(self._repo, abort=False) | ||
defpushpath = _abssource(self._repo, True, abort=False) | ||||
|
r10666 | addpathconfig('default', defpath) | ||
|
r10697 | if defpath != defpushpath: | ||
addpathconfig('default-push', defpushpath) | ||||
|
r21891 | |||
|
r23877 | fp = self._repo.vfs("hgrc", "w", text=True) | ||
|
r21891 | try: | ||
fp.write(''.join(lines)) | ||||
finally: | ||||
fp.close() | ||||
|
r10666 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r23885 | def add(self, ui, match, prefix, explicitonly, **opts): | ||
return cmdutil.add(ui, self._repo, match, | ||||
|
r24675 | self.wvfs.reljoin(prefix, self._path), | ||
explicitonly, **opts) | ||||
|
r12270 | |||
|
r24132 | @annotatesubrepoerror | ||
|
r23537 | def addremove(self, m, prefix, opts, dry_run, similarity): | ||
|
r23540 | # In the same way as sub directories are processed, once in a subrepo, | ||
# always entry any of its subrepos. Don't corrupt the options that will | ||||
# be used to process sibling subrepos however. | ||||
opts = copy.copy(opts) | ||||
opts['subrepos'] = True | ||||
|
r23537 | return scmutil.addremove(self._repo, m, | ||
|
r24675 | self.wvfs.reljoin(prefix, self._path), opts, | ||
|
r23537 | dry_run, similarity) | ||
|
r18109 | @annotatesubrepoerror | ||
|
r23576 | def cat(self, match, prefix, **opts): | ||
|
r21041 | rev = self._state[1] | ||
ctx = self._repo[rev] | ||||
|
r23576 | return cmdutil.cat(self.ui, self._repo, ctx, match, prefix, **opts) | ||
|
r21041 | |||
@annotatesubrepoerror | ||||
|
r12166 | def status(self, rev2, **opts): | ||
try: | ||||
rev1 = self._state[1] | ||||
ctx1 = self._repo[rev1] | ||||
ctx2 = self._repo[rev2] | ||||
return self._repo.status(ctx1, ctx2, **opts) | ||||
|
r25660 | except error.RepoLookupError as inst: | ||
|
r23574 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') | ||
% (inst, subrelpath(self))) | ||||
|
r22914 | return scmutil.status([], [], [], [], [], [], []) | ||
|
r12166 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r18006 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | ||
|
r12167 | try: | ||
node1 = node.bin(self._state[1]) | ||||
|
r12209 | # We currently expect node2 to come from substate and be | ||
# in hex format | ||||
|
r12210 | if node2 is not None: | ||
node2 = node.bin(node2) | ||||
|
r18006 | cmdutil.diffordiffstat(ui, self._repo, diffopts, | ||
|
r12167 | node1, node2, match, | ||
|
r17968 | prefix=posixpath.join(prefix, self._path), | ||
|
r12167 | listsubrepos=True, **opts) | ||
|
r25660 | except error.RepoLookupError as inst: | ||
|
r23574 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') | ||
% (inst, subrelpath(self))) | ||||
|
r12167 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r23575 | def archive(self, archiver, prefix, match=None): | ||
|
r15286 | self._get(self._state + ('hg',)) | ||
|
r23575 | total = abstractsubrepo.archive(self, archiver, prefix, match) | ||
|
r12323 | rev = self._state[1] | ||
ctx = self._repo[rev] | ||||
for subpath in ctx.substate: | ||||
|
r25601 | s = subrepo(ctx, subpath, True) | ||
|
r17108 | submatch = matchmod.narrowmatcher(subpath, match) | ||
|
r24924 | total += s.archive(archiver, prefix + self._path + '/', submatch) | ||
|
r18967 | return total | ||
|
r12323 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r13174 | def dirty(self, ignoreupdate=False): | ||
|
r8813 | r = self._state[1] | ||
|
r13174 | if r == '' and not ignoreupdate: # no state recorded | ||
|
r8813 | return True | ||
w = self._repo[None] | ||||
|
r14316 | if r != w.p1().hex() and not ignoreupdate: | ||
|
r13325 | # different version checked out | ||
|
r8813 | return True | ||
return w.dirty() # working directory changed | ||||
|
r16072 | def basestate(self): | ||
return self._repo['.'].hex() | ||||
|
r12162 | def checknested(self, path): | ||
return self._repo._checknested(self._repo.wjoin(path)) | ||||
|
r18109 | @annotatesubrepoerror | ||
|
r8813 | def commit(self, text, user, date): | ||
|
r14898 | # don't bother committing in the subrepo if it's only been | ||
# updated | ||||
if not self.dirty(True): | ||||
return self._repo['.'].hex() | ||||
|
r23574 | self.ui.debug("committing subrepo %s\n" % subrelpath(self)) | ||
|
r8813 | n = self._repo.commit(text, user, date) | ||
if not n: | ||||
return self._repo['.'].hex() # different version checked out | ||||
return node.hex(n) | ||||
|
r8814 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r20176 | def phase(self, state): | ||
return self._repo[state].phase() | ||||
@annotatesubrepoerror | ||||
|
r8814 | def remove(self): | ||
# we can't fully delete the repository as it may contain | ||||
# local-only history | ||||
|
r23574 | self.ui.note(_('removing subrepo %s\n') % subrelpath(self)) | ||
|
r8814 | hg.clean(self._repo, node.nullid, False) | ||
|
r9507 | def _get(self, state): | ||
|
r10177 | source, revision, kind = state | ||
|
r20317 | if revision in self._repo.unfiltered(): | ||
|
r20319 | return True | ||
|
r20318 | self._repo._subsource = source | ||
srcurl = _abssource(self._repo) | ||||
other = hg.peer(self._repo, {}, srcurl) | ||||
if len(self._repo) == 0: | ||||
|
r23574 | self.ui.status(_('cloning subrepo %s from %s\n') | ||
% (subrelpath(self), srcurl)) | ||||
|
r20318 | parentrepo = self._repo._subparent | ||
|
r24690 | # use self._repo.vfs instead of self.wvfs to remove .hg only | ||
self._repo.vfs.rmtree() | ||||
|
r20318 | other, cloned = hg.clone(self._repo._subparent.baseui, {}, | ||
other, self._repo.root, | ||||
update=False) | ||||
self._repo = cloned.local() | ||||
self._initrepo(parentrepo, source, create=True) | ||||
self._cachestorehash(srcurl) | ||||
|
r20317 | else: | ||
|
r23574 | self.ui.status(_('pulling subrepo %s from %s\n') | ||
% (subrelpath(self), srcurl)) | ||||
|
r20318 | cleansub = self.storeclean(srcurl) | ||
|
r22695 | exchange.pull(self._repo, other) | ||
|
r20318 | if cleansub: | ||
# keep the repo clean after pull | ||||
|
r18939 | self._cachestorehash(srcurl) | ||
|
r20319 | return False | ||
|
r8814 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r13322 | def get(self, state, overwrite=False): | ||
|
r20319 | inrepo = self._get(state) | ||
|
r10177 | source, revision, kind = state | ||
|
r20319 | repo = self._repo | ||
repo.ui.debug("getting subrepo %s\n" % self._path) | ||||
if inrepo: | ||||
urepo = repo.unfiltered() | ||||
ctx = urepo[revision] | ||||
if ctx.hidden(): | ||||
urepo.ui.warn( | ||||
_('revision %s in subrepo %s is hidden\n') \ | ||||
% (revision[0:12], self._path)) | ||||
repo = urepo | ||||
hg.updaterepo(repo, revision, overwrite) | ||||
|
r8814 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r8814 | def merge(self, state): | ||
|
r9507 | self._get(state) | ||
|
r9781 | cur = self._repo['.'] | ||
dst = self._repo[state[1]] | ||||
|
r10251 | anc = dst.ancestor(cur) | ||
|
r13417 | |||
def mergefunc(): | ||||
|
r16196 | if anc == cur and dst.branch() == cur.branch(): | ||
|
r23574 | self.ui.debug("updating subrepo %s\n" % subrelpath(self)) | ||
|
r13417 | hg.update(self._repo, state[1]) | ||
elif anc == dst: | ||||
|
r23574 | self.ui.debug("skipping subrepo %s\n" % subrelpath(self)) | ||
|
r13417 | else: | ||
|
r23574 | self.ui.debug("merging subrepo %s\n" % subrelpath(self)) | ||
|
r13417 | hg.merge(self._repo, state[1], remind=False) | ||
wctx = self._repo[None] | ||||
if self.dirty(): | ||||
if anc != dst: | ||||
|
r23574 | if _updateprompt(self.ui, self, wctx.dirty(), cur, dst): | ||
|
r13417 | mergefunc() | ||
else: | ||||
mergefunc() | ||||
|
r9781 | else: | ||
|
r13417 | mergefunc() | ||
|
r8815 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r15708 | def push(self, opts): | ||
force = opts.get('force') | ||||
newbranch = opts.get('new_branch') | ||||
ssh = opts.get('ssh') | ||||
|
r8815 | # push subrepos depth-first for coherent ordering | ||
c = self._repo[''] | ||||
subs = c.substate # only repos that are committed | ||||
for s in sorted(subs): | ||||
|
r16022 | if c.sub(s).push(opts) == 0: | ||
|
r11067 | return False | ||
|
r8815 | |||
dsturl = _abssource(self._repo, True) | ||||
|
r18940 | if not force: | ||
if self.storeclean(dsturl): | ||||
|
r23574 | self.ui.status( | ||
|
r18940 | _('no changes made to subrepo %s since last push to %s\n') | ||
% (subrelpath(self), dsturl)) | ||||
return None | ||||
|
r23574 | self.ui.status(_('pushing subrepo %s to %s\n') % | ||
|
r12752 | (subrelpath(self), dsturl)) | ||
|
r17874 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) | ||
|
r22619 | res = exchange.push(self._repo, other, force, newbranch=newbranch) | ||
|
r18939 | |||
# the repo is now clean | ||||
self._cachestorehash(dsturl) | ||||
|
r22619 | return res.cgresult | ||
|
r10177 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r12272 | def outgoing(self, ui, dest, opts): | ||
|
r24875 | if 'rev' in opts or 'branch' in opts: | ||
opts = copy.copy(opts) | ||||
opts.pop('rev', None) | ||||
opts.pop('branch', None) | ||||
|
r12272 | return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) | ||
|
r18109 | @annotatesubrepoerror | ||
|
r12274 | def incoming(self, ui, source, opts): | ||
|
r24876 | if 'rev' in opts or 'branch' in opts: | ||
opts = copy.copy(opts) | ||||
opts.pop('rev', None) | ||||
opts.pop('branch', None) | ||||
|
r12274 | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) | ||
|
r18109 | @annotatesubrepoerror | ||
|
r12322 | def files(self): | ||
rev = self._state[1] | ||||
ctx = self._repo[rev] | ||||
|
r24173 | return ctx.manifest().keys() | ||
|
r12322 | |||
def filedata(self, name): | ||||
rev = self._state[1] | ||||
return self._repo[rev][name].data() | ||||
def fileflags(self, name): | ||||
rev = self._state[1] | ||||
ctx = self._repo[rev] | ||||
return ctx.flags(name) | ||||
|
r24413 | @annotatesubrepoerror | ||
|
r25228 | def printfiles(self, ui, m, fm, fmt, subrepos): | ||
|
r24413 | # If the parent context is a workingctx, use the workingctx here for | ||
# consistency. | ||||
if self._ctx.rev() is None: | ||||
ctx = self._repo[None] | ||||
else: | ||||
rev = self._state[1] | ||||
ctx = self._repo[rev] | ||||
|
r25228 | return cmdutil.files(ui, ctx, m, fm, fmt, subrepos) | ||
|
r24413 | |||
|
r25121 | @annotatesubrepoerror | ||
def getfileset(self, expr): | ||||
if self._ctx.rev() is None: | ||||
ctx = self._repo[None] | ||||
else: | ||||
rev = self._state[1] | ||||
ctx = self._repo[rev] | ||||
files = ctx.getfileset(expr) | ||||
for subpath in ctx.substate: | ||||
sub = ctx.sub(subpath) | ||||
try: | ||||
files.extend(subpath + '/' + f for f in sub.getfileset(expr)) | ||||
except error.LookupError: | ||||
self.ui.status(_("skipping missing subrepository: %s\n") | ||||
% self.wvfs.reljoin(reporelpath(self), subpath)) | ||||
return files | ||||
|
r15410 | def walk(self, match): | ||
ctx = self._repo[None] | ||||
return ctx.walk(match) | ||||
|
r12322 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r23577 | def forget(self, match, prefix): | ||
return cmdutil.forget(self.ui, self._repo, match, | ||||
|
r24675 | self.wvfs.reljoin(prefix, self._path), True) | ||
|
r12322 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r23578 | def removefiles(self, matcher, prefix, after, force, subrepos): | ||
return cmdutil.remove(self.ui, self._repo, matcher, | ||||
|
r24675 | self.wvfs.reljoin(prefix, self._path), | ||
after, force, subrepos) | ||||
|
r23325 | |||
@annotatesubrepoerror | ||||
|
r23579 | def revert(self, substate, *pats, **opts): | ||
|
r16430 | # reverting a subrepo is a 2 step process: | ||
# 1. if the no_backup is not set, revert all modified | ||||
# files inside the subrepo | ||||
# 2. update the subrepo to the revision specified in | ||||
# the corresponding substate dictionary | ||||
|
r23579 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) | ||
|
r16430 | if not opts.get('no_backup'): | ||
# Revert all files on the subrepo, creating backups | ||||
# Note that this will not recursively revert subrepos | ||||
# We could do it if there was a set:subrepos() predicate | ||||
opts = opts.copy() | ||||
opts['date'] = None | ||||
opts['rev'] = substate[1] | ||||
|
r23579 | self.filerevert(*pats, **opts) | ||
|
r16429 | |||
# Update the repo to the revision specified in the given substate | ||||
|
r24134 | if not opts.get('dry_run'): | ||
self.get(substate, overwrite=True) | ||||
|
r16429 | |||
|
r23579 | def filerevert(self, *pats, **opts): | ||
|
r16430 | ctx = self._repo[opts['rev']] | ||
parents = self._repo.dirstate.parents() | ||||
|
r18943 | if opts.get('all'): | ||
|
r16430 | pats = ['set:modified()'] | ||
else: | ||||
pats = [] | ||||
|
r23579 | cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) | ||
|
r16430 | |||
|
r21400 | def shortid(self, revid): | ||
return revid[:12] | ||||
|
r25591 | def verify(self): | ||
try: | ||||
rev = self._state[1] | ||||
ctx = self._repo.unfiltered()[rev] | ||||
if ctx.hidden(): | ||||
# Since hidden revisions aren't pushed/pulled, it seems worth an | ||||
# explicit warning. | ||||
ui = self._repo.ui | ||||
ui.warn(_("subrepo '%s' is hidden in revision %s\n") % | ||||
(self._relpath, node.short(self._ctx.node()))) | ||||
return 0 | ||||
except error.RepoLookupError: | ||||
# A missing subrepo revision may be a case of needing to pull it, so | ||||
# don't treat this as an error. | ||||
self._repo.ui.warn(_("subrepo '%s' not found in revision %s\n") % | ||||
(self._relpath, node.short(self._ctx.node()))) | ||||
return 0 | ||||
|
r24672 | @propertycache | ||
def wvfs(self): | ||||
|
r26781 | """return own wvfs for efficiency and consistency | ||
|
r24672 | """ | ||
return self._repo.wvfs | ||||
|
r24786 | @propertycache | ||
def _relpath(self): | ||||
"""return path to this subrepository as seen from outermost repository | ||||
""" | ||||
# Keep consistent dir separators by avoiding vfs.join(self._path) | ||||
return reporelpath(self._repo) | ||||
|
r11559 | class svnsubrepo(abstractsubrepo): | ||
|
r10178 | def __init__(self, ctx, path, state): | ||
|
r24671 | super(svnsubrepo, self).__init__(ctx, path) | ||
|
r10178 | self._state = state | ||
|
r15190 | self._exe = util.findexe('svn') | ||
if not self._exe: | ||||
|
r26587 | raise error.Abort(_("'svn' executable not found for subrepo '%s'") | ||
|
r15190 | % self._path) | ||
|
r10178 | |||
|
r14664 | def _svncommand(self, commands, filename='', failok=False): | ||
|
r15190 | cmd = [self._exe] | ||
|
r14506 | extrakw = {} | ||
|
r23572 | if not self.ui.interactive(): | ||
|
r14506 | # Making stdin be a pipe should prevent svn from behaving | ||
# interactively even if we can't pass --non-interactive. | ||||
extrakw['stdin'] = subprocess.PIPE | ||||
# Starting in svn 1.5 --non-interactive is a global flag | ||||
# instead of being per-command, but we need to support 1.4 so | ||||
# we have to be intelligent about what commands take | ||||
# --non-interactive. | ||||
if commands[0] in ('update', 'checkout', 'commit'): | ||||
cmd.append('--non-interactive') | ||||
|
r14025 | cmd.extend(commands) | ||
|
r14050 | if filename is not None: | ||
|
r24675 | path = self.wvfs.reljoin(self._ctx.repo().origroot, | ||
self._path, filename) | ||||
|
r14050 | cmd.append(path) | ||
|
r10199 | env = dict(os.environ) | ||
|
r10271 | # Avoid localized output, preserve current locale for everything else. | ||
|
r17705 | lc_all = env.get('LC_ALL') | ||
if lc_all: | ||||
env['LANG'] = lc_all | ||||
del env['LC_ALL'] | ||||
|
r10271 | env['LC_MESSAGES'] = 'C' | ||
|
r13108 | p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds, | ||
|
r13014 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, | ||
|
r14506 | universal_newlines=True, env=env, **extrakw) | ||
|
r13014 | stdout, stderr = p.communicate() | ||
stderr = stderr.strip() | ||||
|
r14664 | if not failok: | ||
if p.returncode: | ||||
|
r26587 | raise error.Abort(stderr or 'exited with code %d' | ||
% p.returncode) | ||||
|
r14664 | if stderr: | ||
|
r23572 | self.ui.warn(stderr + '\n') | ||
|
r14664 | return stdout, stderr | ||
|
r10178 | |||
|
r14050 | @propertycache | ||
def _svnversion(self): | ||||
|
r17707 | output, err = self._svncommand(['--version', '--quiet'], filename=None) | ||
m = re.search(r'^(\d+)\.(\d+)', output) | ||||
|
r14050 | if not m: | ||
|
r26587 | raise error.Abort(_('cannot retrieve svn tool version')) | ||
|
r14050 | return (int(m.group(1)), int(m.group(2))) | ||
|
r13287 | def _wcrevs(self): | ||
# Get the working directory revision as well as the last | ||||
# commit revision so we can compare the subrepo state with | ||||
# both. We used to store the working directory one. | ||||
|
r14664 | output, err = self._svncommand(['info', '--xml']) | ||
|
r10272 | doc = xml.dom.minidom.parseString(output) | ||
entries = doc.getElementsByTagName('entry') | ||||
|
r13287 | lastrev, rev = '0', '0' | ||
if entries: | ||||
rev = str(entries[0].getAttribute('revision')) or '0' | ||||
commits = entries[0].getElementsByTagName('commit') | ||||
if commits: | ||||
lastrev = str(commits[0].getAttribute('revision')) or '0' | ||||
return (lastrev, rev) | ||||
def _wcrev(self): | ||||
return self._wcrevs()[0] | ||||
|
r10178 | |||
|
r10273 | def _wcchanged(self): | ||
|
r16530 | """Return (changes, extchanges, missing) where changes is True | ||
if the working directory was changed, extchanges is | ||||
True if any of these changes concern an external entry and missing | ||||
is True if any change is a missing entry. | ||||
|
r10273 | """ | ||
|
r14664 | output, err = self._svncommand(['status', '--xml']) | ||
|
r16530 | externals, changes, missing = [], [], [] | ||
|
r10272 | doc = xml.dom.minidom.parseString(output) | ||
|
r10273 | for e in doc.getElementsByTagName('entry'): | ||
s = e.getElementsByTagName('wc-status') | ||||
if not s: | ||||
continue | ||||
item = s[0].getAttribute('item') | ||||
props = s[0].getAttribute('props') | ||||
path = e.getAttribute('path') | ||||
if item == 'external': | ||||
externals.append(path) | ||||
|
r16530 | elif item == 'missing': | ||
missing.append(path) | ||||
|
r10273 | if (item not in ('', 'normal', 'unversioned', 'external') | ||
|
r14994 | or props not in ('', 'none', 'normal')): | ||
|
r10273 | changes.append(path) | ||
for path in changes: | ||||
for ext in externals: | ||||
if path == ext or path.startswith(ext + os.sep): | ||||
|
r16530 | return True, True, bool(missing) | ||
return bool(changes), False, bool(missing) | ||||
|
r10178 | |||
|
r13174 | def dirty(self, ignoreupdate=False): | ||
if not self._wcchanged()[0]: | ||||
|
r13288 | if self._state[1] in self._wcrevs() or ignoreupdate: | ||
|
r13174 | return False | ||
|
r10178 | return True | ||
|
r16072 | def basestate(self): | ||
|
r16554 | lastrev, rev = self._wcrevs() | ||
if lastrev != rev: | ||||
# Last committed rev is not the same than rev. We would | ||||
# like to take lastrev but we do not know if the subrepo | ||||
# URL exists at lastrev. Test it and fallback to rev it | ||||
# is not there. | ||||
try: | ||||
|
r17035 | self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) | ||
|
r16554 | return lastrev | ||
except error.Abort: | ||||
pass | ||||
return rev | ||||
|
r16072 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r10178 | def commit(self, text, user, date): | ||
# user and date are out of our hands since svn is centralized | ||||
|
r16530 | changed, extchanged, missing = self._wcchanged() | ||
|
r10273 | if not changed: | ||
|
r16554 | return self.basestate() | ||
|
r10273 | if extchanged: | ||
# Do not try to commit externals | ||||
|
r26587 | raise error.Abort(_('cannot commit svn externals')) | ||
|
r16530 | if missing: | ||
# svn can commit with missing entries but aborting like hg | ||||
# seems a better approach. | ||||
|
r26587 | raise error.Abort(_('cannot commit missing svn entries')) | ||
|
r14664 | commitinfo, err = self._svncommand(['commit', '-m', text]) | ||
|
r23572 | self.ui.status(commitinfo) | ||
|
r12060 | newrev = re.search('Committed revision ([0-9]+).', commitinfo) | ||
|
r10178 | if not newrev: | ||
|
r16529 | if not commitinfo.strip(): | ||
# Sometimes, our definition of "changed" differs from | ||||
# svn one. For instance, svn ignores missing files | ||||
# when committing. If there are only missing files, no | ||||
# commit is made, no output and no error code. | ||||
|
r26587 | raise error.Abort(_('failed to commit svn changes')) | ||
raise error.Abort(commitinfo.splitlines()[-1]) | ||||
|
r10178 | newrev = newrev.groups()[0] | ||
|
r23572 | self.ui.status(self._svncommand(['update', '-r', newrev])[0]) | ||
|
r10178 | return newrev | ||
|
r18109 | @annotatesubrepoerror | ||
|
r10178 | def remove(self): | ||
if self.dirty(): | ||||
|
r23572 | self.ui.warn(_('not removing repo %s because ' | ||
'it has changes.\n') % self._path) | ||||
|
r10178 | return | ||
|
r23572 | self.ui.note(_('removing subrepo %s\n') % self._path) | ||
|
r13013 | |||
|
r24690 | self.wvfs.rmtree(forcibly=True) | ||
|
r13015 | try: | ||
|
r25773 | pwvfs = self._ctx.repo().wvfs | ||
pwvfs.removedirs(pwvfs.dirname(self._path)) | ||||
|
r13015 | except OSError: | ||
pass | ||||
|
r10178 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r13322 | def get(self, state, overwrite=False): | ||
if overwrite: | ||||
|
r13332 | self._svncommand(['revert', '--recursive']) | ||
|
r14050 | args = ['checkout'] | ||
if self._svnversion >= (1, 5): | ||||
args.append('--force') | ||||
|
r14820 | # The revision must be specified at the end of the URL to properly | ||
# update to a directory which has since been deleted and recreated. | ||||
args.append('%s@%s' % (state[0], state[1])) | ||||
|
r14664 | status, err = self._svncommand(args, failok=True) | ||
|
r24724 | _sanitize(self.ui, self.wvfs, '.svn') | ||
|
r12060 | if not re.search('Checked out revision [0-9]+.', status): | ||
|
r14664 | if ('is already a working copy for a different URL' in err | ||
|
r16530 | and (self._wcchanged()[:2] == (False, False))): | ||
|
r14664 | # obstructed but clean working copy, so just blow it away. | ||
self.remove() | ||||
self.get(state, overwrite=False) | ||||
return | ||||
|
r26587 | raise error.Abort((status or err).splitlines()[-1]) | ||
|
r23572 | self.ui.status(status) | ||
|
r10178 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r10178 | def merge(self, state): | ||
|
r13417 | old = self._state[1] | ||
new = state[1] | ||||
|
r16555 | wcrev = self._wcrev() | ||
if new != wcrev: | ||||
dirty = old == wcrev or self._wcchanged()[0] | ||||
|
r23572 | if _updateprompt(self.ui, self, dirty, wcrev, new): | ||
|
r13417 | self.get(state, False) | ||
|
r10178 | |||
|
r15708 | def push(self, opts): | ||
|
r11455 | # push is a no-op for SVN | ||
return True | ||||
|
r10178 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r12322 | def files(self): | ||
|
r16450 | output = self._svncommand(['list', '--recursive', '--xml'])[0] | ||
doc = xml.dom.minidom.parseString(output) | ||||
paths = [] | ||||
for e in doc.getElementsByTagName('entry'): | ||||
kind = str(e.getAttribute('kind')) | ||||
if kind != 'file': | ||||
continue | ||||
name = ''.join(c.data for c | ||||
in e.getElementsByTagName('name')[0].childNodes | ||||
if c.nodeType == c.TEXT_NODE) | ||||
|
r17441 | paths.append(name.encode('utf-8')) | ||
|
r16450 | return paths | ||
|
r12322 | |||
def filedata(self, name): | ||||
|
r16450 | return self._svncommand(['cat'], name)[0] | ||
|
r12322 | |||
|
r13106 | class gitsubrepo(abstractsubrepo): | ||
|
r12992 | def __init__(self, ctx, path, state): | ||
|
r24671 | super(gitsubrepo, self).__init__(ctx, path) | ||
|
r12992 | self._state = state | ||
|
r24302 | self._abspath = ctx.repo().wjoin(path) | ||
self._subparent = ctx.repo() | ||||
|
r17024 | self._ensuregit() | ||
def _ensuregit(self): | ||||
|
r17025 | try: | ||
self._gitexecutable = 'git' | ||||
out, err = self._gitnodir(['--version']) | ||||
|
r25660 | except OSError as e: | ||
|
r17025 | if e.errno != 2 or os.name != 'nt': | ||
raise | ||||
self._gitexecutable = 'git.cmd' | ||||
out, err = self._gitnodir(['--version']) | ||||
|
r20840 | versionstatus = self._checkversion(out) | ||
if versionstatus == 'unknown': | ||||
|
r23572 | self.ui.warn(_('cannot retrieve git version\n')) | ||
|
r20840 | elif versionstatus == 'abort': | ||
|
r26587 | raise error.Abort(_('git subrepo requires at least 1.6.0 or later')) | ||
|
r20840 | elif versionstatus == 'warning': | ||
|
r23572 | self.ui.warn(_('git subrepo requires at least 1.6.0 or later\n')) | ||
|
r20840 | |||
@staticmethod | ||||
|
r23521 | def _gitversion(out): | ||
|
r23522 | m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) | ||
if m: | ||||
return (int(m.group(1)), int(m.group(2)), int(m.group(3))) | ||||
|
r23521 | m = re.search(r'^git version (\d+)\.(\d+)', out) | ||
if m: | ||||
|
r23522 | return (int(m.group(1)), int(m.group(2)), 0) | ||
|
r23521 | |||
return -1 | ||||
@staticmethod | ||||
|
r20840 | def _checkversion(out): | ||
'''ensure git version is new enough | ||||
>>> _checkversion = gitsubrepo._checkversion | ||||
>>> _checkversion('git version 1.6.0') | ||||
'ok' | ||||
>>> _checkversion('git version 1.8.5') | ||||
'ok' | ||||
>>> _checkversion('git version 1.4.0') | ||||
'abort' | ||||
>>> _checkversion('git version 1.5.0') | ||||
'warning' | ||||
>>> _checkversion('git version 1.9-rc0') | ||||
'ok' | ||||
>>> _checkversion('git version 1.9.0.265.g81cdec2') | ||||
'ok' | ||||
>>> _checkversion('git version 1.9.0.GIT') | ||||
'ok' | ||||
>>> _checkversion('git version 12345') | ||||
'unknown' | ||||
>>> _checkversion('no') | ||||
'unknown' | ||||
''' | ||||
|
r23521 | version = gitsubrepo._gitversion(out) | ||
|
r17024 | # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, | ||
# despite the docstring comment. For now, error on 1.4.0, warn on | ||||
# 1.5.0 but attempt to continue. | ||||
|
r23521 | if version == -1: | ||
return 'unknown' | ||||
|
r23522 | if version < (1, 5, 0): | ||
|
r20840 | return 'abort' | ||
|
r23522 | elif version < (1, 6, 0): | ||
|
r20840 | return 'warning' | ||
return 'ok' | ||||
|
r12992 | |||
|
r13095 | def _gitcommand(self, commands, env=None, stream=False): | ||
return self._gitdir(commands, env=env, stream=stream)[0] | ||||
|
r12992 | |||
|
r13095 | def _gitdir(self, commands, env=None, stream=False): | ||
|
r13181 | return self._gitnodir(commands, env=env, stream=stream, | ||
cwd=self._abspath) | ||||
|
r12992 | |||
|
r13095 | def _gitnodir(self, commands, env=None, stream=False, cwd=None): | ||
|
r12992 | """Calls the git command | ||
|
r17424 | The methods tries to call the git command. versions prior to 1.6.0 | ||
|
r12992 | are not supported and very probably fail. | ||
""" | ||||
|
r23572 | self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) | ||
|
r13111 | # unless ui.quiet is set, print git's stderr, | ||
# which is mostly progress and useful info | ||||
errpipe = None | ||||
|
r23572 | if self.ui.quiet: | ||
|
r13111 | errpipe = open(os.devnull, 'w') | ||
|
r17025 | p = subprocess.Popen([self._gitexecutable] + commands, bufsize=-1, | ||
cwd=cwd, env=env, close_fds=util.closefds, | ||||
|
r13111 | stdout=subprocess.PIPE, stderr=errpipe) | ||
|
r13027 | if stream: | ||
return p.stdout, None | ||||
|
r13085 | retdata = p.stdout.read().strip() | ||
|
r12992 | # wait for the child to exit to avoid race condition. | ||
p.wait() | ||||
|
r13107 | if p.returncode != 0 and p.returncode != 1: | ||
|
r12992 | # there are certain error codes that are ok | ||
|
r13110 | command = commands[0] | ||
|
r13150 | if command in ('cat-file', 'symbolic-ref'): | ||
|
r12992 | return retdata, p.returncode | ||
# for all others, abort | ||||
|
r26587 | raise error.Abort('git %s error %d in %s' % | ||
|
r13110 | (command, p.returncode, self._relpath)) | ||
|
r12992 | |||
return retdata, p.returncode | ||||
|
r13553 | def _gitmissing(self): | ||
|
r24695 | return not self.wvfs.exists('.git') | ||
|
r13553 | |||
|
r12992 | def _gitstate(self): | ||
|
r13085 | return self._gitcommand(['rev-parse', 'HEAD']) | ||
|
r12992 | |||
|
r13152 | def _gitcurrentbranch(self): | ||
current, err = self._gitdir(['symbolic-ref', 'HEAD', '--quiet']) | ||||
if err: | ||||
current = None | ||||
return current | ||||
|
r13569 | def _gitremote(self, remote): | ||
out = self._gitcommand(['remote', 'show', '-n', remote]) | ||||
line = out.split('\n')[1] | ||||
i = line.index('URL: ') + len('URL: ') | ||||
return line[i:] | ||||
|
r12992 | def _githavelocally(self, revision): | ||
out, code = self._gitdir(['cat-file', '-e', revision]) | ||||
return code == 0 | ||||
|
r13029 | def _gitisancestor(self, r1, r2): | ||
|
r13085 | base = self._gitcommand(['merge-base', r1, r2]) | ||
|
r13029 | return base == r1 | ||
|
r14440 | def _gitisbare(self): | ||
return self._gitcommand(['config', '--bool', 'core.bare']) == 'true' | ||||
|
r15531 | def _gitupdatestat(self): | ||
"""This must be run before git diff-index. | ||||
diff-index only looks at changes to file stat; | ||||
this command looks at file contents and updates the stat.""" | ||||
self._gitcommand(['update-index', '-q', '--refresh']) | ||||
|
r12995 | def _gitbranchmap(self): | ||
|
r13178 | '''returns 2 things: | ||
|
r13086 | a map from git branch to revision | ||
|
r13178 | a map from revision to branches''' | ||
|
r13086 | branch2rev = {} | ||
rev2branch = {} | ||||
|
r13178 | |||
|
r13150 | out = self._gitcommand(['for-each-ref', '--format', | ||
|
r13178 | '%(objectname) %(refname)']) | ||
|
r12995 | for line in out.split('\n'): | ||
|
r13178 | revision, ref = line.split(' ') | ||
|
r13465 | if (not ref.startswith('refs/heads/') and | ||
not ref.startswith('refs/remotes/')): | ||||
|
r12995 | continue | ||
|
r13150 | if ref.startswith('refs/remotes/') and ref.endswith('/HEAD'): | ||
|
r12995 | continue # ignore remote/HEAD redirects | ||
|
r13150 | branch2rev[ref] = revision | ||
rev2branch.setdefault(revision, []).append(ref) | ||||
|
r13178 | return branch2rev, rev2branch | ||
def _gittracking(self, branches): | ||||
'return map of remote branch to local tracking branch' | ||||
# assumes no more than one local tracking branch for each remote | ||||
tracking = {} | ||||
for b in branches: | ||||
if b.startswith('refs/remotes/'): | ||||
continue | ||||
|
r15234 | bname = b.split('/', 2)[2] | ||
remote = self._gitcommand(['config', 'branch.%s.remote' % bname]) | ||||
|
r13178 | if remote: | ||
|
r15234 | ref = self._gitcommand(['config', 'branch.%s.merge' % bname]) | ||
|
r13178 | tracking['refs/remotes/%s/%s' % | ||
(remote, ref.split('/', 2)[2])] = b | ||||
return tracking | ||||
|
r13087 | |||
|
r13460 | def _abssource(self, source): | ||
|
r13692 | if '://' not in source: | ||
# recognize the scp syntax as an absolute source | ||||
colon = source.find(':') | ||||
if colon != -1 and '/' not in source[:colon]: | ||||
return source | ||||
|
r13460 | self._subsource = source | ||
return _abssource(self) | ||||
|
r12993 | def _fetch(self, source, revision): | ||
|
r13553 | if self._gitmissing(): | ||
|
r13525 | source = self._abssource(source) | ||
|
r23572 | self.ui.status(_('cloning subrepo %s from %s\n') % | ||
|
r13525 | (self._relpath, source)) | ||
self._gitnodir(['clone', source, self._abspath]) | ||||
|
r12993 | if self._githavelocally(revision): | ||
return | ||||
|
r23572 | self.ui.status(_('pulling subrepo %s from %s\n') % | ||
|
r13569 | (self._relpath, self._gitremote('origin'))) | ||
|
r13466 | # try only origin: the originally cloned repo | ||
|
r13097 | self._gitcommand(['fetch']) | ||
|
r12993 | if not self._githavelocally(revision): | ||
|
r26587 | raise error.Abort(_("revision %s does not exist in subrepo %s\n") % | ||
|
r13181 | (revision, self._relpath)) | ||
|
r12993 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r13179 | def dirty(self, ignoreupdate=False): | ||
|
r13553 | if self._gitmissing(): | ||
|
r14469 | return self._state[1] != '' | ||
|
r14440 | if self._gitisbare(): | ||
return True | ||||
|
r13179 | if not ignoreupdate and self._state[1] != self._gitstate(): | ||
|
r13325 | # different version checked out | ||
|
r12992 | return True | ||
# check for staged changes or modified files; ignore untracked files | ||||
|
r15531 | self._gitupdatestat() | ||
|
r13153 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) | ||
return code == 1 | ||||
|
r12992 | |||
|
r16072 | def basestate(self): | ||
return self._gitstate() | ||||
|
r18109 | @annotatesubrepoerror | ||
|
r13323 | def get(self, state, overwrite=False): | ||
|
r12993 | source, revision, kind = state | ||
|
r14469 | if not revision: | ||
self.remove() | ||||
return | ||||
|
r12993 | self._fetch(source, revision) | ||
|
r12996 | # if the repo was set to be bare, unbare it | ||
|
r14440 | if self._gitisbare(): | ||
|
r12996 | self._gitcommand(['config', 'core.bare', 'false']) | ||
if self._gitstate() == revision: | ||||
self._gitcommand(['reset', '--hard', 'HEAD']) | ||||
return | ||||
elif self._gitstate() == revision: | ||||
|
r13324 | if overwrite: | ||
|
r13927 | # first reset the index to unmark new files for commit, because | ||
|
r13324 | # reset --hard will otherwise throw away files added for commit, | ||
# not just unmark them. | ||||
self._gitcommand(['reset', 'HEAD']) | ||||
self._gitcommand(['reset', '--hard', 'HEAD']) | ||||
|
r12995 | return | ||
|
r13178 | branch2rev, rev2branch = self._gitbranchmap() | ||
|
r13087 | |||
|
r13324 | def checkout(args): | ||
cmd = ['checkout'] | ||||
if overwrite: | ||||
# first reset the index to unmark new files for commit, because | ||||
# the -f option will otherwise throw away files added for | ||||
# commit, not just unmark them. | ||||
self._gitcommand(['reset', 'HEAD']) | ||||
cmd.append('-f') | ||||
self._gitcommand(cmd + args) | ||||
|
r24724 | _sanitize(self.ui, self.wvfs, '.git') | ||
|
r13324 | |||
|
r13087 | def rawcheckout(): | ||
|
r12995 | # no branch to checkout, check it out with no branch | ||
|
r23572 | self.ui.warn(_('checking out detached HEAD in subrepo %s\n') % | ||
|
r12993 | self._relpath) | ||
|
r23572 | self.ui.warn(_('check out a git branch if you intend ' | ||
|
r12993 | 'to make changes\n')) | ||
|
r13324 | checkout(['-q', revision]) | ||
|
r13087 | |||
if revision not in rev2branch: | ||||
rawcheckout() | ||||
|
r12995 | return | ||
|
r13086 | branches = rev2branch[revision] | ||
|
r12995 | firstlocalbranch = None | ||
for b in branches: | ||||
|
r13150 | if b == 'refs/heads/master': | ||
|
r12995 | # master trumps all other branches | ||
|
r13324 | checkout(['refs/heads/master']) | ||
|
r12995 | return | ||
|
r13150 | if not firstlocalbranch and not b.startswith('refs/remotes/'): | ||
|
r12995 | firstlocalbranch = b | ||
if firstlocalbranch: | ||||
|
r13324 | checkout([firstlocalbranch]) | ||
|
r13087 | return | ||
|
r13178 | tracking = self._gittracking(branch2rev.keys()) | ||
|
r13087 | # choose a remote branch already tracked if possible | ||
remote = branches[0] | ||||
if remote not in tracking: | ||||
for b in branches: | ||||
if b in tracking: | ||||
remote = b | ||||
break | ||||
if remote not in tracking: | ||||
# create a new local tracking branch | ||||
|
r19012 | local = remote.split('/', 3)[3] | ||
|
r13324 | checkout(['-b', local, remote]) | ||
|
r13087 | elif self._gitisancestor(branch2rev[tracking[remote]], remote): | ||
# When updating to a tracked remote branch, | ||||
# if the local tracking branch is downstream of it, | ||||
# a normal `git pull` would have performed a "fast-forward merge" | ||||
# which is equivalent to updating the local branch to the remote. | ||||
# Since we are only looking at branching at update, we need to | ||||
# detect this situation and perform this action lazily. | ||||
|
r13152 | if tracking[remote] != self._gitcurrentbranch(): | ||
|
r13324 | checkout([tracking[remote]]) | ||
|
r13087 | self._gitcommand(['merge', '--ff', remote]) | ||
|
r24724 | _sanitize(self.ui, self.wvfs, '.git') | ||
|
r13087 | else: | ||
# a real merge would be required, just checkout the revision | ||||
rawcheckout() | ||||
|
r12993 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r12992 | def commit(self, text, user, date): | ||
|
r13553 | if self._gitmissing(): | ||
|
r26587 | raise error.Abort(_("subrepo %s is missing") % self._relpath) | ||
|
r12992 | cmd = ['commit', '-a', '-m', text] | ||
|
r13095 | env = os.environ.copy() | ||
|
r12992 | if user: | ||
cmd += ['--author', user] | ||||
if date: | ||||
# git's date parser silently ignores when seconds < 1e9 | ||||
# convert to ISO8601 | ||||
|
r13095 | env['GIT_AUTHOR_DATE'] = util.datestr(date, | ||
'%Y-%m-%dT%H:%M:%S %1%2') | ||||
self._gitcommand(cmd, env=env) | ||||
|
r12992 | # make sure commit works otherwise HEAD might not exist under certain | ||
# circumstances | ||||
return self._gitstate() | ||||
|
r18109 | @annotatesubrepoerror | ||
|
r12994 | def merge(self, state): | ||
source, revision, kind = state | ||||
self._fetch(source, revision) | ||||
|
r13085 | base = self._gitcommand(['merge-base', revision, self._state[1]]) | ||
|
r15531 | self._gitupdatestat() | ||
|
r13417 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) | ||
def mergefunc(): | ||||
if base == revision: | ||||
self.get(state) # fast forward merge | ||||
elif base != self._state[1]: | ||||
self._gitcommand(['merge', '--no-commit', revision]) | ||||
|
r24724 | _sanitize(self.ui, self.wvfs, '.git') | ||
|
r13417 | |||
if self.dirty(): | ||||
if self._gitstate() != revision: | ||||
dirty = self._gitstate() == self._state[1] or code != 0 | ||||
|
r23572 | if _updateprompt(self.ui, self, dirty, | ||
|
r13432 | self._state[1][:7], revision[:7]): | ||
|
r13417 | mergefunc() | ||
else: | ||||
mergefunc() | ||||
|
r12994 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r15708 | def push(self, opts): | ||
force = opts.get('force') | ||||
|
r14469 | if not self._state[1]: | ||
return True | ||||
|
r13553 | if self._gitmissing(): | ||
|
r26587 | raise error.Abort(_("subrepo %s is missing") % self._relpath) | ||
|
r13029 | # if a branch in origin contains the revision, nothing to do | ||
|
r13178 | branch2rev, rev2branch = self._gitbranchmap() | ||
|
r13109 | if self._state[1] in rev2branch: | ||
for b in rev2branch[self._state[1]]: | ||||
|
r13150 | if b.startswith('refs/remotes/origin/'): | ||
|
r13109 | return True | ||
|
r13086 | for b, revision in branch2rev.iteritems(): | ||
|
r13150 | if b.startswith('refs/remotes/origin/'): | ||
|
r13086 | if self._gitisancestor(self._state[1], revision): | ||
return True | ||||
|
r13029 | # otherwise, try to push the currently checked out branch | ||
|
r12994 | cmd = ['push'] | ||
if force: | ||||
cmd.append('--force') | ||||
|
r13152 | |||
current = self._gitcurrentbranch() | ||||
|
r12995 | if current: | ||
|
r13029 | # determine if the current branch is even useful | ||
if not self._gitisancestor(self._state[1], current): | ||||
|
r23572 | self.ui.warn(_('unrelated git branch checked out ' | ||
|
r13029 | 'in subrepo %s\n') % self._relpath) | ||
return False | ||||
|
r23572 | self.ui.status(_('pushing branch %s of subrepo %s\n') % | ||
(current.split('/', 2)[2], self._relpath)) | ||||
|
r20970 | ret = self._gitdir(cmd + ['origin', current]) | ||
return ret[1] == 0 | ||||
|
r12995 | else: | ||
|
r23572 | self.ui.warn(_('no branch checked out in subrepo %s\n' | ||
'cannot push revision %s\n') % | ||||
|
r13029 | (self._relpath, self._state[1])) | ||
|
r12995 | return False | ||
|
r12994 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r24174 | def add(self, ui, match, prefix, explicitonly, **opts): | ||
if self._gitmissing(): | ||||
return [] | ||||
|
r24182 | |||
(modified, added, removed, | ||||
|
r24209 | deleted, unknown, ignored, clean) = self.status(None, unknown=True, | ||
clean=True) | ||||
|
r24174 | |||
|
r24183 | tracked = set() | ||
# dirstates 'amn' warn, 'r' is added again | ||||
for l in (modified, added, deleted, clean): | ||||
tracked.update(l) | ||||
|
r24182 | # Unknown files not of interest will be rejected by the matcher | ||
files = unknown | ||||
files.extend(match.files()) | ||||
|
r24183 | rejected = [] | ||
|
r24182 | files = [f for f in sorted(set(files)) if match(f)] | ||
|
r24174 | for f in files: | ||
exact = match.exact(f) | ||||
command = ["add"] | ||||
if exact: | ||||
command.append("-f") #should be added, even if ignored | ||||
if ui.verbose or not exact: | ||||
ui.status(_('adding %s\n') % match.rel(f)) | ||||
|
r24183 | |||
if f in tracked: # hg prints 'adding' even if already tracked | ||||
if exact: | ||||
rejected.append(f) | ||||
continue | ||||
|
r24174 | if not opts.get('dry_run'): | ||
self._gitcommand(command + [f]) | ||||
|
r24183 | |||
for f in rejected: | ||||
ui.warn(_("%s already tracked!\n") % match.abs(f)) | ||||
return rejected | ||||
|
r24174 | |||
@annotatesubrepoerror | ||||
|
r12996 | def remove(self): | ||
|
r13553 | if self._gitmissing(): | ||
return | ||||
|
r12996 | if self.dirty(): | ||
|
r23572 | self.ui.warn(_('not removing repo %s because ' | ||
'it has changes.\n') % self._relpath) | ||||
|
r12996 | return | ||
# we can't fully delete the repository as it may contain | ||||
# local-only history | ||||
|
r23572 | self.ui.note(_('removing subrepo %s\n') % self._relpath) | ||
|
r12996 | self._gitcommand(['config', 'core.bare', 'true']) | ||
|
r24688 | for f, kind in self.wvfs.readdir(): | ||
|
r12996 | if f == '.git': | ||
continue | ||||
|
r24688 | if kind == stat.S_IFDIR: | ||
|
r24690 | self.wvfs.rmtree(f) | ||
|
r12996 | else: | ||
|
r24691 | self.wvfs.unlink(f) | ||
|
r12996 | |||
|
r23575 | def archive(self, archiver, prefix, match=None): | ||
|
r18967 | total = 0 | ||
|
r13027 | source, revision = self._state | ||
|
r14469 | if not revision: | ||
|
r18967 | return total | ||
|
r13027 | self._fetch(source, revision) | ||
# Parse git's native archive command. | ||||
# This should be much faster than manually traversing the trees | ||||
# and objects with many subprocess calls. | ||||
tarstream = self._gitcommand(['archive', revision], stream=True) | ||||
tar = tarfile.open(fileobj=tarstream, mode='r|') | ||||
|
r13144 | relpath = subrelpath(self) | ||
|
r23575 | self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files')) | ||
|
r13144 | for i, info in enumerate(tar): | ||
|
r13180 | if info.isdir(): | ||
continue | ||||
|
r17108 | if match and not match(info.name): | ||
continue | ||||
|
r13180 | if info.issym(): | ||
data = info.linkname | ||||
else: | ||||
data = tar.extractfile(info).read() | ||||
|
r24924 | archiver.addfile(prefix + self._path + '/' + info.name, | ||
|
r13180 | info.mode, info.issym(), data) | ||
|
r18967 | total += 1 | ||
|
r23575 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, | ||
unit=_('files')) | ||||
self.ui.progress(_('archiving (%s)') % relpath, None) | ||||
|
r18967 | return total | ||
|
r13144 | |||
|
r13027 | |||
|
r18109 | @annotatesubrepoerror | ||
|
r23991 | def cat(self, match, prefix, **opts): | ||
rev = self._state[1] | ||||
if match.anypats(): | ||||
return 1 #No support for include/exclude yet | ||||
if not match.files(): | ||||
return 1 | ||||
for f in match.files(): | ||||
output = self._gitcommand(["show", "%s:%s" % (rev, f)]) | ||||
fp = cmdutil.makefileobj(self._subparent, opts.get('output'), | ||||
self._ctx.node(), | ||||
|
r24675 | pathname=self.wvfs.reljoin(prefix, f)) | ||
|
r23991 | fp.write(output) | ||
fp.close() | ||||
return 0 | ||||
@annotatesubrepoerror | ||||
|
r13182 | def status(self, rev2, **opts): | ||
|
r14469 | rev1 = self._state[1] | ||
if self._gitmissing() or not rev1: | ||||
|
r13553 | # if the repo is missing, return no results | ||
|
r24210 | return scmutil.status([], [], [], [], [], [], []) | ||
|
r13182 | modified, added, removed = [], [], [] | ||
|
r15531 | self._gitupdatestat() | ||
|
r13182 | if rev2: | ||
|
r24943 | command = ['diff-tree', '-r', rev1, rev2] | ||
|
r13182 | else: | ||
command = ['diff-index', rev1] | ||||
out = self._gitcommand(command) | ||||
for line in out.split('\n'): | ||||
tab = line.find('\t') | ||||
if tab == -1: | ||||
continue | ||||
status, f = line[tab - 1], line[tab + 1:] | ||||
if status == 'M': | ||||
modified.append(f) | ||||
elif status == 'A': | ||||
added.append(f) | ||||
elif status == 'D': | ||||
removed.append(f) | ||||
|
r22927 | deleted, unknown, ignored, clean = [], [], [], [] | ||
|
r23411 | |||
|
r24256 | command = ['status', '--porcelain', '-z'] | ||
|
r24211 | if opts.get('unknown'): | ||
|
r24256 | command += ['--untracked-files=all'] | ||
if opts.get('ignored'): | ||||
command += ['--ignored'] | ||||
out = self._gitcommand(command) | ||||
changedfiles = set() | ||||
changedfiles.update(modified) | ||||
changedfiles.update(added) | ||||
changedfiles.update(removed) | ||||
for line in out.split('\0'): | ||||
if not line: | ||||
continue | ||||
st = line[0:2] | ||||
#moves and copies show 2 files on one line | ||||
if line.find('\0') >= 0: | ||||
filename1, filename2 = line[3:].split('\0') | ||||
else: | ||||
filename1 = line[3:] | ||||
filename2 = None | ||||
changedfiles.add(filename1) | ||||
if filename2: | ||||
changedfiles.add(filename2) | ||||
if st == '??': | ||||
unknown.append(filename1) | ||||
elif st == '!!': | ||||
ignored.append(filename1) | ||||
if opts.get('clean'): | ||||
out = self._gitcommand(['ls-files']) | ||||
for f in out.split('\n'): | ||||
if not f in changedfiles: | ||||
clean.append(f) | ||||
|
r23411 | |||
|
r22914 | return scmutil.status(modified, added, removed, deleted, | ||
unknown, ignored, clean) | ||||
|
r13182 | |||
|
r23523 | @annotatesubrepoerror | ||
def diff(self, ui, diffopts, node2, match, prefix, **opts): | ||||
node1 = self._state[1] | ||||
cmd = ['diff'] | ||||
if opts['stat']: | ||||
cmd.append('--stat') | ||||
else: | ||||
# for Git, this also implies '-p' | ||||
cmd.append('-U%d' % diffopts.context) | ||||
|
r24675 | gitprefix = self.wvfs.reljoin(prefix, self._path) | ||
|
r23523 | |||
if diffopts.noprefix: | ||||
cmd.extend(['--src-prefix=%s/' % gitprefix, | ||||
'--dst-prefix=%s/' % gitprefix]) | ||||
else: | ||||
cmd.extend(['--src-prefix=a/%s/' % gitprefix, | ||||
'--dst-prefix=b/%s/' % gitprefix]) | ||||
if diffopts.ignorews: | ||||
cmd.append('--ignore-all-space') | ||||
if diffopts.ignorewsamount: | ||||
cmd.append('--ignore-space-change') | ||||
if self._gitversion(self._gitcommand(['--version'])) >= (1, 8, 4) \ | ||||
and diffopts.ignoreblanklines: | ||||
cmd.append('--ignore-blank-lines') | ||||
cmd.append(node1) | ||||
if node2: | ||||
cmd.append(node2) | ||||
|
r23938 | output = "" | ||
|
r23523 | if match.always(): | ||
|
r23938 | output += self._gitcommand(cmd) + '\n' | ||
|
r24778 | else: | ||
st = self.status(node2)[:3] | ||||
files = [f for sublist in st for f in sublist] | ||||
for f in files: | ||||
if match(f): | ||||
output += self._gitcommand(cmd + ['--', f]) + '\n' | ||||
|
r23938 | |||
if output.strip(): | ||||
ui.write(output) | ||||
|
r23523 | |||
|
r23679 | @annotatesubrepoerror | ||
|
r23580 | def revert(self, substate, *pats, **opts): | ||
self.ui.status(_('reverting subrepo %s\n') % substate[0]) | ||||
|
r23550 | if not opts.get('no_backup'): | ||
|
r23678 | status = self.status(None) | ||
names = status.modified | ||||
for name in names: | ||||
|
r27651 | bakname = scmutil.origpath(self.ui, self._subparent, name) | ||
|
r23678 | self.ui.note(_('saving current version of %s as %s\n') % | ||
(name, bakname)) | ||||
|
r24695 | self.wvfs.rename(name, bakname) | ||
|
r23550 | |||
|
r24134 | if not opts.get('dry_run'): | ||
self.get(substate, overwrite=True) | ||||
|
r23550 | return [] | ||
|
r21400 | def shortid(self, revid): | ||
return revid[:7] | ||||
|
r10177 | types = { | ||
'hg': hgsubrepo, | ||||
|
r10178 | 'svn': svnsubrepo, | ||
|
r12992 | 'git': gitsubrepo, | ||
|
r10177 | } | ||