hg.py
1240 lines
| 44.1 KiB
| text/x-python
|
PythonLexer
/ mercurial / hg.py
mpm@selenic.com
|
r0 | # hg.py - repository classes for mercurial | ||
# | ||||
Thomas Arendsen Hein
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
Vadim Gelfer
|
r2859 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | ||
mpm@selenic.com
|
r0 | # | ||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
mpm@selenic.com
|
r0 | |||
Gregory Szorc
|
r25939 | from __future__ import absolute_import | ||
import errno | ||||
Augie Fackler
|
r29341 | import hashlib | ||
Gregory Szorc
|
r25939 | import os | ||
import shutil | ||||
Augie Fackler
|
r36799 | import stat | ||
Gregory Szorc
|
r25939 | |||
from .i18n import _ | ||||
Pulkit Goyal
|
r35722 | from .node import ( | ||
nullid, | ||||
) | ||||
Jordi Gutiérrez Hermoso
|
r22837 | |||
Gregory Szorc
|
r25939 | from . import ( | ||
bookmarks, | ||||
bundlerepo, | ||||
Boris Feld
|
r35784 | cacheutil, | ||
Gregory Szorc
|
r25939 | cmdutil, | ||
FUJIWARA Katsunori
|
r28501 | destutil, | ||
Gregory Szorc
|
r25939 | discovery, | ||
error, | ||||
exchange, | ||||
extensions, | ||||
httppeer, | ||||
localrepo, | ||||
lock, | ||||
Yuya Nishihara
|
r35906 | logcmdutil, | ||
Pulkit Goyal
|
r35348 | logexchange, | ||
Gregory Szorc
|
r25939 | merge as mergemod, | ||
Gregory Szorc
|
r39586 | narrowspec, | ||
Gregory Szorc
|
r25939 | node, | ||
phases, | ||||
Gregory Szorc
|
r41625 | pycompat, | ||
Gregory Szorc
|
r25939 | scmutil, | ||
sshpeer, | ||||
statichttprepo, | ||||
ui as uimod, | ||||
unionrepo, | ||||
url, | ||||
util, | ||||
verify as verifymod, | ||||
Pierre-Yves David
|
r31218 | vfs as vfsmod, | ||
Gregory Szorc
|
r25939 | ) | ||
Pulkit Goyal
|
r43078 | from .interfaces import ( | ||
repository as repositorymod, | ||||
) | ||||
Gregory Szorc
|
r25939 | release = lock.release | ||
mpm@selenic.com
|
r0 | |||
Martijn Pieters
|
r29424 | # shared features | ||
sharedbookmarks = 'bookmarks' | ||||
Vadim Gelfer
|
r2740 | def _local(path): | ||
Mads Kiilerich
|
r14825 | path = util.expandpath(util.urllocalpath(path)) | ||
Gregory Szorc
|
r41625 | |||
try: | ||||
isfile = os.path.isfile(path) | ||||
# Python 2 raises TypeError, Python 3 ValueError. | ||||
except (TypeError, ValueError) as e: | ||||
raise error.Abort(_('invalid path %s: %s') % ( | ||||
path, pycompat.bytestr(e))) | ||||
return isfile and bundlerepo or localrepo | ||||
Vadim Gelfer
|
r2469 | |||
Sune Foldager
|
r17191 | def addbranchrevs(lrepo, other, branches, revs): | ||
peer = other.peer() # a courtesy to callers using a localrepo for other | ||||
Sune Foldager
|
r11322 | hashbranch, branches = branches | ||
if not hashbranch and not branches: | ||||
Pierre-Yves David
|
r22818 | x = revs or None | ||
Martin von Zweigbergk
|
r37499 | if revs: | ||
Pierre-Yves David
|
r22818 | y = revs[0] | ||
else: | ||||
y = None | ||||
return x, y | ||||
Jordi Gutiérrez Hermoso
|
r24306 | if revs: | ||
revs = list(revs) | ||||
else: | ||||
revs = [] | ||||
Sune Foldager
|
r17191 | if not peer.capable('branchmap'): | ||
Sune Foldager
|
r11322 | if branches: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("remote branch lookup not supported")) | ||
Sune Foldager
|
r11322 | revs.append(hashbranch) | ||
Sune Foldager
|
r10380 | return revs, revs[0] | ||
Gregory Szorc
|
r37658 | |||
with peer.commandexecutor() as e: | ||||
branchmap = e.callcommand('branchmap', {}).result() | ||||
Sune Foldager
|
r11322 | |||
Matt Mackall
|
r13047 | def primary(branch): | ||
if branch == '.': | ||||
Sune Foldager
|
r17191 | if not lrepo: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("dirstate branch not accessible")) | ||
Matt Mackall
|
r13047 | branch = lrepo.dirstate.branch() | ||
if branch in branchmap: | ||||
revs.extend(node.hex(r) for r in reversed(branchmap[branch])) | ||||
Sune Foldager
|
r11322 | return True | ||
Sune Foldager
|
r10365 | else: | ||
Sune Foldager
|
r11322 | return False | ||
for branch in branches: | ||||
Matt Mackall
|
r13047 | if not primary(branch): | ||
Sune Foldager
|
r11322 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) | ||
if hashbranch: | ||||
Matt Mackall
|
r13047 | if not primary(hashbranch): | ||
Sune Foldager
|
r11322 | revs.append(hashbranch) | ||
Sune Foldager
|
r10365 | return revs, revs[0] | ||
Brodie Rao
|
r13824 | def parseurl(path, branches=None): | ||
Sune Foldager
|
r11322 | '''parse url#branch, returning (url, (branch, branches))''' | ||
Matt Mackall
|
r5177 | |||
Brodie Rao
|
r14076 | u = util.url(path) | ||
Thomas Arendsen Hein
|
r13897 | branch = None | ||
if u.fragment: | ||||
branch = u.fragment | ||||
u.fragment = None | ||||
Pulkit Goyal
|
r31841 | return bytes(u), (branch, branches or []) | ||
Matt Mackall
|
r5177 | |||
Matt Mackall
|
r14606 | schemes = { | ||
Matt Mackall
|
r14568 | 'bundle': bundlerepo, | ||
Mads Kiilerich
|
r18944 | 'union': unionrepo, | ||
Matt Mackall
|
r14568 | 'file': _local, | ||
Peter Arrenbrecht
|
r17192 | 'http': httppeer, | ||
'https': httppeer, | ||||
'ssh': sshpeer, | ||||
Matt Mackall
|
r14568 | 'static-http': statichttprepo, | ||
} | ||||
def _peerlookup(path): | ||||
u = util.url(path) | ||||
scheme = u.scheme or 'file' | ||||
Matt Mackall
|
r14606 | thing = schemes.get(scheme) or schemes['file'] | ||
Matt Mackall
|
r14568 | try: | ||
return thing(path) | ||||
except TypeError: | ||||
Yuya Nishihara
|
r25365 | # we can't test callable(thing) because 'thing' can be an unloaded | ||
# module that implements __call__ | ||||
if not util.safehasattr(thing, 'instance'): | ||||
raise | ||||
Matt Mackall
|
r14568 | return thing | ||
Matt Mackall
|
r14605 | def islocal(repo): | ||
Siddharth Agarwal
|
r20355 | '''return true if repo (or path pointing to repo) is local''' | ||
Pulkit Goyal
|
r33018 | if isinstance(repo, bytes): | ||
Matt Mackall
|
r14605 | try: | ||
return _peerlookup(repo).islocal(repo) | ||||
except AttributeError: | ||||
return False | ||||
return repo.local() | ||||
timeless
|
r42278 | def openpath(ui, path, sendaccept=True): | ||
Siddharth Agarwal
|
r17887 | '''open path with open if local, url.open if remote''' | ||
Siddharth Agarwal
|
r20354 | pathurl = util.url(path, parsequery=False, parsefragment=False) | ||
if pathurl.islocal(): | ||||
return util.posixfile(pathurl.localpath(), 'rb') | ||||
Siddharth Agarwal
|
r17887 | else: | ||
timeless
|
r42278 | return url.open(ui, path, sendaccept=sendaccept) | ||
Siddharth Agarwal
|
r17887 | |||
FUJIWARA Katsunori
|
r20858 | # a list of (ui, repo) functions called for wire peer initialization | ||
wirepeersetupfuncs = [] | ||||
Gregory Szorc
|
r37735 | def _peerorrepo(ui, path, create=False, presetupfuncs=None, | ||
Gregory Szorc
|
r39585 | intents=None, createopts=None): | ||
Matt Mackall
|
r14605 | """return a repository object for the specified path""" | ||
Gregory Szorc
|
r39585 | obj = _peerlookup(path).instance(ui, path, create, intents=intents, | ||
createopts=createopts) | ||||
Sune Foldager
|
r17191 | ui = getattr(obj, "ui", ui) | ||
Jun Wu
|
r32379 | for f in presetupfuncs or []: | ||
f(ui, obj) | ||||
Yuya Nishihara
|
r41032 | ui.log(b'extension', b'- executing reposetup hooks\n') | ||
Boris Feld
|
r39546 | with util.timedcm('all reposetup') as allreposetupstats: | ||
for name, module in extensions.extensions(ui): | ||||
Yuya Nishihara
|
r41032 | ui.log(b'extension', b' - running reposetup for %s\n', name) | ||
Boris Feld
|
r39546 | hook = getattr(module, 'reposetup', None) | ||
if hook: | ||||
with util.timedcm('reposetup %r', name) as stats: | ||||
hook(ui, obj) | ||||
Yuya Nishihara
|
r41032 | ui.log(b'extension', b' > reposetup for %s took %s\n', | ||
name, stats) | ||||
ui.log(b'extension', b'> all reposetup took %s\n', allreposetupstats) | ||||
FUJIWARA Katsunori
|
r20858 | if not obj.local(): | ||
for f in wirepeersetupfuncs: | ||||
f(ui, obj) | ||||
Sune Foldager
|
r17191 | return obj | ||
Gregory Szorc
|
r39585 | def repository(ui, path='', create=False, presetupfuncs=None, intents=None, | ||
createopts=None): | ||||
Sune Foldager
|
r17191 | """return a repository object for the specified path""" | ||
Gregory Szorc
|
r37735 | peer = _peerorrepo(ui, path, create, presetupfuncs=presetupfuncs, | ||
Gregory Szorc
|
r39585 | intents=intents, createopts=createopts) | ||
Sune Foldager
|
r17191 | repo = peer.local() | ||
if not repo: | ||||
Pierre-Yves David
|
r26587 | raise error.Abort(_("repository '%s' is not local") % | ||
Sune Foldager
|
r17191 | (path or peer.url())) | ||
Kevin Bullock
|
r18382 | return repo.filtered('visible') | ||
Matt Mackall
|
r14605 | |||
Gregory Szorc
|
r39585 | def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None): | ||
Matt Mackall
|
r14554 | '''return a repository peer for the specified path''' | ||
Idan Kamara
|
r14839 | rui = remoteui(uiorrepo, opts) | ||
Gregory Szorc
|
r39585 | return _peerorrepo(rui, path, create, intents=intents, | ||
createopts=createopts).peer() | ||||
Matt Mackall
|
r14554 | |||
Vadim Gelfer
|
r2719 | def defaultdest(source): | ||
Yuya Nishihara
|
r20799 | '''return default destination of clone if none is given | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'foo') | ||
Yuya Nishihara
|
r20799 | 'foo' | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'/foo/bar') | ||
Yuya Nishihara
|
r20799 | 'bar' | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'/') | ||
Yuya Nishihara
|
r20799 | '' | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'') | ||
Yuya Nishihara
|
r20800 | '' | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'http://example.org/') | ||
Yuya Nishihara
|
r20800 | '' | ||
Yuya Nishihara
|
r34133 | >>> defaultdest(b'http://example.org/foo/') | ||
Yuya Nishihara
|
r20799 | 'foo' | ||
''' | ||||
Yuya Nishihara
|
r20800 | path = util.url(source).path | ||
if not path: | ||||
return '' | ||||
return os.path.basename(os.path.normpath(path)) | ||||
Matt Mackall
|
r2774 | |||
Gregory Szorc
|
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 | ||||
if util.safehasattr(repo, 'srcrepo') and repo.srcrepo: | ||||
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 | ||||
Dan Villiom Podlaski Christiansen
|
r31133 | def share(ui, source, dest=None, update=True, bookmarks=True, defaultpath=None, | ||
relative=False): | ||||
Matt Mackall
|
r8800 | '''create a shared repository''' | ||
if not islocal(source): | ||||
Pierre-Yves David
|
r26587 | raise error.Abort(_('can only share local repositories')) | ||
Matt Mackall
|
r8800 | |||
Matt Mackall
|
r8807 | if not dest: | ||
Brendan Cully
|
r10099 | dest = defaultdest(source) | ||
Matt Mackall
|
r9344 | else: | ||
dest = ui.expandpath(dest) | ||||
Matt Mackall
|
r8807 | |||
Gregory Szorc
|
r36066 | if isinstance(source, bytes): | ||
Matt Mackall
|
r8800 | origsource = ui.expandpath(source) | ||
Sune Foldager
|
r10365 | source, branches = parseurl(origsource) | ||
Matt Mackall
|
r8800 | srcrepo = repository(ui, source) | ||
Sune Foldager
|
r10365 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) | ||
Matt Mackall
|
r8800 | else: | ||
Sune Foldager
|
r17191 | srcrepo = source.local() | ||
Matt Mackall
|
r8800 | checkout = None | ||
Gregory Szorc
|
r39885 | shareditems = set() | ||
if bookmarks: | ||||
shareditems.add(sharedbookmarks) | ||||
Gregory Szorc
|
r39884 | r = repository(ui, dest, create=True, createopts={ | ||
'sharedrepo': srcrepo, | ||||
'sharedrelative': relative, | ||||
Gregory Szorc
|
r39885 | 'shareditems': shareditems, | ||
Gregory Szorc
|
r39884 | }) | ||
Matt Mackall
|
r8800 | |||
Gregory Szorc
|
r39885 | postshare(srcrepo, r, defaultpath=defaultpath) | ||
Martin von Zweigbergk
|
r40609 | r = repository(ui, dest) | ||
Gregory Szorc
|
r28632 | _postshareupdate(r, update, checkout=checkout) | ||
Matt Harbison
|
r34816 | return r | ||
Matt Mackall
|
r8800 | |||
Matt Harbison
|
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. | ||||
Gregory Szorc
|
r39642 | |||
Returns a new repository object representing the unshared repository. | ||||
The passed repository object is not usable after this function is | ||||
called. | ||||
Matt Harbison
|
r34879 | """ | ||
Martin von Zweigbergk
|
r41436 | with repo.lock(): | ||
Matt Harbison
|
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) | ||||
Martin von Zweigbergk
|
r41436 | with destlock or util.nullcontextmanager(): | ||
Matt Harbison
|
r34879 | |||
Martin von Zweigbergk
|
r41436 | sharefile = repo.vfs.join('sharedpath') | ||
util.rename(sharefile, sharefile + '.old') | ||||
repo.requirements.discard('shared') | ||||
repo.requirements.discard('relshared') | ||||
repo._writerequirements() | ||||
Matt Harbison
|
r34879 | |||
Gregory Szorc
|
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) | ||||
Matt Harbison
|
r34879 | |||
Matt Harbison
|
r34880 | # TODO: figure out how to access subrepos that exist, but were previously | ||
# removed from .hgsub | ||||
Gregory Szorc
|
r39642 | c = newrepo['.'] | ||
Matt Harbison
|
r34880 | subs = c.substate | ||
for s in sorted(subs): | ||||
c.sub(s).unshare() | ||||
Gregory Szorc
|
r39642 | localrepo.poisonrepository(repo) | ||
return newrepo | ||||
Gregory Szorc
|
r39885 | def postshare(sourcerepo, destrepo, defaultpath=None): | ||
Gregory Szorc
|
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. | ||||
""" | ||||
Gregory Szorc
|
r30041 | default = defaultpath or sourcerepo.ui.config('paths', 'default') | ||
Gregory Szorc
|
r27354 | if default: | ||
Yuya Nishihara
|
r35640 | template = ('[paths]\n' | ||
'default = %s\n') | ||||
destrepo.vfs.write('hgrc', util.tonativeeol(template % default)) | ||||
Martin von Zweigbergk
|
r41072 | if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: | ||
with destrepo.wlock(): | ||||
Martin von Zweigbergk
|
r41265 | narrowspec.copytoworkingcopy(destrepo) | ||
Gregory Szorc
|
r27354 | |||
Gregory Szorc
|
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 | ||||
repo.ui.status(_("updating working directory\n")) | ||||
if update is not True: | ||||
checkout = update | ||||
for test in (checkout, 'default', 'tip'): | ||||
if test is None: | ||||
continue | ||||
try: | ||||
uprev = repo.lookup(test) | ||||
break | ||||
except error.RepoLookupError: | ||||
continue | ||||
_update(repo, uprev) | ||||
Simon Heimberg
|
r15078 | def copystore(ui, srcrepo, destpath): | ||
'''copy files from store of srcrepo in destpath | ||||
returns destlock | ||||
''' | ||||
destlock = None | ||||
try: | ||||
hardlink = None | ||||
Martin von Zweigbergk
|
r38399 | topic = _('linking') if hardlink else _('copying') | ||
r40671 | with ui.makeprogress(topic, unit=_('files')) as progress: | |||
Matt Harbison
|
r39425 | num = 0 | ||
srcpublishing = srcrepo.publishing() | ||||
srcvfs = vfsmod.vfs(srcrepo.sharedpath) | ||||
dstvfs = vfsmod.vfs(destpath) | ||||
for f in srcrepo.store.copylist(): | ||||
if srcpublishing and f.endswith('phaseroots'): | ||||
continue | ||||
dstbase = os.path.dirname(f) | ||||
if dstbase and not dstvfs.exists(dstbase): | ||||
dstvfs.mkdir(dstbase) | ||||
if srcvfs.exists(f): | ||||
if f.endswith('data'): | ||||
# 'dstbase' may be empty (e.g. revlog format 0) | ||||
lockfile = os.path.join(dstbase, "lock") | ||||
# lock to avoid premature writing to the target | ||||
destlock = lock.lock(dstvfs, lockfile) | ||||
hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f), | ||||
hardlink, progress) | ||||
num += n | ||||
if hardlink: | ||||
ui.debug("linked %d files\n" % num) | ||||
else: | ||||
ui.debug("copied %d files\n" % num) | ||||
Simon Heimberg
|
r15078 | return destlock | ||
Brodie Rao
|
r16705 | except: # re-raises | ||
Simon Heimberg
|
r15078 | release(destlock) | ||
raise | ||||
Gregory Szorc
|
r25761 | def clonewithshare(ui, peeropts, sharepath, source, srcpeer, dest, pull=False, | ||
rev=None, update=True, stream=False): | ||||
"""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: | ||||
if not srcpeer.capable('lookup'): | ||||
Pierre-Yves David
|
r26587 | raise error.Abort(_("src repository does not support " | ||
Gregory Szorc
|
r25761 | "revision lookup and so doesn't " | ||
"support clone by revision")) | ||||
Gregory Szorc
|
r37658 | |||
# TODO this is batchable. | ||||
remoterevs = [] | ||||
for r in rev: | ||||
with srcpeer.commandexecutor() as e: | ||||
remoterevs.append(e.callcommand('lookup', { | ||||
'key': r, | ||||
}).result()) | ||||
revs = remoterevs | ||||
Gregory Szorc
|
r25761 | |||
Gregory Szorc
|
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 | ||||
Pierre-Yves David
|
r31218 | poolvfs = vfsmod.vfs(pooldir) | ||
Gregory Szorc
|
r25761 | basename = os.path.basename(sharepath) | ||
Gregory Szorc
|
r28289 | with lock.lock(poolvfs, '%s.lock' % basename): | ||
if os.path.exists(sharepath): | ||||
ui.status(_('(sharing from existing pooled repository %s)\n') % | ||||
basename) | ||||
else: | ||||
ui.status(_('(sharing from new pooled repository %s)\n') % basename) | ||||
# Always use pull mode because hardlinks in share mode don't work | ||||
# well. Never update because working copies aren't necessary in | ||||
# share mode. | ||||
clone(ui, peeropts, source, dest=sharepath, pull=True, | ||||
Martin von Zweigbergk
|
r37279 | revs=rev, update=False, stream=stream) | ||
Gregory Szorc
|
r25761 | |||
Gregory Szorc
|
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 | ||||
Gregory Szorc
|
r25761 | sharerepo = repository(ui, path=sharepath) | ||
Martin von Zweigbergk
|
r40610 | destrepo = share(ui, sharerepo, dest=dest, update=False, bookmarks=False, | ||
defaultpath=defaultpath) | ||||
Gregory Szorc
|
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) | ||||
Gregory Szorc
|
r28632 | _postshareupdate(destrepo, update) | ||
Gregory Szorc
|
r25761 | return srcpeer, peer(ui, peeropts, dest) | ||
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)""" | ||||
srcbranchcache = srcrepo.vfs.join('cache/%s' % fname) | ||||
dstbranchcache = os.path.join(dstcachedir, fname) | ||||
if os.path.exists(srcbranchcache): | ||||
if not os.path.exists(dstcachedir): | ||||
os.mkdir(dstcachedir) | ||||
util.copyfile(srcbranchcache, dstbranchcache) | ||||
Martin von Zweigbergk
|
r37279 | def clone(ui, peeropts, source, dest=None, pull=False, revs=None, | ||
Gregory Szorc
|
r39586 | update=True, stream=False, branch=None, shareopts=None, | ||
Gregory Szorc
|
r40367 | storeincludepats=None, storeexcludepats=None, depth=None): | ||
Vadim Gelfer
|
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 | ||||
Sune Foldager
|
r17191 | function. Returns a pair of repository peers, the source and | ||
Vadim Gelfer
|
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. | ||||
Vadim Gelfer
|
r2600 | |||
Vadim Gelfer
|
r2719 | Arguments: | ||
source: repository object or URL | ||||
Vadim Gelfer
|
r2597 | |||
dest: URL of destination repository to create (defaults to base | ||||
name of source repository) | ||||
Siddharth Agarwal
|
r23545 | pull: always pull from source repository, even in local case or if the | ||
server prefers streaming | ||||
Vadim Gelfer
|
r2597 | |||
Vadim Gelfer
|
r2621 | stream: stream raw data uncompressed from repository (fast over | ||
LAN, slow over WAN) | ||||
Vadim Gelfer
|
r2613 | |||
Martin von Zweigbergk
|
r37279 | revs: revision to clone up to (implies pull=True) | ||
Vadim Gelfer
|
r2597 | |||
update: update working directory after clone completes, if | ||||
Bryan O'Sullivan
|
r6526 | destination is local repository (True means update to default rev, | ||
anything else is treated as a revision) | ||||
Sune Foldager
|
r10379 | |||
branch: branches to clone | ||||
Gregory Szorc
|
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." | ||||
Gregory Szorc
|
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. | ||||
Vadim Gelfer
|
r2597 | """ | ||
Matt Mackall
|
r4478 | |||
Pulkit Goyal
|
r32970 | if isinstance(source, bytes): | ||
Alexis S. L. Carvalho
|
r6089 | origsource = ui.expandpath(source) | ||
Martin von Zweigbergk
|
r37278 | source, branches = parseurl(origsource, branch) | ||
Sune Foldager
|
r17191 | srcpeer = peer(ui, peeropts, source) | ||
Vadim Gelfer
|
r2719 | else: | ||
Sune Foldager
|
r17191 | srcpeer = source.peer() # in case we were called with a localrepo | ||
Martin von Zweigbergk
|
r37278 | branches = (None, branch or []) | ||
Sune Foldager
|
r17191 | origsource = source = srcpeer.url() | ||
Martin von Zweigbergk
|
r37279 | revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs) | ||
Vadim Gelfer
|
r2719 | |||
Vadim Gelfer
|
r2597 | if dest is None: | ||
Vadim Gelfer
|
r2719 | dest = defaultdest(source) | ||
Yuya Nishihara
|
r20800 | if dest: | ||
ui.status(_("destination directory: %s\n") % dest) | ||||
Matt Mackall
|
r9344 | else: | ||
dest = ui.expandpath(dest) | ||||
Vadim Gelfer
|
r2719 | |||
Mads Kiilerich
|
r14825 | dest = util.urllocalpath(dest) | ||
source = util.urllocalpath(source) | ||||
Vadim Gelfer
|
r2597 | |||
FUJIWARA Katsunori
|
r17159 | if not dest: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("empty destination path is not valid")) | ||
Chinmay Joshi
|
r21803 | |||
Pierre-Yves David
|
r31218 | destvfs = vfsmod.vfs(dest, expandpath=True) | ||
Chinmay Joshi
|
r21803 | if destvfs.lexists(): | ||
if not destvfs.isdir(): | ||||
Pierre-Yves David
|
r26587 | raise error.Abort(_("destination '%s' already exists") % dest) | ||
Chinmay Joshi
|
r21804 | elif destvfs.listdir(): | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("destination '%s' is not empty") % dest) | ||
Vadim Gelfer
|
r2597 | |||
Gregory Szorc
|
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: | ||||
storeincludepats = {'path:.'} | ||||
createopts['narrowfiles'] = True | ||||
Gregory Szorc
|
r40426 | if depth: | ||
createopts['shallowfilestore'] = True | ||||
Matt Harbison
|
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. | ||||
createopts['lfs'] = True | ||||
if extensions.disabledext('lfs'): | ||||
ui.status(_('(remote is using large file support (lfs), but it is ' | ||||
'explicitly disabled in the local configuration)\n')) | ||||
else: | ||||
ui.status(_('(remote is using large file support (lfs); lfs will ' | ||||
'be enabled for this repository)\n')) | ||||
Gregory Szorc
|
r25761 | shareopts = shareopts or {} | ||
sharepool = shareopts.get('pool') | ||||
sharenamemode = shareopts.get('mode') | ||||
FUJIWARA Katsunori
|
r26026 | if sharepool and islocal(dest): | ||
Gregory Szorc
|
r25761 | sharepath = None | ||
if sharenamemode == 'identity': | ||||
# 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: | ||||
Gregory Szorc
|
r37658 | with srcpeer.commandexecutor() as e: | ||
rootnode = e.callcommand('lookup', { | ||||
'key': '0', | ||||
}).result() | ||||
Gregory Szorc
|
r25761 | if rootnode != node.nullid: | ||
sharepath = os.path.join(sharepool, node.hex(rootnode)) | ||||
else: | ||||
ui.status(_('(not using pooled storage: ' | ||||
'remote appears to be empty)\n')) | ||||
except error.RepoLookupError: | ||||
ui.status(_('(not using pooled storage: ' | ||||
'unable to resolve identity of remote)\n')) | ||||
elif sharenamemode == 'remote': | ||||
Augie Fackler
|
r29341 | sharepath = os.path.join( | ||
Pulkit Goyal
|
r35600 | sharepool, node.hex(hashlib.sha1(source).digest())) | ||
Gregory Szorc
|
r25761 | else: | ||
liscju
|
r29389 | raise error.Abort(_('unknown share naming mode: %s') % | ||
sharenamemode) | ||||
Gregory Szorc
|
r25761 | |||
Gregory Szorc
|
r39586 | # TODO this is a somewhat arbitrary restriction. | ||
if narrow: | ||||
ui.status(_('(pooled storage not supported for narrow clones)\n')) | ||||
sharepath = None | ||||
Gregory Szorc
|
r25761 | if sharepath: | ||
return clonewithshare(ui, peeropts, sharepath, source, srcpeer, | ||||
Martin von Zweigbergk
|
r37279 | dest, pull=pull, rev=revs, update=update, | ||
Gregory Szorc
|
r25761 | stream=stream) | ||
Augie Fackler
|
r18441 | srclock = destlock = cleandir = None | ||
Sune Foldager
|
r17191 | srcrepo = srcpeer.local() | ||
Matt Mackall
|
r4915 | try: | ||
Brendan Cully
|
r14377 | abspath = origsource | ||
if islocal(origsource): | ||||
Mads Kiilerich
|
r14825 | abspath = os.path.abspath(util.urllocalpath(origsource)) | ||
Brendan Cully
|
r14377 | |||
Matt Mackall
|
r4915 | if islocal(dest): | ||
Augie Fackler
|
r18441 | cleandir = dest | ||
Vadim Gelfer
|
r2597 | |||
Matt Mackall
|
r4915 | copy = False | ||
Sune Foldager
|
r17194 | if (srcrepo and srcrepo.cancopy() and islocal(dest) | ||
Pierre-Yves David
|
r17671 | and not phases.hassecret(srcrepo)): | ||
Martin von Zweigbergk
|
r37279 | copy = not pull and not revs | ||
Vadim Gelfer
|
r2597 | |||
Gregory Szorc
|
r39586 | # TODO this is a somewhat arbitrary restriction. | ||
if narrow: | ||||
copy = False | ||||
Matt Mackall
|
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 | ||||
Martin Geisler
|
r14463 | srclock = srcrepo.lock(wait=False) | ||
Matt Mackall
|
r7640 | except error.LockError: | ||
Matt Mackall
|
r4915 | copy = False | ||
Vadim Gelfer
|
r2597 | |||
Matt Mackall
|
r4915 | if copy: | ||
Martin Geisler
|
r14463 | srcrepo.hook('preoutgoing', throw=True, source='clone') | ||
Matt Mackall
|
r15381 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) | ||
Matt Mackall
|
r4915 | if not os.path.exists(dest): | ||
Matt Harbison
|
r39221 | util.makedirs(dest) | ||
Steve Borho
|
r7935 | else: | ||
# only clean up directories we create ourselves | ||||
Augie Fackler
|
r18441 | cleandir = hgdir | ||
Matt Mackall
|
r5569 | try: | ||
Martin Geisler
|
r14463 | destpath = hgdir | ||
util.makedir(destpath, notindexed=True) | ||||
Gregory Szorc
|
r25660 | except OSError as inst: | ||
Matt Mackall
|
r5569 | if inst.errno == errno.EEXIST: | ||
Augie Fackler
|
r18441 | cleandir = None | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("destination '%s' already exists") | ||
Matt Mackall
|
r5569 | % dest) | ||
raise | ||||
Vadim Gelfer
|
r2597 | |||
Simon Heimberg
|
r15078 | destlock = copystore(ui, srcrepo, destpath) | ||
Pierre-Yves David
|
r22646 | # copy bookmarks over | ||
Pierre-Yves David
|
r31322 | srcbookmarks = srcrepo.vfs.join('bookmarks') | ||
Pierre-Yves David
|
r22646 | dstbookmarks = os.path.join(destpath, 'bookmarks') | ||
if os.path.exists(srcbookmarks): | ||||
util.copyfile(srcbookmarks, dstbookmarks) | ||||
Vadim Gelfer
|
r2597 | |||
Tomasz Kleczek
|
r17740 | dstcachedir = os.path.join(destpath, 'cache') | ||
Boris Feld
|
r35784 | for cache in cacheutil.cachetocopy(srcrepo): | ||
r32493 | _copycache(srcrepo, dstcachedir, cache) | |||
Tomasz Kleczek
|
r17740 | |||
Matt Mackall
|
r4915 | # we need to re-init the repo after manually copying the data | ||
# into it | ||||
Simon Heimberg
|
r17874 | destpeer = peer(srcrepo, peeropts, dest) | ||
Martin Geisler
|
r14463 | srcrepo.hook('outgoing', source='clone', | ||
Martin Geisler
|
r12144 | node=node.hex(node.nullid)) | ||
Matt Mackall
|
r4915 | else: | ||
Matt Mackall
|
r5569 | try: | ||
Gregory Szorc
|
r39586 | # only pass ui when no srcrepo | ||
destpeer = peer(srcrepo or ui, peeropts, dest, create=True, | ||||
createopts=createopts) | ||||
Gregory Szorc
|
r25660 | except OSError as inst: | ||
Matt Mackall
|
r5569 | if inst.errno == errno.EEXIST: | ||
Augie Fackler
|
r18441 | cleandir = None | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("destination '%s' already exists") | ||
Matt Mackall
|
r5569 | % dest) | ||
raise | ||||
Vadim Gelfer
|
r2597 | |||
Martin von Zweigbergk
|
r37279 | if revs: | ||
Sune Foldager
|
r17191 | if not srcpeer.capable('lookup'): | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("src repository does not support " | ||
Martin Geisler
|
r9171 | "revision lookup and so doesn't " | ||
"support clone by revision")) | ||||
Gregory Szorc
|
r37658 | |||
# TODO this is batchable. | ||||
remoterevs = [] | ||||
for rev in revs: | ||||
with srcpeer.commandexecutor() as e: | ||||
remoterevs.append(e.callcommand('lookup', { | ||||
'key': rev, | ||||
}).result()) | ||||
revs = remoterevs | ||||
Brett Carter
|
r8417 | checkout = revs[0] | ||
Martin von Zweigbergk
|
r37279 | else: | ||
revs = None | ||||
Augie Fackler
|
r27165 | local = destpeer.local() | ||
if local: | ||||
Gregory Szorc
|
r39591 | if narrow: | ||
Martin von Zweigbergk
|
r41072 | with local.wlock(), local.lock(): | ||
Gregory Szorc
|
r39591 | local.setnarrowpats(storeincludepats, storeexcludepats) | ||
Martin von Zweigbergk
|
r41272 | narrowspec.copytoworkingcopy(local) | ||
Gregory Szorc
|
r39591 | |||
Boris Feld
|
r35581 | u = util.url(abspath) | ||
defaulturl = bytes(u) | ||||
local.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||||
Siddharth Agarwal
|
r23545 | if not stream: | ||
if pull: | ||||
stream = False | ||||
else: | ||||
stream = None | ||||
Augie Fackler
|
r27165 | # internal config: ui.quietbookmarkmove | ||
Jun Wu
|
r31456 | overrides = {('ui', 'quietbookmarkmove'): True} | ||
with local.ui.configoverride(overrides, 'clone'): | ||||
Augie Fackler
|
r27165 | exchange.pull(local, srcpeer, revs, | ||
Gregory Szorc
|
r39589 | streamclonerequested=stream, | ||
includepats=storeincludepats, | ||||
Gregory Szorc
|
r40367 | excludepats=storeexcludepats, | ||
depth=depth) | ||||
Sune Foldager
|
r17191 | elif srcrepo: | ||
Gregory Szorc
|
r39586 | # TODO lift restriction once exchange.push() accepts narrow | ||
# push. | ||||
if narrow: | ||||
raise error.Abort(_('narrow clone not available for ' | ||||
'remote destinations')) | ||||
Pierre-Yves David
|
r22647 | exchange.push(srcrepo, destpeer, revs=revs, | ||
bookmarks=srcrepo._bookmarks.keys()) | ||||
Matt Mackall
|
r4915 | else: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_("clone from remote to remote not supported") | ||
) | ||||
Vadim Gelfer
|
r2597 | |||
Augie Fackler
|
r18441 | cleandir = None | ||
Vadim Gelfer
|
r2597 | |||
Sune Foldager
|
r17191 | destrepo = destpeer.local() | ||
if destrepo: | ||||
Jordi Gutiérrez Hermoso
|
r22837 | template = uimod.samplehgrcs['cloned'] | ||
Augie Fackler
|
r15552 | u = util.url(abspath) | ||
u.passwd = None | ||||
Yuya Nishihara
|
r33650 | defaulturl = bytes(u) | ||
Yuya Nishihara
|
r35638 | destrepo.vfs.write('hgrc', util.tonativeeol(template % defaulturl)) | ||
Mads Kiilerich
|
r20790 | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||
Matt Mackall
|
r8814 | |||
Pulkit Goyal
|
r35332 | if ui.configbool('experimental', 'remotenames'): | ||
Pulkit Goyal
|
r35348 | logexchange.pullremotenames(destrepo, srcpeer) | ||
Pulkit Goyal
|
r35332 | |||
Matt Mackall
|
r4915 | if update: | ||
Bryan O'Sullivan
|
r6526 | if update is not True: | ||
Gregory Szorc
|
r37658 | with srcpeer.commandexecutor() as e: | ||
checkout = e.callcommand('lookup', { | ||||
'key': update, | ||||
}).result() | ||||
Thomas Arendsen Hein
|
r17867 | uprev = None | ||
Adrian Buehlmann
|
r17882 | status = None | ||
Thomas Arendsen Hein
|
r17867 | if checkout is not None: | ||
Boris Feld
|
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: | ||||
Martin von Zweigbergk
|
r37498 | uprev = checkout | ||
Boris Feld
|
r38776 | elif scmutil.isrevsymbol(destrepo, checkout): | ||
uprev = scmutil.revsymbol(destrepo, checkout).node() | ||||
Martin von Zweigbergk
|
r37498 | else: | ||
Sean Farley
|
r26354 | if update is not True: | ||
try: | ||||
uprev = destrepo.lookup(update) | ||||
except error.RepoLookupError: | ||||
pass | ||||
Thomas Arendsen Hein
|
r17867 | if uprev is None: | ||
try: | ||||
uprev = destrepo._bookmarks['@'] | ||||
Thomas Arendsen Hein
|
r17870 | update = '@' | ||
Adrian Buehlmann
|
r17882 | bn = destrepo[uprev].branch() | ||
if bn == 'default': | ||||
status = _("updating to bookmark @\n") | ||||
else: | ||||
FUJIWARA Katsunori
|
r20868 | status = (_("updating to bookmark @ on branch %s\n") | ||
Sean Farley
|
r26353 | % bn) | ||
Thomas Arendsen Hein
|
r17867 | except KeyError: | ||
try: | ||||
uprev = destrepo.branchtip('default') | ||||
except error.RepoLookupError: | ||||
uprev = destrepo.lookup('tip') | ||||
Adrian Buehlmann
|
r17882 | if not status: | ||
bn = destrepo[uprev].branch() | ||||
status = _("updating to branch %s\n") % bn | ||||
destrepo.ui.status(status) | ||||
Martin Geisler
|
r14463 | _update(destrepo, uprev) | ||
Thomas Arendsen Hein
|
r17703 | if update in destrepo._bookmarks: | ||
Ryan McElroy
|
r24945 | bookmarks.activate(destrepo, update) | ||
Matt Mackall
|
r4915 | finally: | ||
Matt Mackall
|
r15908 | release(srclock, destlock) | ||
Augie Fackler
|
r18441 | if cleandir is not None: | ||
shutil.rmtree(cleandir, True) | ||||
Sune Foldager
|
r17191 | if srcpeer is not None: | ||
srcpeer.close() | ||||
simon@laptop-tosh
|
r19313 | return srcpeer, destpeer | ||
Matt Mackall
|
r2775 | |||
timeless
|
r27402 | def _showstats(repo, stats, quietempty=False): | ||
Gregory Szorc
|
r37143 | if quietempty and stats.isempty(): | ||
timeless
|
r27402 | return | ||
Martin Geisler
|
r9454 | repo.ui.status(_("%d files updated, %d files merged, " | ||
Gregory Szorc
|
r37125 | "%d files removed, %d files unresolved\n") % ( | ||
stats.updatedcount, stats.mergedcount, | ||||
stats.removedcount, stats.unresolvedcount)) | ||||
Matt Mackall
|
r3316 | |||
Martin von Zweigbergk
|
r31166 | def updaterepo(repo, node, overwrite, updatecheck=None): | ||
Simon Heimberg
|
r17895 | """Update the working directory to node. | ||
When overwrite is set, changes are clobbered, merged else | ||||
returns stats (see pydoc mercurial.merge.applyupdates)""" | ||||
Martin von Zweigbergk
|
r40402 | return mergemod.update(repo, node, branchmerge=False, force=overwrite, | ||
Martin von Zweigbergk
|
r31166 | labels=['working copy', 'destination'], | ||
updatecheck=updatecheck) | ||||
Simon Heimberg
|
r17895 | |||
Martin von Zweigbergk
|
r31166 | def update(repo, node, quietempty=False, updatecheck=None): | ||
"""update the working directory to node""" | ||||
stats = updaterepo(repo, node, False, updatecheck=updatecheck) | ||||
timeless
|
r27404 | _showstats(repo, stats, quietempty) | ||
Gregory Szorc
|
r37143 | if stats.unresolvedcount: | ||
Matt Mackall
|
r6518 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) | ||
Gregory Szorc
|
r37143 | return stats.unresolvedcount > 0 | ||
Matt Mackall
|
r2775 | |||
Benoit Boissinot
|
r7546 | # naming conflict in clone() | ||
_update = update | ||||
timeless
|
r27403 | def clean(repo, node, show_stats=True, quietempty=False): | ||
Matt Mackall
|
r2808 | """forcibly switch the working directory to node, clobbering changes""" | ||
Simon Heimberg
|
r17895 | stats = updaterepo(repo, node, True) | ||
Mads Kiilerich
|
r31311 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) | ||
Matt Mackall
|
r10282 | if show_stats: | ||
timeless
|
r27403 | _showstats(repo, stats, quietempty) | ||
Gregory Szorc
|
r37143 | return stats.unresolvedcount > 0 | ||
Matt Mackall
|
r2775 | |||
FUJIWARA Katsunori
|
r28501 | # naming conflict in updatetotally() | ||
_clean = clean | ||||
Martin von Zweigbergk
|
r31166 | def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None): | ||
FUJIWARA Katsunori
|
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 | ||||
Martin von Zweigbergk
|
r31166 | :updatecheck: how to deal with a dirty working directory | ||
Valid values for updatecheck are (None => linear): | ||||
* 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 | ||||
changes into destination | ||||
Martin von Zweigbergk
|
r31168 | * noconflict: check that the update does not result in file merges | ||
FUJIWARA Katsunori
|
r28501 | |||
This returns whether conflict is detected at updating or not. | ||||
""" | ||||
Martin von Zweigbergk
|
r31166 | if updatecheck is None: | ||
Augie Fackler
|
r34706 | updatecheck = ui.config('commands', 'update.check') | ||
Martin von Zweigbergk
|
r31168 | if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): | ||
Martin von Zweigbergk
|
r31167 | # If not configured, or invalid value configured | ||
updatecheck = 'linear' | ||||
FUJIWARA Katsunori
|
r28503 | with repo.wlock(): | ||
FUJIWARA Katsunori
|
r28501 | movemarkfrom = None | ||
warndest = False | ||||
if checkout is None: | ||||
Martin von Zweigbergk
|
r30962 | updata = destutil.destupdate(repo, clean=clean) | ||
FUJIWARA Katsunori
|
r28501 | checkout, movemarkfrom, brev = updata | ||
warndest = True | ||||
if clean: | ||||
ret = _clean(repo, checkout) | ||||
else: | ||||
Martin von Zweigbergk
|
r31166 | if updatecheck == 'abort': | ||
Martin von Zweigbergk
|
r30963 | cmdutil.bailifchanged(repo, merge=False) | ||
Martin von Zweigbergk
|
r31166 | updatecheck = 'none' | ||
ret = _update(repo, checkout, updatecheck=updatecheck) | ||||
FUJIWARA Katsunori
|
r28501 | |||
if not ret and movemarkfrom: | ||||
if movemarkfrom == repo['.'].node(): | ||||
pass # no-op update | ||||
elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | ||||
Pierre-Yves David
|
r29902 | b = ui.label(repo._activebookmark, 'bookmarks.active') | ||
ui.status(_("updating bookmark %s\n") % b) | ||||
FUJIWARA Katsunori
|
r28501 | else: | ||
# this can happen with a non-linear update | ||||
Pierre-Yves David
|
r29902 | b = ui.label(repo._activebookmark, 'bookmarks') | ||
ui.status(_("(leaving bookmark %s)\n") % b) | ||||
FUJIWARA Katsunori
|
r28501 | bookmarks.deactivate(repo) | ||
elif brev in repo._bookmarks: | ||||
if brev != repo._activebookmark: | ||||
Pierre-Yves David
|
r29902 | b = ui.label(brev, 'bookmarks.active') | ||
ui.status(_("(activating bookmark %s)\n") % b) | ||||
FUJIWARA Katsunori
|
r28501 | bookmarks.activate(repo, brev) | ||
elif brev: | ||||
if repo._activebookmark: | ||||
Pierre-Yves David
|
r29902 | b = ui.label(repo._activebookmark, 'bookmarks') | ||
ui.status(_("(leaving bookmark %s)\n") % b) | ||||
FUJIWARA Katsunori
|
r28501 | bookmarks.deactivate(repo) | ||
if warndest: | ||||
destutil.statusotherdests(ui, repo) | ||||
return ret | ||||
Pulkit Goyal
|
r35722 | def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None, | ||
abort=False): | ||||
Greg Ward
|
r13162 | """Branch merge with node, resolving changes. Return true if any | ||
unresolved conflicts.""" | ||||
Taapas Agrawal
|
r42803 | if abort: | ||
Taapas Agrawal
|
r42810 | return abortmerge(repo.ui, repo) | ||
Pulkit Goyal
|
r35722 | |||
Taapas Agrawal
|
r42803 | stats = mergemod.update(repo, node, branchmerge=True, force=force, | ||
mergeforce=mergeforce, labels=labels) | ||||
Matt Mackall
|
r3316 | _showstats(repo, stats) | ||
Gregory Szorc
|
r37143 | if stats.unresolvedcount: | ||
Augie Fackler
|
r7821 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | ||
Pulkit Goyal
|
r35722 | "or 'hg merge --abort' to abandon\n")) | ||
Taapas Agrawal
|
r42803 | elif remind: | ||
Matt Mackall
|
r3316 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) | ||
Gregory Szorc
|
r37143 | return stats.unresolvedcount > 0 | ||
Matt Mackall
|
r2808 | |||
Taapas Agrawal
|
r42810 | def abortmerge(ui, repo): | ||
Taapas Agrawal
|
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 | ||||
node = repo['.'].hex() | ||||
repo.ui.status(_("aborting the merge, updating back to" | ||||
" %s\n") % node[:12]) | ||||
Taapas Agrawal
|
r42810 | stats = mergemod.update(repo, node, branchmerge=False, force=True) | ||
Taapas Agrawal
|
r42803 | _showstats(repo, stats) | ||
return stats.unresolvedcount > 0 | ||||
Nicolas Dumazet
|
r12730 | def _incoming(displaychlist, subreporecurse, ui, repo, source, | ||
opts, buffered=False): | ||||
""" | ||||
Helper for incoming / gincoming. | ||||
displaychlist gets called with | ||||
(remoterepo, incomingchangesetlist, displayer) parameters, | ||||
and is supposed to contain only code that can't be unified. | ||||
""" | ||||
source, branches = parseurl(ui.expandpath(source), opts.get('branch')) | ||||
Matt Mackall
|
r14556 | other = peer(repo, opts, source) | ||
Brodie Rao
|
r14076 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | ||
Nicolas Dumazet
|
r12730 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) | ||
if revs: | ||||
revs = [other.lookup(rev) for rev in revs] | ||||
Peter Arrenbrecht
|
r14161 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, | ||
revs, opts["bundle"], opts["force"]) | ||||
try: | ||||
if not chlist: | ||||
ui.status(_("no changes found\n")) | ||||
return subreporecurse() | ||||
Augie Fackler
|
r31057 | ui.pager('incoming') | ||
Yuya Nishihara
|
r36020 | displayer = logcmdutil.changesetdisplayer(ui, other, opts, | ||
buffered=buffered) | ||||
Nicolas Dumazet
|
r12730 | displaychlist(other, chlist, displayer) | ||
displayer.close() | ||||
finally: | ||||
Peter Arrenbrecht
|
r14161 | cleanupfn() | ||
Nicolas Dumazet
|
r12730 | subreporecurse() | ||
return 0 # exit code is zero since we found incoming changes | ||||
Martin Geisler
|
r12273 | def incoming(ui, repo, source, opts): | ||
Nicolas Dumazet
|
r12730 | def subreporecurse(): | ||
Erik Zielke
|
r12400 | ret = 1 | ||
if opts.get('subrepos'): | ||||
ctx = repo[None] | ||||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
ret = min(ret, sub.incoming(ui, source, opts)) | ||||
return ret | ||||
Nicolas Dumazet
|
r12730 | def display(other, chlist, displayer): | ||
Yuya Nishihara
|
r35906 | limit = logcmdutil.getlimit(opts) | ||
Martin Geisler
|
r12273 | if opts.get('newest_first'): | ||
Nicolas Dumazet
|
r12729 | chlist.reverse() | ||
Martin Geisler
|
r12273 | count = 0 | ||
Nicolas Dumazet
|
r12729 | for n in chlist: | ||
Martin Geisler
|
r12273 | if limit is not None and count >= limit: | ||
break | ||||
parents = [p for p in other.changelog.parents(n) if p != nullid] | ||||
if opts.get('no_merges') and len(parents) == 2: | ||||
continue | ||||
count += 1 | ||||
displayer.show(other[n]) | ||||
Nicolas Dumazet
|
r12730 | return _incoming(display, subreporecurse, ui, repo, source, opts) | ||
Martin Geisler
|
r12273 | |||
Nicolas Dumazet
|
r12735 | def _outgoing(ui, repo, dest, opts): | ||
Hollis Blanchard
|
r35454 | path = ui.paths.getpath(dest, default=('default-push', 'default')) | ||
if not path: | ||||
raise error.Abort(_('default repository not configured!'), | ||||
hint=_("see 'hg help config.paths'")) | ||||
dest = path.pushloc or path.loc | ||||
branches = path.branch, opts.get('branch') or [] | ||||
Brodie Rao
|
r14076 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | ||
Nicolas Dumazet
|
r12735 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) | ||
if revs: | ||||
Martin von Zweigbergk
|
r37329 | revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)] | ||
Nicolas Dumazet
|
r12735 | |||
Matt Mackall
|
r14556 | other = peer(repo, opts, dest) | ||
Martin von Zweigbergk
|
r32172 | outgoing = discovery.findcommonoutgoing(repo, other, revs, | ||
Pierre-Yves David
|
r15837 | force=opts.get('force')) | ||
o = outgoing.missing | ||||
Nicolas Dumazet
|
r12735 | if not o: | ||
Patrick Mezard
|
r17248 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | ||
FUJIWARA Katsunori
|
r21050 | return o, other | ||
Nicolas Dumazet
|
r12735 | |||
Martin Geisler
|
r12271 | def outgoing(ui, repo, dest, opts): | ||
Erik Zielke
|
r12400 | def recurse(): | ||
ret = 1 | ||||
if opts.get('subrepos'): | ||||
ctx = repo[None] | ||||
for subpath in sorted(ctx.substate): | ||||
sub = ctx.sub(subpath) | ||||
ret = min(ret, sub.outgoing(ui, dest, opts)) | ||||
return ret | ||||
Yuya Nishihara
|
r35906 | limit = logcmdutil.getlimit(opts) | ||
FUJIWARA Katsunori
|
r21050 | o, other = _outgoing(ui, repo, dest, opts) | ||
FUJIWARA Katsunori
|
r21049 | if not o: | ||
FUJIWARA Katsunori
|
r21051 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | ||
Erik Zielke
|
r12400 | return recurse() | ||
Martin Geisler
|
r12271 | if opts.get('newest_first'): | ||
o.reverse() | ||||
Augie Fackler
|
r31058 | ui.pager('outgoing') | ||
Yuya Nishihara
|
r35906 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | ||
Martin Geisler
|
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] | ||||
if opts.get('no_merges') and len(parents) == 2: | ||||
continue | ||||
count += 1 | ||||
displayer.show(repo[n]) | ||||
displayer.close() | ||||
FUJIWARA Katsunori
|
r21051 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | ||
Erik Zielke
|
r12400 | recurse() | ||
return 0 # exit code is zero since we found outgoing changes | ||||
Martin Geisler
|
r12271 | |||
r42331 | def verify(repo, level=None): | |||
Matt Mackall
|
r2778 | """verify the consistency of a repository""" | ||
r42331 | ret = verifymod.verify(repo, level=level) | |||
Matt Harbison
|
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 | ||||
revs = repo.revs("filelog(%s)", | ||||
util.pathto(repo.root, repo.getcwd(), '.hgsubstate')) | ||||
if revs: | ||||
repo.ui.status(_('checking subrepo links\n')) | ||||
for rev in revs: | ||||
ctx = repo[rev] | ||||
try: | ||||
for subpath in ctx.substate: | ||||
Matt Harbison
|
r29021 | try: | ||
ret = (ctx.sub(subpath, allowcreate=False).verify() | ||||
or ret) | ||||
except error.RepoError as e: | ||||
Pulkit Goyal
|
r37597 | repo.ui.warn(('%d: %s\n') % (rev, e)) | ||
Matt Harbison
|
r25591 | except Exception: | ||
repo.ui.warn(_('.hgsubstate is corrupt in revision %s\n') % | ||||
node.short(ctx.node())) | ||||
return ret | ||||
Matt Mackall
|
r11273 | |||
def remoteui(src, opts): | ||||
'build a remote ui from ui or repo and opts' | ||||
Augie Fackler
|
r14952 | if util.safehasattr(src, 'baseui'): # looks like a repository | ||
Matt Mackall
|
r11273 | 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 | ||||
# copy ssh-specific options | ||||
for o in 'ssh', 'remotecmd': | ||||
v = opts.get(o) or src.config('ui', o) | ||||
if v: | ||||
Mads Kiilerich
|
r20790 | dst.setconfig("ui", o, v, 'copied') | ||
Matt Mackall
|
r11273 | |||
# copy bundle-specific options | ||||
r = src.config('bundle', 'mainreporoot') | ||||
if r: | ||||
Mads Kiilerich
|
r20790 | dst.setconfig('bundle', 'mainreporoot', r, 'copied') | ||
Matt Mackall
|
r11273 | |||
Mads Kiilerich
|
r13192 | # copy selected local settings to the remote ui | ||
Gregory Szorc
|
r29616 | for sect in ('auth', 'hostfingerprints', 'hostsecurity', 'http_proxy'): | ||
Matt Mackall
|
r11273 | for key, val in src.configitems(sect): | ||
Mads Kiilerich
|
r20790 | dst.setconfig(sect, key, val, 'copied') | ||
Mads Kiilerich
|
r13192 | v = src.config('web', 'cacerts') | ||
Yuya Nishihara
|
r29594 | if v: | ||
Mads Kiilerich
|
r20790 | dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') | ||
Matt Mackall
|
r11273 | |||
return dst | ||||
Gregory Szorc
|
r26219 | |||
# Files of interest | ||||
# Used to check if the repository has changed looking at mtime and size of | ||||
Mads Kiilerich
|
r26781 | # these files. | ||
Gregory Szorc
|
r26219 | foi = [('spath', '00changelog.i'), | ||
('spath', 'phaseroots'), # ! phase can change content at the same size | ||||
('spath', 'obsstore'), | ||||
('path', 'bookmarks'), # ! bookmark can change content at the same size | ||||
] | ||||
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() | ||||
FUJIWARA Katsunori
|
r28119 | self._filtername = repo.filtername | ||
Gregory Szorc
|
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 | ||||
FUJIWARA Katsunori
|
r28119 | repo = repository(self._repo.baseui, self._repo.url()) | ||
if self._filtername: | ||||
self._repo = repo.filtered(self._filtername) | ||||
else: | ||||
self._repo = repo.unfiltered() | ||||
Gregory Szorc
|
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) | ||||
Augie Fackler
|
r36799 | state.append((st[stat.ST_MTIME], st.st_size)) | ||
maxmtime = max(maxmtime, st[stat.ST_MTIME]) | ||||
Gregory Szorc
|
r26219 | |||
return tuple(state), maxmtime | ||||
def copy(self): | ||||
Gregory Szorc
|
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) | ||||
FUJIWARA Katsunori
|
r28119 | if self._filtername: | ||
repo = repo.filtered(self._filtername) | ||||
else: | ||||
repo = repo.unfiltered() | ||||
Gregory Szorc
|
r26240 | c = cachedlocalrepo(repo) | ||
Gregory Szorc
|
r26219 | c._state = self._state | ||
c.mtime = self.mtime | ||||
return c | ||||