hg.py
1443 lines
| 45.9 KiB
| text/x-python
|
PythonLexer
/ mercurial / hg.py
|
r0 | # hg.py - repository classes for mercurial | ||
# | ||||
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
|
r2859 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | ||
|
r0 | # | ||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r0 | |||
|
r25939 | from __future__ import absolute_import | ||
import errno | ||||
import os | ||||
import shutil | ||||
|
r36799 | import stat | ||
|
r25939 | |||
from .i18n import _ | ||||
|
r43346 | from .node import nullid | ||
|
r43359 | from .pycompat import getattr | ||
|
r22837 | |||
|
r25939 | from . import ( | ||
bookmarks, | ||||
bundlerepo, | ||||
|
r35784 | cacheutil, | ||
|
r25939 | cmdutil, | ||
|
r28501 | destutil, | ||
|
r25939 | discovery, | ||
error, | ||||
exchange, | ||||
extensions, | ||||
httppeer, | ||||
localrepo, | ||||
lock, | ||||
|
r35906 | logcmdutil, | ||
|
r35348 | logexchange, | ||
|
r25939 | merge as mergemod, | ||
|
r39586 | narrowspec, | ||
|
r25939 | node, | ||
phases, | ||||
|
r41625 | pycompat, | ||
|
r25939 | scmutil, | ||
sshpeer, | ||||
statichttprepo, | ||||
ui as uimod, | ||||
unionrepo, | ||||
url, | ||||
util, | ||||
verify as verifymod, | ||||
|
r31218 | vfs as vfsmod, | ||
|
r25939 | ) | ||
|
r44517 | from .utils import hashutil | ||
|
r43346 | from .interfaces import repository as repositorymod | ||
|
r43078 | |||
|
r25939 | release = lock.release | ||
|
r0 | |||
|
r29424 | # shared features | ||
|
r43347 | sharedbookmarks = b'bookmarks' | ||
|
r29424 | |||
|
r43346 | |||
|
r2740 | def _local(path): | ||
|
r14825 | path = util.expandpath(util.urllocalpath(path)) | ||
|
r41625 | |||
try: | ||||
isfile = os.path.isfile(path) | ||||
# Python 2 raises TypeError, Python 3 ValueError. | ||||
except (TypeError, ValueError) as e: | ||||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b'invalid path %s: %s') % (path, pycompat.bytestr(e)) | ||
|
r43346 | ) | ||
|
r41625 | |||
return isfile and bundlerepo or localrepo | ||||
|
r2469 | |||
|
r43346 | |||
|
r17191 | def addbranchrevs(lrepo, other, branches, revs): | ||
|
r43346 | peer = other.peer() # a courtesy to callers using a localrepo for other | ||
|
r11322 | hashbranch, branches = branches | ||
if not hashbranch and not branches: | ||||
|
r22818 | x = revs or None | ||
|
r37499 | if revs: | ||
|
r22818 | y = revs[0] | ||
else: | ||||
y = None | ||||
return x, y | ||||
|
r24306 | if revs: | ||
revs = list(revs) | ||||
else: | ||||
revs = [] | ||||
|
r43347 | if not peer.capable(b'branchmap'): | ||
|
r11322 | if branches: | ||
|
r43347 | raise error.Abort(_(b"remote branch lookup not supported")) | ||
|
r11322 | revs.append(hashbranch) | ||
|
r10380 | return revs, revs[0] | ||
|
r37658 | |||
with peer.commandexecutor() as e: | ||||
|
r43347 | branchmap = e.callcommand(b'branchmap', {}).result() | ||
|
r11322 | |||
|
r13047 | def primary(branch): | ||
|
r43347 | if branch == b'.': | ||
|
r17191 | if not lrepo: | ||
|
r43347 | raise error.Abort(_(b"dirstate branch not accessible")) | ||
|
r13047 | branch = lrepo.dirstate.branch() | ||
if branch in branchmap: | ||||
revs.extend(node.hex(r) for r in reversed(branchmap[branch])) | ||||
|
r11322 | return True | ||
|
r10365 | else: | ||
|
r11322 | return False | ||
for branch in branches: | ||||
|
r13047 | if not primary(branch): | ||
|
r43347 | raise error.RepoLookupError(_(b"unknown branch '%s'") % branch) | ||
|
r11322 | if hashbranch: | ||
|
r13047 | if not primary(hashbranch): | ||
|
r11322 | revs.append(hashbranch) | ||
|
r10365 | return revs, revs[0] | ||
|
r43346 | |||
|
r13824 | def parseurl(path, branches=None): | ||
|
r11322 | '''parse url#branch, returning (url, (branch, branches))''' | ||
|
r5177 | |||
|
r14076 | u = util.url(path) | ||
|
r13897 | branch = None | ||
if u.fragment: | ||||
branch = u.fragment | ||||
u.fragment = None | ||||
|
r31841 | return bytes(u), (branch, branches or []) | ||
|
r5177 | |||
|
r43346 | |||
|
r14606 | schemes = { | ||
|
r43347 | b'bundle': bundlerepo, | ||
b'union': unionrepo, | ||||
b'file': _local, | ||||
b'http': httppeer, | ||||
b'https': httppeer, | ||||
b'ssh': sshpeer, | ||||
b'static-http': statichttprepo, | ||||
|
r14568 | } | ||
|
r43346 | |||
|
r14568 | def _peerlookup(path): | ||
u = util.url(path) | ||||
|
r43347 | scheme = u.scheme or b'file' | ||
thing = schemes.get(scheme) or schemes[b'file'] | ||||
|
r14568 | try: | ||
return thing(path) | ||||
except TypeError: | ||||
|
r25365 | # we can't test callable(thing) because 'thing' can be an unloaded | ||
# module that implements __call__ | ||||
|
r43347 | if not util.safehasattr(thing, b'instance'): | ||
|
r25365 | raise | ||
|
r14568 | return thing | ||
|
r43346 | |||
|
r14605 | def islocal(repo): | ||
|
r20355 | '''return true if repo (or path pointing to repo) is local''' | ||
|
r33018 | if isinstance(repo, bytes): | ||
|
r14605 | try: | ||
return _peerlookup(repo).islocal(repo) | ||||
except AttributeError: | ||||
return False | ||||
return repo.local() | ||||
|
r43346 | |||
|
r42278 | def openpath(ui, path, sendaccept=True): | ||
|
r17887 | '''open path with open if local, url.open if remote''' | ||
|
r20354 | pathurl = util.url(path, parsequery=False, parsefragment=False) | ||
if pathurl.islocal(): | ||||
|
r43347 | return util.posixfile(pathurl.localpath(), b'rb') | ||
|
r17887 | else: | ||
|
r42278 | return url.open(ui, path, sendaccept=sendaccept) | ||
|
r17887 | |||
|
r43346 | |||
|
r20858 | # a list of (ui, repo) functions called for wire peer initialization | ||
wirepeersetupfuncs = [] | ||||
|
r43346 | |||
def _peerorrepo( | ||||
ui, path, create=False, presetupfuncs=None, intents=None, createopts=None | ||||
): | ||||
|
r14605 | """return a repository object for the specified path""" | ||
|
r43346 | obj = _peerlookup(path).instance( | ||
ui, path, create, intents=intents, createopts=createopts | ||||
) | ||||
|
r17191 | ui = getattr(obj, "ui", ui) | ||
|
r32379 | for f in presetupfuncs or []: | ||
f(ui, obj) | ||||
|
r41032 | ui.log(b'extension', b'- executing reposetup hooks\n') | ||
|
r43532 | with util.timedcm('all reposetup') as allreposetupstats: | ||
|
r39546 | for name, module in extensions.extensions(ui): | ||
|
r41032 | ui.log(b'extension', b' - running reposetup for %s\n', name) | ||
|
r39546 | hook = getattr(module, 'reposetup', None) | ||
if hook: | ||||
|
r43532 | with util.timedcm('reposetup %r', name) as stats: | ||
|
r39546 | hook(ui, obj) | ||
|
r43346 | ui.log( | ||
b'extension', b' > reposetup for %s took %s\n', name, stats | ||||
) | ||||
|
r41032 | ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats) | ||
|
r20858 | if not obj.local(): | ||
for f in wirepeersetupfuncs: | ||||
f(ui, obj) | ||||
|
r17191 | return obj | ||
|
r43346 | |||
def repository( | ||||
|
r43347 | ui, | ||
path=b'', | ||||
create=False, | ||||
presetupfuncs=None, | ||||
intents=None, | ||||
createopts=None, | ||||
|
r43346 | ): | ||
|
r17191 | """return a repository object for the specified path""" | ||
|
r43346 | peer = _peerorrepo( | ||
ui, | ||||
path, | ||||
create, | ||||
presetupfuncs=presetupfuncs, | ||||
intents=intents, | ||||
createopts=createopts, | ||||
) | ||||
|
r17191 | repo = peer.local() | ||
if not repo: | ||||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"repository '%s' is not local") % (path or peer.url()) | ||
|
r43346 | ) | ||
|
r43347 | return repo.filtered(b'visible') | ||
|
r14605 | |||
|
r43346 | |||
|
r39585 | def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None): | ||
|
r14554 | '''return a repository peer for the specified path''' | ||
|
r14839 | rui = remoteui(uiorrepo, opts) | ||
|
r43346 | return _peerorrepo( | ||
rui, path, create, intents=intents, createopts=createopts | ||||
).peer() | ||||
|
r14554 | |||
|
r2719 | def defaultdest(source): | ||
|
r20799 | '''return default destination of clone if none is given | ||
|
r34133 | >>> defaultdest(b'foo') | ||
|
r20799 | 'foo' | ||
|
r34133 | >>> defaultdest(b'/foo/bar') | ||
|
r20799 | 'bar' | ||
|
r34133 | >>> defaultdest(b'/') | ||
|
r20799 | '' | ||
|
r34133 | >>> defaultdest(b'') | ||
|
r20800 | '' | ||
|
r34133 | >>> defaultdest(b'http://example.org/') | ||
|
r20800 | '' | ||
|
r34133 | >>> defaultdest(b'http://example.org/foo/') | ||
|
r20799 | 'foo' | ||
''' | ||||
|
r20800 | path = util.url(source).path | ||
if not path: | ||||
|
r43347 | return b'' | ||
|
r20800 | return os.path.basename(os.path.normpath(path)) | ||
|
r2774 | |||
|
r43346 | |||
|
r36177 | def sharedreposource(repo): | ||
"""Returns repository object for source repository of a shared repo. | ||||
If repo is not a shared repository, returns None. | ||||
""" | ||||
if repo.sharedpath == repo.path: | ||||
return None | ||||
|
r43347 | if util.safehasattr(repo, b'srcrepo') and repo.srcrepo: | ||
|
r36177 | return repo.srcrepo | ||
# the sharedpath always ends in the .hg; we want the path to the repo | ||||
source = repo.vfs.split(repo.sharedpath)[0] | ||||
srcurl, branches = parseurl(source) | ||||
srcrepo = repository(repo.ui, srcurl) | ||||
repo.srcrepo = srcrepo | ||||
return srcrepo | ||||
|
r43346 | |||
def share( | ||||
ui, | ||||
source, | ||||
dest=None, | ||||
update=True, | ||||
bookmarks=True, | ||||
defaultpath=None, | ||||
relative=False, | ||||
): | ||||
|
r8800 | '''create a shared repository''' | ||
if not islocal(source): | ||||
|
r43347 | raise error.Abort(_(b'can only share local repositories')) | ||
|
r8800 | |||
|
r8807 | if not dest: | ||
|
r10099 | dest = defaultdest(source) | ||
|
r9344 | else: | ||
dest = ui.expandpath(dest) | ||||
|
r8807 | |||
|
r36066 | if isinstance(source, bytes): | ||
|
r8800 | origsource = ui.expandpath(source) | ||
|
r10365 | source, branches = parseurl(origsource) | ||
|
r8800 | srcrepo = repository(ui, source) | ||
|
r10365 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) | ||
|
r8800 | else: | ||
|
r17191 | srcrepo = source.local() | ||
|
r8800 | checkout = None | ||
|
r39885 | shareditems = set() | ||
if bookmarks: | ||||
shareditems.add(sharedbookmarks) | ||||
|
r43346 | r = repository( | ||
ui, | ||||
dest, | ||||
create=True, | ||||
createopts={ | ||||
|
r43347 | b'sharedrepo': srcrepo, | ||
b'sharedrelative': relative, | ||||
b'shareditems': shareditems, | ||||
|
r43346 | }, | ||
) | ||||
|
r8800 | |||
|
r39885 | postshare(srcrepo, r, defaultpath=defaultpath) | ||
|
r40609 | r = repository(ui, dest) | ||
|
r28632 | _postshareupdate(r, update, checkout=checkout) | ||
|
r34816 | return r | ||
|
r8800 | |||
|
r43346 | |||
|
r34879 | def unshare(ui, repo): | ||
"""convert a shared repository to a normal one | ||||
Copy the store data to the repo and remove the sharedpath data. | ||||
|
r39642 | |||
Returns a new repository object representing the unshared repository. | ||||
The passed repository object is not usable after this function is | ||||
called. | ||||
|
r34879 | """ | ||
|
r41436 | with repo.lock(): | ||
|
r34879 | # we use locks here because if we race with commit, we | ||
# can end up with extra data in the cloned revlogs that's | ||||
# not pointed to by changesets, thus causing verify to | ||||
# fail | ||||
destlock = copystore(ui, repo, repo.path) | ||||
|
r41436 | with destlock or util.nullcontextmanager(): | ||
|
r34879 | |||
|
r43347 | sharefile = repo.vfs.join(b'sharedpath') | ||
util.rename(sharefile, sharefile + b'.old') | ||||
|
r41436 | |||
|
r43347 | repo.requirements.discard(b'shared') | ||
repo.requirements.discard(b'relshared') | ||||
|
r41436 | repo._writerequirements() | ||
|
r34879 | |||
|
r39642 | # Removing share changes some fundamental properties of the repo instance. | ||
# So we instantiate a new repo object and operate on it rather than | ||||
# try to keep the existing repo usable. | ||||
newrepo = repository(repo.baseui, repo.root, create=False) | ||||
|
r34879 | |||
|
r34880 | # TODO: figure out how to access subrepos that exist, but were previously | ||
# removed from .hgsub | ||||
|
r43347 | c = newrepo[b'.'] | ||
|
r34880 | subs = c.substate | ||
for s in sorted(subs): | ||||
c.sub(s).unshare() | ||||
|
r39642 | localrepo.poisonrepository(repo) | ||
return newrepo | ||||
|
r43346 | |||
|
r39885 | def postshare(sourcerepo, destrepo, defaultpath=None): | ||
|
r27354 | """Called after a new shared repo is created. | ||
The new repo only has a requirements file and pointer to the source. | ||||
This function configures additional shared data. | ||||
Extensions can wrap this function and write additional entries to | ||||
destrepo/.hg/shared to indicate additional pieces of data to be shared. | ||||
""" | ||||
|
r43347 | default = defaultpath or sourcerepo.ui.config(b'paths', b'default') | ||
|
r27354 | if default: | ||
|
r43387 | template = b'[paths]\ndefault = %s\n' | ||
|
r43347 | destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default)) | ||
|
r41072 | if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: | ||
with destrepo.wlock(): | ||||
|
r41265 | narrowspec.copytoworkingcopy(destrepo) | ||
|
r27354 | |||
|
r43346 | |||
|
r28632 | def _postshareupdate(repo, update, checkout=None): | ||
"""Maybe perform a working directory update after a shared repo is created. | ||||
``update`` can be a boolean or a revision to update to. | ||||
""" | ||||
if not update: | ||||
return | ||||
|
r43347 | repo.ui.status(_(b"updating working directory\n")) | ||
|
r28632 | if update is not True: | ||
checkout = update | ||||
|
r43347 | for test in (checkout, b'default', b'tip'): | ||
|
r28632 | if test is None: | ||
continue | ||||
try: | ||||
uprev = repo.lookup(test) | ||||
break | ||||
except error.RepoLookupError: | ||||
continue | ||||
_update(repo, uprev) | ||||
|
r43346 | |||
|
r15078 | def copystore(ui, srcrepo, destpath): | ||
'''copy files from store of srcrepo in destpath | ||||
returns destlock | ||||
''' | ||||
destlock = None | ||||
try: | ||||
hardlink = None | ||||
|
r43347 | topic = _(b'linking') if hardlink else _(b'copying') | ||
with ui.makeprogress(topic, unit=_(b'files')) as progress: | ||||
|
r39425 | num = 0 | ||
srcpublishing = srcrepo.publishing() | ||||
srcvfs = vfsmod.vfs(srcrepo.sharedpath) | ||||
dstvfs = vfsmod.vfs(destpath) | ||||
for f in srcrepo.store.copylist(): | ||||
|
r43347 | if srcpublishing and f.endswith(b'phaseroots'): | ||
|
r39425 | continue | ||
dstbase = os.path.dirname(f) | ||||
if dstbase and not dstvfs.exists(dstbase): | ||||
dstvfs.mkdir(dstbase) | ||||
if srcvfs.exists(f): | ||||
|
r43347 | if f.endswith(b'data'): | ||
|
r39425 | # 'dstbase' may be empty (e.g. revlog format 0) | ||
|
r43347 | lockfile = os.path.join(dstbase, b"lock") | ||
|
r39425 | # lock to avoid premature writing to the target | ||
destlock = lock.lock(dstvfs, lockfile) | ||||
|
r43346 | hardlink, n = util.copyfiles( | ||
srcvfs.join(f), dstvfs.join(f), hardlink, progress | ||||
) | ||||
|
r39425 | num += n | ||
if hardlink: | ||||
|
r43347 | ui.debug(b"linked %d files\n" % num) | ||
|
r39425 | else: | ||
|
r43347 | ui.debug(b"copied %d files\n" % num) | ||
|
r15078 | return destlock | ||
|
r43346 | except: # re-raises | ||
|
r15078 | release(destlock) | ||
raise | ||||
|
r43346 | |||
def clonewithshare( | ||||
ui, | ||||
peeropts, | ||||
sharepath, | ||||
source, | ||||
srcpeer, | ||||
dest, | ||||
pull=False, | ||||
rev=None, | ||||
update=True, | ||||
stream=False, | ||||
): | ||||
|
r25761 | """Perform a clone using a shared repo. | ||
The store for the repository will be located at <sharepath>/.hg. The | ||||
specified revisions will be cloned or pulled from "source". A shared repo | ||||
will be created at "dest" and a working copy will be created if "update" is | ||||
True. | ||||
""" | ||||
revs = None | ||||
if rev: | ||||
|
r43347 | if not srcpeer.capable(b'lookup'): | ||
|
r43346 | raise error.Abort( | ||
_( | ||||
|
r43347 | b"src repository does not support " | ||
b"revision lookup and so doesn't " | ||||
b"support clone by revision" | ||||
|
r43346 | ) | ||
) | ||||
|
r37658 | |||
# TODO this is batchable. | ||||
remoterevs = [] | ||||
for r in rev: | ||||
with srcpeer.commandexecutor() as e: | ||||
|
r43347 | remoterevs.append( | ||
e.callcommand(b'lookup', {b'key': r,}).result() | ||||
) | ||||
|
r37658 | revs = remoterevs | ||
|
r25761 | |||
|
r28289 | # Obtain a lock before checking for or cloning the pooled repo otherwise | ||
# 2 clients may race creating or populating it. | ||||
pooldir = os.path.dirname(sharepath) | ||||
# lock class requires the directory to exist. | ||||
try: | ||||
util.makedir(pooldir, False) | ||||
except OSError as e: | ||||
if e.errno != errno.EEXIST: | ||||
raise | ||||
|
r31218 | poolvfs = vfsmod.vfs(pooldir) | ||
|
r25761 | basename = os.path.basename(sharepath) | ||
|
r43347 | with lock.lock(poolvfs, b'%s.lock' % basename): | ||
|
r28289 | if os.path.exists(sharepath): | ||
|
r43346 | ui.status( | ||
|
r43347 | _(b'(sharing from existing pooled repository %s)\n') % basename | ||
|
r43346 | ) | ||
|
r28289 | else: | ||
|
r43347 | ui.status( | ||
_(b'(sharing from new pooled repository %s)\n') % basename | ||||
) | ||||
|
r28289 | # Always use pull mode because hardlinks in share mode don't work | ||
# well. Never update because working copies aren't necessary in | ||||
# share mode. | ||||
|
r43346 | clone( | ||
ui, | ||||
peeropts, | ||||
source, | ||||
dest=sharepath, | ||||
pull=True, | ||||
revs=rev, | ||||
update=False, | ||||
stream=stream, | ||||
) | ||||
|
r25761 | |||
|
r30041 | # Resolve the value to put in [paths] section for the source. | ||
if islocal(source): | ||||
defaultpath = os.path.abspath(util.urllocalpath(source)) | ||||
else: | ||||
defaultpath = source | ||||
|
r25761 | sharerepo = repository(ui, path=sharepath) | ||
|
r43346 | destrepo = share( | ||
ui, | ||||
sharerepo, | ||||
dest=dest, | ||||
update=False, | ||||
bookmarks=False, | ||||
defaultpath=defaultpath, | ||||
) | ||||
|
r25761 | |||
# We need to perform a pull against the dest repo to fetch bookmarks | ||||
# and other non-store data that isn't shared by default. In the case of | ||||
# non-existing shared repo, this means we pull from the remote twice. This | ||||
# is a bit weird. But at the time it was implemented, there wasn't an easy | ||||
# way to pull just non-changegroup data. | ||||
exchange.pull(destrepo, srcpeer, heads=revs) | ||||
|
r28632 | _postshareupdate(destrepo, update) | ||
|
r25761 | return srcpeer, peer(ui, peeropts, dest) | ||
|
r43346 | |||
r32492 | # Recomputing branch cache might be slow on big repos, | |||
# so just copy it | ||||
def _copycache(srcrepo, dstcachedir, fname): | ||||
"""copy a cache from srcrepo to destcachedir (if it exists)""" | ||||
|
r43347 | srcbranchcache = srcrepo.vfs.join(b'cache/%s' % fname) | ||
r32492 | dstbranchcache = os.path.join(dstcachedir, fname) | |||
if os.path.exists(srcbranchcache): | ||||
if not os.path.exists(dstcachedir): | ||||
os.mkdir(dstcachedir) | ||||
util.copyfile(srcbranchcache, dstbranchcache) | ||||
|
r43346 | |||
def clone( | ||||
ui, | ||||
peeropts, | ||||
source, | ||||
dest=None, | ||||
pull=False, | ||||
revs=None, | ||||
update=True, | ||||
stream=False, | ||||
branch=None, | ||||
shareopts=None, | ||||
storeincludepats=None, | ||||
storeexcludepats=None, | ||||
depth=None, | ||||
): | ||||
|
r2597 | """Make a copy of an existing repository. | ||
Create a copy of an existing repository in a new directory. The | ||||
source and destination are URLs, as passed to the repository | ||||
|
r17191 | function. Returns a pair of repository peers, the source and | ||
|
r2597 | newly created destination. | ||
The location of the source is added to the new repository's | ||||
.hg/hgrc file, as the default to be used for future pulls and | ||||
pushes. | ||||
If an exception is raised, the partly cloned/updated destination | ||||
repository will be deleted. | ||||
|
r2600 | |||
|
r2719 | Arguments: | ||
source: repository object or URL | ||||
|
r2597 | |||
dest: URL of destination repository to create (defaults to base | ||||
name of source repository) | ||||
|
r23545 | pull: always pull from source repository, even in local case or if the | ||
server prefers streaming | ||||
|
r2597 | |||
|
r2621 | stream: stream raw data uncompressed from repository (fast over | ||
LAN, slow over WAN) | ||||
|
r2613 | |||
|
r37279 | revs: revision to clone up to (implies pull=True) | ||
|
r2597 | |||
update: update working directory after clone completes, if | ||||
|
r6526 | destination is local repository (True means update to default rev, | ||
anything else is treated as a revision) | ||||
|
r10379 | |||
branch: branches to clone | ||||
|
r25761 | |||
shareopts: dict of options to control auto sharing behavior. The "pool" key | ||||
activates auto sharing mode and defines the directory for stores. The | ||||
"mode" key determines how to construct the directory name of the shared | ||||
repository. "identity" means the name is derived from the node of the first | ||||
changeset in the repository. "remote" means the name is derived from the | ||||
remote's path/URL. Defaults to "identity." | ||||
|
r39586 | |||
storeincludepats and storeexcludepats: sets of file patterns to include and | ||||
exclude in the repository copy, respectively. If not defined, all files | ||||
will be included (a "full" clone). Otherwise a "narrow" clone containing | ||||
only the requested files will be performed. If ``storeincludepats`` is not | ||||
defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be | ||||
``path:.``. If both are empty sets, no files will be cloned. | ||||
|
r2597 | """ | ||
|
r4478 | |||
|
r32970 | if isinstance(source, bytes): | ||
|
r6089 | origsource = ui.expandpath(source) | ||
|
r37278 | source, branches = parseurl(origsource, branch) | ||
|
r17191 | srcpeer = peer(ui, peeropts, source) | ||
|
r2719 | else: | ||
|
r43346 | srcpeer = source.peer() # in case we were called with a localrepo | ||
|
r37278 | branches = (None, branch or []) | ||
|
r17191 | origsource = source = srcpeer.url() | ||
|
r37279 | revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs) | ||
|
r2719 | |||
|
r2597 | if dest is None: | ||
|
r2719 | dest = defaultdest(source) | ||
|
r20800 | if dest: | ||
|
r43347 | ui.status(_(b"destination directory: %s\n") % dest) | ||
|
r9344 | else: | ||
dest = ui.expandpath(dest) | ||||
|
r2719 | |||
|
r14825 | dest = util.urllocalpath(dest) | ||
source = util.urllocalpath(source) | ||||
|
r2597 | |||
|
r17159 | if not dest: | ||
|
r43347 | raise error.Abort(_(b"empty destination path is not valid")) | ||
|
r21803 | |||
|
r31218 | destvfs = vfsmod.vfs(dest, expandpath=True) | ||
|
r21803 | if destvfs.lexists(): | ||
if not destvfs.isdir(): | ||||
|
r43347 | raise error.Abort(_(b"destination '%s' already exists") % dest) | ||
|
r21804 | elif destvfs.listdir(): | ||
|
r43347 | raise error.Abort(_(b"destination '%s' is not empty") % dest) | ||
|
r2597 | |||
|
r39586 | createopts = {} | ||
narrow = False | ||||
if storeincludepats is not None: | ||||
narrowspec.validatepatterns(storeincludepats) | ||||
narrow = True | ||||
if storeexcludepats is not None: | ||||
narrowspec.validatepatterns(storeexcludepats) | ||||
narrow = True | ||||
if narrow: | ||||
# Include everything by default if only exclusion patterns defined. | ||||
if storeexcludepats and not storeincludepats: | ||||
|
r43347 | storeincludepats = {b'path:.'} | ||
|
r39586 | |||
|
r43347 | createopts[b'narrowfiles'] = True | ||
|
r39586 | |||
|
r40426 | if depth: | ||
|
r43347 | createopts[b'shallowfilestore'] = True | ||
|
r40426 | |||
|
r40360 | if srcpeer.capable(b'lfs-serve'): | ||
# Repository creation honors the config if it disabled the extension, so | ||||
# we can't just announce that lfs will be enabled. This check avoids | ||||
# saying that lfs will be enabled, and then saying it's an unknown | ||||
# feature. The lfs creation option is set in either case so that a | ||||
# requirement is added. If the extension is explicitly disabled but the | ||||
# requirement is set, the clone aborts early, before transferring any | ||||
# data. | ||||
|
r43347 | createopts[b'lfs'] = True | ||
|
r40360 | |||
|
r43347 | if extensions.disabledext(b'lfs'): | ||
|
r43346 | ui.status( | ||
_( | ||||
|
r43347 | b'(remote is using large file support (lfs), but it is ' | ||
b'explicitly disabled in the local configuration)\n' | ||||
|
r43346 | ) | ||
) | ||||
|
r40360 | else: | ||
|
r43346 | ui.status( | ||
_( | ||||
|
r43347 | b'(remote is using large file support (lfs); lfs will ' | ||
b'be enabled for this repository)\n' | ||||
|
r43346 | ) | ||
) | ||||
|
r40360 | |||
|
r25761 | shareopts = shareopts or {} | ||
|
r43347 | sharepool = shareopts.get(b'pool') | ||
sharenamemode = shareopts.get(b'mode') | ||||
|
r26026 | if sharepool and islocal(dest): | ||
|
r25761 | sharepath = None | ||
|
r43347 | if sharenamemode == b'identity': | ||
|
r25761 | # Resolve the name from the initial changeset in the remote | ||
# repository. This returns nullid when the remote is empty. It | ||||
# raises RepoLookupError if revision 0 is filtered or otherwise | ||||
# not available. If we fail to resolve, sharing is not enabled. | ||||
try: | ||||
|
r37658 | with srcpeer.commandexecutor() as e: | ||
|
r43347 | rootnode = e.callcommand( | ||
b'lookup', {b'key': b'0',} | ||||
).result() | ||||
|
r37658 | |||
|
r25761 | if rootnode != node.nullid: | ||
sharepath = os.path.join(sharepool, node.hex(rootnode)) | ||||
else: | ||||
|
r43346 | ui.status( | ||
_( | ||||
|
r43347 | b'(not using pooled storage: ' | ||
b'remote appears to be empty)\n' | ||||
|
r43346 | ) | ||
) | ||||
|
r25761 | except error.RepoLookupError: | ||
|
r43346 | ui.status( | ||
_( | ||||
|
r43347 | b'(not using pooled storage: ' | ||
b'unable to resolve identity of remote)\n' | ||||
|
r43346 | ) | ||
) | ||||
|
r43347 | elif sharenamemode == b'remote': | ||
|
r29341 | sharepath = os.path.join( | ||
|
r44517 | sharepool, node.hex(hashutil.sha1(source).digest()) | ||
|
r43346 | ) | ||
|
r25761 | else: | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b'unknown share naming mode: %s') % sharenamemode | ||
|
r43346 | ) | ||
|
r25761 | |||
|
r39586 | # TODO this is a somewhat arbitrary restriction. | ||
if narrow: | ||||
|
r43347 | ui.status(_(b'(pooled storage not supported for narrow clones)\n')) | ||
|
r39586 | sharepath = None | ||
|
r25761 | if sharepath: | ||
|
r43346 | return clonewithshare( | ||
ui, | ||||
peeropts, | ||||
sharepath, | ||||
source, | ||||
srcpeer, | ||||
dest, | ||||
pull=pull, | ||||
rev=revs, | ||||
update=update, | ||||
stream=stream, | ||||
) | ||||
|
r25761 | |||
|
r18441 | srclock = destlock = cleandir = None | ||
|
r17191 | srcrepo = srcpeer.local() | ||
|
r4915 | try: | ||
|
r14377 | abspath = origsource | ||
if islocal(origsource): | ||||
|
r14825 | abspath = os.path.abspath(util.urllocalpath(origsource)) | ||
|
r14377 | |||
|
r4915 | if islocal(dest): | ||
|
r18441 | cleandir = dest | ||
|
r2597 | |||
|
r4915 | copy = False | ||
|
r43346 | if ( | ||
srcrepo | ||||
and srcrepo.cancopy() | ||||
and islocal(dest) | ||||
and not phases.hassecret(srcrepo) | ||||
): | ||||
|
r37279 | copy = not pull and not revs | ||
|
r2597 | |||
|
r39586 | # TODO this is a somewhat arbitrary restriction. | ||
if narrow: | ||||
copy = False | ||||
|
r4915 | if copy: | ||
try: | ||||
# we use a lock here because if we race with commit, we | ||||
# can end up with extra data in the cloned revlogs that's | ||||
# not pointed to by changesets, thus causing verify to | ||||
# fail | ||||
|
r14463 | srclock = srcrepo.lock(wait=False) | ||
|
r7640 | except error.LockError: | ||
|
r4915 | copy = False | ||
|
r2597 | |||
|
r4915 | if copy: | ||
|
r43347 | srcrepo.hook(b'preoutgoing', throw=True, source=b'clone') | ||
hgdir = os.path.realpath(os.path.join(dest, b".hg")) | ||||
|
r4915 | if not os.path.exists(dest): | ||
|
r39221 | util.makedirs(dest) | ||
|
r7935 | else: | ||
# only clean up directories we create ourselves | ||||
|
r18441 | cleandir = hgdir | ||
|
r5569 | try: | ||
|
r14463 | destpath = hgdir | ||
util.makedir(destpath, notindexed=True) | ||||
|
r25660 | except OSError as inst: | ||
|
r5569 | if inst.errno == errno.EEXIST: | ||
|
r18441 | cleandir = None | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"destination '%s' already exists") % dest | ||
|
r43346 | ) | ||
|
r5569 | raise | ||
|
r2597 | |||
|
r15078 | destlock = copystore(ui, srcrepo, destpath) | ||
|
r22646 | # copy bookmarks over | ||
|
r43347 | srcbookmarks = srcrepo.vfs.join(b'bookmarks') | ||
dstbookmarks = os.path.join(destpath, b'bookmarks') | ||||
|
r22646 | if os.path.exists(srcbookmarks): | ||
util.copyfile(srcbookmarks, dstbookmarks) | ||||
|
r2597 | |||
|
r43347 | dstcachedir = os.path.join(destpath, b'cache') | ||
|
r35784 | for cache in cacheutil.cachetocopy(srcrepo): | ||
r32493 | _copycache(srcrepo, dstcachedir, cache) | |||
|
r17740 | |||
|
r4915 | # we need to re-init the repo after manually copying the data | ||
# into it | ||||
|
r17874 | destpeer = peer(srcrepo, peeropts, dest) | ||
|
r43347 | srcrepo.hook( | ||
b'outgoing', source=b'clone', node=node.hex(node.nullid) | ||||
) | ||||
|
r4915 | else: | ||
|
r5569 | try: | ||
|
r39586 | # only pass ui when no srcrepo | ||
|
r43346 | destpeer = peer( | ||
srcrepo or ui, | ||||
peeropts, | ||||
dest, | ||||
create=True, | ||||
createopts=createopts, | ||||
) | ||||
|
r25660 | except OSError as inst: | ||
|
r5569 | if inst.errno == errno.EEXIST: | ||
|
r18441 | cleandir = None | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"destination '%s' already exists") % dest | ||
|
r43346 | ) | ||
|
r5569 | raise | ||
|
r2597 | |||
|
r37279 | if revs: | ||
|
r43347 | if not srcpeer.capable(b'lookup'): | ||
|
r43346 | raise error.Abort( | ||
_( | ||||
|
r43347 | b"src repository does not support " | ||
b"revision lookup and so doesn't " | ||||
b"support clone by revision" | ||||
|
r43346 | ) | ||
) | ||||
|
r37658 | |||
# TODO this is batchable. | ||||
remoterevs = [] | ||||
for rev in revs: | ||||
with srcpeer.commandexecutor() as e: | ||||
|
r43346 | remoterevs.append( | ||
|
r43347 | e.callcommand(b'lookup', {b'key': rev,}).result() | ||
|
r43346 | ) | ||
|
r37658 | revs = remoterevs | ||
|
r8417 | checkout = revs[0] | ||
|
r37279 | else: | ||
revs = None | ||||
|
r27165 | local = destpeer.local() | ||
if local: | ||||
|
r39591 | if narrow: | ||
|
r41072 | with local.wlock(), local.lock(): | ||
|
r39591 | local.setnarrowpats(storeincludepats, storeexcludepats) | ||
|
r41272 | narrowspec.copytoworkingcopy(local) | ||
|
r39591 | |||
|
r35581 | u = util.url(abspath) | ||
defaulturl = bytes(u) | ||||
|
r43347 | local.ui.setconfig(b'paths', b'default', defaulturl, b'clone') | ||
|
r23545 | if not stream: | ||
if pull: | ||||
stream = False | ||||
else: | ||||
stream = None | ||||
|
r27165 | # internal config: ui.quietbookmarkmove | ||
|
r43347 | overrides = {(b'ui', b'quietbookmarkmove'): True} | ||
with local.ui.configoverride(overrides, b'clone'): | ||||
|
r43346 | exchange.pull( | ||
local, | ||||
srcpeer, | ||||
revs, | ||||
streamclonerequested=stream, | ||||
includepats=storeincludepats, | ||||
excludepats=storeexcludepats, | ||||
depth=depth, | ||||
) | ||||
|
r17191 | elif srcrepo: | ||
|
r39586 | # TODO lift restriction once exchange.push() accepts narrow | ||
# push. | ||||
if narrow: | ||||
|
r43346 | raise error.Abort( | ||
_( | ||||
|
r43347 | b'narrow clone not available for ' | ||
b'remote destinations' | ||||
|
r43346 | ) | ||
) | ||||
|
r39586 | |||
|
r43346 | exchange.push( | ||
srcrepo, | ||||
destpeer, | ||||
revs=revs, | ||||
bookmarks=srcrepo._bookmarks.keys(), | ||||
) | ||||
|
r4915 | else: | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"clone from remote to remote not supported") | ||
|
r43346 | ) | ||
|
r2597 | |||
|
r18441 | cleandir = None | ||
|
r2597 | |||
|
r17191 | destrepo = destpeer.local() | ||
if destrepo: | ||||
|
r43347 | template = uimod.samplehgrcs[b'cloned'] | ||
|
r15552 | u = util.url(abspath) | ||
u.passwd = None | ||||
|
r33650 | defaulturl = bytes(u) | ||
|
r43347 | destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl)) | ||
destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone') | ||||
|
r8814 | |||
|
r43347 | if ui.configbool(b'experimental', b'remotenames'): | ||
|
r35348 | logexchange.pullremotenames(destrepo, srcpeer) | ||
|
r35332 | |||
|
r4915 | if update: | ||
|
r6526 | if update is not True: | ||
|
r37658 | with srcpeer.commandexecutor() as e: | ||
|
r43346 | checkout = e.callcommand( | ||
|
r43347 | b'lookup', {b'key': update,} | ||
|
r43346 | ).result() | ||
|
r37658 | |||
|
r17867 | uprev = None | ||
|
r17882 | status = None | ||
|
r17867 | if checkout is not None: | ||
|
r38776 | # Some extensions (at least hg-git and hg-subversion) have | ||
# a peer.lookup() implementation that returns a name instead | ||||
# of a nodeid. We work around it here until we've figured | ||||
# out a better solution. | ||||
if len(checkout) == 20 and checkout in destrepo: | ||||
|
r37498 | uprev = checkout | ||
|
r38776 | elif scmutil.isrevsymbol(destrepo, checkout): | ||
uprev = scmutil.revsymbol(destrepo, checkout).node() | ||||
|
r37498 | else: | ||
|
r26354 | if update is not True: | ||
try: | ||||
uprev = destrepo.lookup(update) | ||||
except error.RepoLookupError: | ||||
pass | ||||
|
r17867 | if uprev is None: | ||
try: | ||||
|
r43347 | uprev = destrepo._bookmarks[b'@'] | ||
update = b'@' | ||||
|
r17882 | bn = destrepo[uprev].branch() | ||
|
r43347 | if bn == b'default': | ||
status = _(b"updating to bookmark @\n") | ||||
|
r17882 | else: | ||
|
r43346 | status = ( | ||
|
r43347 | _(b"updating to bookmark @ on branch %s\n") % bn | ||
|
r43346 | ) | ||
|
r17867 | except KeyError: | ||
try: | ||||
|
r43347 | uprev = destrepo.branchtip(b'default') | ||
|
r17867 | except error.RepoLookupError: | ||
|
r43347 | uprev = destrepo.lookup(b'tip') | ||
|
r17882 | if not status: | ||
bn = destrepo[uprev].branch() | ||||
|
r43347 | status = _(b"updating to branch %s\n") % bn | ||
|
r17882 | destrepo.ui.status(status) | ||
|
r14463 | _update(destrepo, uprev) | ||
|
r17703 | if update in destrepo._bookmarks: | ||
|
r24945 | bookmarks.activate(destrepo, update) | ||
|
r4915 | finally: | ||
|
r15908 | release(srclock, destlock) | ||
|
r18441 | if cleandir is not None: | ||
shutil.rmtree(cleandir, True) | ||||
|
r17191 | if srcpeer is not None: | ||
srcpeer.close() | ||||
|
r19313 | return srcpeer, destpeer | ||
|
r2775 | |||
|
r43346 | |||
|
r27402 | def _showstats(repo, stats, quietempty=False): | ||
|
r37143 | if quietempty and stats.isempty(): | ||
|
r27402 | return | ||
|
r43346 | repo.ui.status( | ||
_( | ||||
|
r43347 | b"%d files updated, %d files merged, " | ||
b"%d files removed, %d files unresolved\n" | ||||
|
r43346 | ) | ||
% ( | ||||
stats.updatedcount, | ||||
stats.mergedcount, | ||||
stats.removedcount, | ||||
stats.unresolvedcount, | ||||
) | ||||
) | ||||
|
r3316 | |||
|
r31166 | def updaterepo(repo, node, overwrite, updatecheck=None): | ||
|
r17895 | """Update the working directory to node. | ||
When overwrite is set, changes are clobbered, merged else | ||||
returns stats (see pydoc mercurial.merge.applyupdates)""" | ||||
|
r43346 | return mergemod.update( | ||
repo, | ||||
node, | ||||
branchmerge=False, | ||||
force=overwrite, | ||||
|
r43347 | labels=[b'working copy', b'destination'], | ||
|
r43346 | updatecheck=updatecheck, | ||
) | ||||
|
r17895 | |||
|
r31166 | def update(repo, node, quietempty=False, updatecheck=None): | ||
"""update the working directory to node""" | ||||
stats = updaterepo(repo, node, False, updatecheck=updatecheck) | ||||
|
r27404 | _showstats(repo, stats, quietempty) | ||
|
r37143 | if stats.unresolvedcount: | ||
|
r43347 | repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n")) | ||
|
r37143 | return stats.unresolvedcount > 0 | ||
|
r2775 | |||
|
r43346 | |||
|
r7546 | # naming conflict in clone() | ||
_update = update | ||||
|
r43346 | |||
|
r27403 | def clean(repo, node, show_stats=True, quietempty=False): | ||
|
r2808 | """forcibly switch the working directory to node, clobbering changes""" | ||
|
r17895 | stats = updaterepo(repo, node, True) | ||
|
r44620 | assert stats.unresolvedcount == 0 | ||
|
r10282 | if show_stats: | ||
|
r27403 | _showstats(repo, stats, quietempty) | ||
|
r2775 | |||
|
r43346 | |||
|
r28501 | # naming conflict in updatetotally() | ||
_clean = clean | ||||
|
r43346 | _VALID_UPDATECHECKS = { | ||
mergemod.UPDATECHECK_ABORT, | ||||
mergemod.UPDATECHECK_NONE, | ||||
mergemod.UPDATECHECK_LINEAR, | ||||
mergemod.UPDATECHECK_NO_CONFLICT, | ||||
|
r43241 | } | ||
|
r43346 | |||
|
r31166 | def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None): | ||
|
r28501 | """Update the working directory with extra care for non-file components | ||
This takes care of non-file components below: | ||||
:bookmark: might be advanced or (in)activated | ||||
This takes arguments below: | ||||
:checkout: to which revision the working directory is updated | ||||
:brev: a name, which might be a bookmark to be activated after updating | ||||
:clean: whether changes in the working directory can be discarded | ||||
|
r31166 | :updatecheck: how to deal with a dirty working directory | ||
|
r43240 | Valid values for updatecheck are the UPDATECHECK_* constants | ||
defined in the merge module. Passing `None` will result in using the | ||||
configured default. | ||||
|
r31166 | |||
|
r43240 | * ABORT: abort if the working directory is dirty | ||
* NONE: don't check (merge working directory changes into destination) | ||||
* LINEAR: check that update is linear before merging working directory | ||||
|
r31166 | changes into destination | ||
|
r43240 | * NO_CONFLICT: check that the update does not result in file merges | ||
|
r28501 | |||
This returns whether conflict is detected at updating or not. | ||||
""" | ||||
|
r31166 | if updatecheck is None: | ||
|
r43347 | updatecheck = ui.config(b'commands', b'update.check') | ||
|
r43241 | if updatecheck not in _VALID_UPDATECHECKS: | ||
|
r31167 | # If not configured, or invalid value configured | ||
|
r43240 | updatecheck = mergemod.UPDATECHECK_LINEAR | ||
|
r43241 | if updatecheck not in _VALID_UPDATECHECKS: | ||
|
r43346 | raise ValueError( | ||
r'Invalid updatecheck value %r (can accept %r)' | ||||
% (updatecheck, _VALID_UPDATECHECKS) | ||||
) | ||||
|
r28503 | with repo.wlock(): | ||
|
r28501 | movemarkfrom = None | ||
warndest = False | ||||
if checkout is None: | ||||
|
r30962 | updata = destutil.destupdate(repo, clean=clean) | ||
|
r28501 | checkout, movemarkfrom, brev = updata | ||
warndest = True | ||||
if clean: | ||||
ret = _clean(repo, checkout) | ||||
else: | ||||
|
r43240 | if updatecheck == mergemod.UPDATECHECK_ABORT: | ||
|
r30963 | cmdutil.bailifchanged(repo, merge=False) | ||
|
r43240 | updatecheck = mergemod.UPDATECHECK_NONE | ||
|
r31166 | ret = _update(repo, checkout, updatecheck=updatecheck) | ||
|
r28501 | |||
if not ret and movemarkfrom: | ||||
|
r43347 | if movemarkfrom == repo[b'.'].node(): | ||
|
r43346 | pass # no-op update | ||
|
r43347 | elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()): | ||
b = ui.label(repo._activebookmark, b'bookmarks.active') | ||||
ui.status(_(b"updating bookmark %s\n") % b) | ||||
|
r28501 | else: | ||
# this can happen with a non-linear update | ||||
|
r43347 | b = ui.label(repo._activebookmark, b'bookmarks') | ||
ui.status(_(b"(leaving bookmark %s)\n") % b) | ||||
|
r28501 | bookmarks.deactivate(repo) | ||
elif brev in repo._bookmarks: | ||||
if brev != repo._activebookmark: | ||||
|
r43347 | b = ui.label(brev, b'bookmarks.active') | ||
ui.status(_(b"(activating bookmark %s)\n") % b) | ||||
|
r28501 | bookmarks.activate(repo, brev) | ||
elif brev: | ||||
if repo._activebookmark: | ||||
|
r43347 | b = ui.label(repo._activebookmark, b'bookmarks') | ||
ui.status(_(b"(leaving bookmark %s)\n") % b) | ||||
|
r28501 | bookmarks.deactivate(repo) | ||
if warndest: | ||||
destutil.statusotherdests(ui, repo) | ||||
return ret | ||||
|
r43346 | |||
def merge( | ||||
|
r44916 | ctx, force=False, remind=True, labels=None, | ||
|
r43346 | ): | ||
|
r13162 | """Branch merge with node, resolving changes. Return true if any | ||
unresolved conflicts.""" | ||||
|
r44916 | repo = ctx.repo() | ||
stats = mergemod.merge(ctx, force=force, labels=labels) | ||||
|
r3316 | _showstats(repo, stats) | ||
|
r37143 | if stats.unresolvedcount: | ||
|
r43346 | repo.ui.status( | ||
_( | ||||
|
r43347 | b"use 'hg resolve' to retry unresolved file merges " | ||
b"or 'hg merge --abort' to abandon\n" | ||||
|
r43346 | ) | ||
) | ||||
|
r42803 | elif remind: | ||
|
r43347 | repo.ui.status(_(b"(branch merge, don't forget to commit)\n")) | ||
|
r37143 | return stats.unresolvedcount > 0 | ||
|
r2808 | |||
|
r43346 | |||
|
r42810 | def abortmerge(ui, repo): | ||
|
r42803 | ms = mergemod.mergestate.read(repo) | ||
if ms.active(): | ||||
# there were conflicts | ||||
node = ms.localctx.hex() | ||||
else: | ||||
# there were no conficts, mergestate was not stored | ||||
|
r43347 | node = repo[b'.'].hex() | ||
|
r42803 | |||
|
r43387 | repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) | ||
|
r44743 | stats = mergemod.clean_update(repo[node]) | ||
|
r44636 | assert stats.unresolvedcount == 0 | ||
|
r42803 | _showstats(repo, stats) | ||
|
r43346 | |||
def _incoming( | ||||
displaychlist, subreporecurse, ui, repo, source, opts, buffered=False | ||||
): | ||||
|
r12730 | """ | ||
Helper for incoming / gincoming. | ||||
displaychlist gets called with | ||||
(remoterepo, incomingchangesetlist, displayer) parameters, | ||||
and is supposed to contain only code that can't be unified. | ||||
""" | ||||
|
r43347 | source, branches = parseurl(ui.expandpath(source), opts.get(b'branch')) | ||
|
r14556 | other = peer(repo, opts, source) | ||
|
r43347 | ui.status(_(b'comparing with %s\n') % util.hidepassword(source)) | ||
revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev')) | ||||
|
r12730 | |||
if revs: | ||||
revs = [other.lookup(rev) for rev in revs] | ||||
|
r43346 | other, chlist, cleanupfn = bundlerepo.getremotechanges( | ||
|
r43347 | ui, repo, other, revs, opts[b"bundle"], opts[b"force"] | ||
|
r43346 | ) | ||
|
r14161 | try: | ||
if not chlist: | ||||
|
r43347 | ui.status(_(b"no changes found\n")) | ||
|
r14161 | return subreporecurse() | ||
|
r43347 | ui.pager(b'incoming') | ||
|
r43346 | displayer = logcmdutil.changesetdisplayer( | ||
ui, other, opts, buffered=buffered | ||||
) | ||||
|
r12730 | displaychlist(other, chlist, displayer) | ||
displayer.close() | ||||
finally: | ||||
|
r14161 | cleanupfn() | ||
|
r12730 | subreporecurse() | ||
|
r43346 | return 0 # exit code is zero since we found incoming changes | ||
|
r12730 | |||
|
r12273 | def incoming(ui, repo, source, opts): | ||
|
r12730 | def subreporecurse(): | ||
|
r12400 | ret = 1 | ||
|
r43347 | if opts.get(b'subrepos'): | ||
|
r12400 | ctx = repo[None] | ||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
ret = min(ret, sub.incoming(ui, source, opts)) | ||||
return ret | ||||
|
r12730 | def display(other, chlist, displayer): | ||
|
r35906 | limit = logcmdutil.getlimit(opts) | ||
|
r43347 | if opts.get(b'newest_first'): | ||
|
r12729 | chlist.reverse() | ||
|
r12273 | count = 0 | ||
|
r12729 | for n in chlist: | ||
|
r12273 | if limit is not None and count >= limit: | ||
break | ||||
parents = [p for p in other.changelog.parents(n) if p != nullid] | ||||
|
r43347 | if opts.get(b'no_merges') and len(parents) == 2: | ||
|
r12273 | continue | ||
count += 1 | ||||
displayer.show(other[n]) | ||||
|
r43346 | |||
|
r12730 | return _incoming(display, subreporecurse, ui, repo, source, opts) | ||
|
r12273 | |||
|
r43346 | |||
|
r12735 | def _outgoing(ui, repo, dest, opts): | ||
|
r43347 | path = ui.paths.getpath(dest, default=(b'default-push', b'default')) | ||
|
r35454 | if not path: | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b'default repository not configured!'), | ||
hint=_(b"see 'hg help config.paths'"), | ||||
|
r43346 | ) | ||
|
r35454 | dest = path.pushloc or path.loc | ||
|
r43347 | branches = path.branch, opts.get(b'branch') or [] | ||
|
r35454 | |||
|
r43347 | ui.status(_(b'comparing with %s\n') % util.hidepassword(dest)) | ||
revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev')) | ||||
|
r12735 | if revs: | ||
|
r37329 | revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)] | ||
|
r12735 | |||
|
r14556 | other = peer(repo, opts, dest) | ||
|
r43346 | outgoing = discovery.findcommonoutgoing( | ||
|
r43347 | repo, other, revs, force=opts.get(b'force') | ||
|
r43346 | ) | ||
|
r15837 | o = outgoing.missing | ||
|
r12735 | if not o: | ||
|
r17248 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | ||
|
r21050 | return o, other | ||
|
r12735 | |||
|
r43346 | |||
|
r12271 | def outgoing(ui, repo, dest, opts): | ||
|
r12400 | def recurse(): | ||
ret = 1 | ||||
|
r43347 | if opts.get(b'subrepos'): | ||
|
r12400 | ctx = repo[None] | ||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
ret = min(ret, sub.outgoing(ui, dest, opts)) | ||||
return ret | ||||
|
r35906 | limit = logcmdutil.getlimit(opts) | ||
|
r21050 | o, other = _outgoing(ui, repo, dest, opts) | ||
|
r21049 | if not o: | ||
|
r21051 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | ||
|
r12400 | return recurse() | ||
|
r43347 | if opts.get(b'newest_first'): | ||
|
r12271 | o.reverse() | ||
|
r43347 | ui.pager(b'outgoing') | ||
|
r35906 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | ||
|
r12271 | count = 0 | ||
for n in o: | ||||
if limit is not None and count >= limit: | ||||
break | ||||
parents = [p for p in repo.changelog.parents(n) if p != nullid] | ||||
|
r43347 | if opts.get(b'no_merges') and len(parents) == 2: | ||
|
r12271 | continue | ||
count += 1 | ||||
displayer.show(repo[n]) | ||||
displayer.close() | ||||
|
r21051 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | ||
|
r12400 | recurse() | ||
|
r43346 | return 0 # exit code is zero since we found outgoing changes | ||
|
r12271 | |||
r42331 | def verify(repo, level=None): | |||
|
r2778 | """verify the consistency of a repository""" | ||
r42331 | ret = verifymod.verify(repo, level=level) | |||
|
r25591 | |||
# Broken subrepo references in hidden csets don't seem worth worrying about, | ||||
# since they can't be pushed/pulled, and --hidden can be used if they are a | ||||
# concern. | ||||
# pathto() is needed for -R case | ||||
|
r43346 | revs = repo.revs( | ||
|
r43347 | b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate') | ||
|
r43346 | ) | ||
|
r25591 | |||
if revs: | ||||
|
r43347 | repo.ui.status(_(b'checking subrepo links\n')) | ||
|
r25591 | for rev in revs: | ||
ctx = repo[rev] | ||||
try: | ||||
for subpath in ctx.substate: | ||||
|
r29021 | try: | ||
|
r43346 | ret = ( | ||
ctx.sub(subpath, allowcreate=False).verify() or ret | ||||
) | ||||
|
r29021 | except error.RepoError as e: | ||
|
r43347 | repo.ui.warn(b'%d: %s\n' % (rev, e)) | ||
|
r25591 | except Exception: | ||
|
r43346 | repo.ui.warn( | ||
|
r43347 | _(b'.hgsubstate is corrupt in revision %s\n') | ||
|
r43346 | % node.short(ctx.node()) | ||
) | ||||
|
r25591 | |||
return ret | ||||
|
r11273 | |||
|
r43346 | |||
|
r11273 | def remoteui(src, opts): | ||
|
r44226 | """build a remote ui from ui or repo and opts""" | ||
|
r43347 | if util.safehasattr(src, b'baseui'): # looks like a repository | ||
|
r43346 | dst = src.baseui.copy() # drop repo-specific config | ||
src = src.ui # copy target options from repo | ||||
else: # assume it's a global ui object | ||||
dst = src.copy() # keep all global options | ||||
|
r11273 | |||
# copy ssh-specific options | ||||
|
r43347 | for o in b'ssh', b'remotecmd': | ||
v = opts.get(o) or src.config(b'ui', o) | ||||
|
r11273 | if v: | ||
|
r43347 | dst.setconfig(b"ui", o, v, b'copied') | ||
|
r11273 | |||
# copy bundle-specific options | ||||
|
r43347 | r = src.config(b'bundle', b'mainreporoot') | ||
|
r11273 | if r: | ||
|
r43347 | dst.setconfig(b'bundle', b'mainreporoot', r, b'copied') | ||
|
r11273 | |||
|
r13192 | # copy selected local settings to the remote ui | ||
|
r43347 | for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'): | ||
|
r11273 | for key, val in src.configitems(sect): | ||
|
r43347 | dst.setconfig(sect, key, val, b'copied') | ||
v = src.config(b'web', b'cacerts') | ||||
|
r29594 | if v: | ||
|
r43347 | dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied') | ||
|
r11273 | |||
return dst | ||||
|
r26219 | |||
|
r43346 | |||
|
r26219 | # Files of interest | ||
# Used to check if the repository has changed looking at mtime and size of | ||||
|
r26781 | # these files. | ||
|
r43346 | foi = [ | ||
|
r43347 | (b'spath', b'00changelog.i'), | ||
(b'spath', b'phaseroots'), # ! phase can change content at the same size | ||||
(b'spath', b'obsstore'), | ||||
(b'path', b'bookmarks'), # ! bookmark can change content at the same size | ||||
|
r43346 | ] | ||
|
r26219 | |||
class cachedlocalrepo(object): | ||||
"""Holds a localrepository that can be cached and reused.""" | ||||
def __init__(self, repo): | ||||
"""Create a new cached repo from an existing repo. | ||||
We assume the passed in repo was recently created. If the | ||||
repo has changed between when it was created and when it was | ||||
turned into a cache, it may not refresh properly. | ||||
""" | ||||
assert isinstance(repo, localrepo.localrepository) | ||||
self._repo = repo | ||||
self._state, self.mtime = self._repostate() | ||||
|
r28119 | self._filtername = repo.filtername | ||
|
r26219 | |||
def fetch(self): | ||||
"""Refresh (if necessary) and return a repository. | ||||
If the cached instance is out of date, it will be recreated | ||||
automatically and returned. | ||||
Returns a tuple of the repo and a boolean indicating whether a new | ||||
repo instance was created. | ||||
""" | ||||
# We compare the mtimes and sizes of some well-known files to | ||||
# determine if the repo changed. This is not precise, as mtimes | ||||
# are susceptible to clock skew and imprecise filesystems and | ||||
# file content can change while maintaining the same size. | ||||
state, mtime = self._repostate() | ||||
if state == self._state: | ||||
return self._repo, False | ||||
|
r28119 | repo = repository(self._repo.baseui, self._repo.url()) | ||
if self._filtername: | ||||
self._repo = repo.filtered(self._filtername) | ||||
else: | ||||
self._repo = repo.unfiltered() | ||||
|
r26219 | self._state = state | ||
self.mtime = mtime | ||||
return self._repo, True | ||||
def _repostate(self): | ||||
state = [] | ||||
maxmtime = -1 | ||||
for attr, fname in foi: | ||||
prefix = getattr(self._repo, attr) | ||||
p = os.path.join(prefix, fname) | ||||
try: | ||||
st = os.stat(p) | ||||
except OSError: | ||||
st = os.stat(prefix) | ||||
|
r36799 | state.append((st[stat.ST_MTIME], st.st_size)) | ||
maxmtime = max(maxmtime, st[stat.ST_MTIME]) | ||||
|
r26219 | |||
return tuple(state), maxmtime | ||||
def copy(self): | ||||
|
r26240 | """Obtain a copy of this class instance. | ||
A new localrepository instance is obtained. The new instance should be | ||||
completely independent of the original. | ||||
""" | ||||
repo = repository(self._repo.baseui, self._repo.origroot) | ||||
|
r28119 | if self._filtername: | ||
repo = repo.filtered(self._filtername) | ||||
else: | ||||
repo = repo.unfiltered() | ||||
|
r26240 | c = cachedlocalrepo(repo) | ||
|
r26219 | c._state = self._state | ||
c.mtime = self.mtime | ||||
return c | ||||