##// END OF EJS Templates
merge with crew
merge with crew

File last commit:

r3791:8643b9f9 default
r3793:f3fbf76d merge default
Show More
hg.py
256 lines | 7.9 KiB | text/x-python | PythonLexer
# hg.py - repository classes for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
from node import *
from repo import *
from demandload import *
from i18n import gettext as _
demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo")
demandload(globals(), "errno lock os shutil util merge@_merge verify@_verify")
def _local(path):
return (os.path.isfile(util.drop_scheme('file', path)) and
bundlerepo or localrepo)
schemes = {
'bundle': bundlerepo,
'file': _local,
'hg': httprepo,
'http': httprepo,
'https': httprepo,
'old-http': statichttprepo,
'ssh': sshrepo,
'static-http': statichttprepo,
}
def _lookup(path):
scheme = 'file'
if path:
c = path.find(':')
if c > 0:
scheme = path[:c]
thing = schemes.get(scheme) or schemes['file']
try:
return thing(path)
except TypeError:
return thing
def islocal(repo):
'''return true if repo or path is local'''
if isinstance(repo, str):
try:
return _lookup(repo).islocal(repo)
except AttributeError:
return False
return repo.local()
repo_setup_hooks = []
def repository(ui, path='', create=False):
"""return a repository object for the specified path"""
repo = _lookup(path).instance(ui, path, create)
for hook in repo_setup_hooks:
hook(ui, repo)
return repo
def defaultdest(source):
'''return default destination of clone if none is given'''
return os.path.basename(os.path.normpath(source))
def clone(ui, source, dest=None, pull=False, rev=None, update=True,
stream=False):
"""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
function. Returns a pair of repository objects, the source and
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.
Arguments:
source: repository object or URL
dest: URL of destination repository to create (defaults to base
name of source repository)
pull: always pull from source repository, even in local case
stream: stream raw data uncompressed from repository (fast over
LAN, slow over WAN)
rev: revision to clone up to (implies pull=True)
update: update working directory after clone completes, if
destination is local repository
"""
if isinstance(source, str):
src_repo = repository(ui, source)
else:
src_repo = source
source = src_repo.url()
if dest is None:
dest = defaultdest(source)
def localpath(path):
if path.startswith('file://'):
return path[7:]
if path.startswith('file:'):
return path[5:]
return path
dest = localpath(dest)
source = localpath(source)
if os.path.exists(dest):
raise util.Abort(_("destination '%s' already exists") % dest)
class DirCleanup(object):
def __init__(self, dir_):
self.rmtree = shutil.rmtree
self.dir_ = dir_
def close(self):
self.dir_ = None
def __del__(self):
if self.dir_:
self.rmtree(self.dir_, True)
dest_repo = repository(ui, dest, create=True)
dir_cleanup = None
if dest_repo.local():
dir_cleanup = DirCleanup(os.path.realpath(dest_repo.root))
abspath = source
copy = False
if src_repo.local() and dest_repo.local():
abspath = os.path.abspath(source)
copy = not pull and not rev
src_lock, dest_lock = None, None
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
src_lock = src_repo.lock()
except lock.LockException:
copy = False
if copy:
# we lock here to avoid premature writing to the target
src_store = os.path.realpath(src_repo.spath)
dest_store = os.path.realpath(dest_repo.spath)
dest_lock = lock.lock(os.path.join(dest_store, "lock"))
files = ("data",
"00manifest.d", "00manifest.i",
"00changelog.d", "00changelog.i")
for f in files:
src = os.path.join(src_store, f)
dst = os.path.join(dest_store, f)
try:
util.copyfiles(src, dst)
except OSError, inst:
if inst.errno != errno.ENOENT:
raise
# we need to re-init the repo after manually copying the data
# into it
dest_repo = repository(ui, dest)
else:
revs = None
if rev:
if 'lookup' not in src_repo.capabilities:
raise util.Abort(_("src repository does not support revision "
"lookup and so doesn't support clone by "
"revision"))
revs = [src_repo.lookup(r) for r in rev]
if dest_repo.local():
dest_repo.clone(src_repo, heads=revs, stream=stream)
elif src_repo.local():
src_repo.push(dest_repo, revs=revs)
else:
raise util.Abort(_("clone from remote to remote not supported"))
if src_lock:
src_lock.release()
if dest_repo.local():
fp = dest_repo.opener("hgrc", "w", text=True)
fp.write("[paths]\n")
fp.write("default = %s\n" % abspath)
fp.close()
if dest_lock:
dest_lock.release()
if update:
_update(dest_repo, dest_repo.changelog.tip())
if dir_cleanup:
dir_cleanup.close()
return src_repo, dest_repo
def _showstats(repo, stats):
stats = ((stats[0], _("updated")),
(stats[1], _("merged")),
(stats[2], _("removed")),
(stats[3], _("unresolved")))
note = ", ".join([_("%d files %s") % s for s in stats])
repo.ui.status("%s\n" % note)
def _update(repo, node): return update(repo, node)
def update(repo, node):
"""update the working directory to node, merging linear changes"""
stats = _merge.update(repo, node, False, False, None, None)
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("There are unresolved merges with"
" locally modified files.\n"))
return stats[3]
def clean(repo, node, wlock=None, show_stats=True):
"""forcibly switch the working directory to node, clobbering changes"""
stats = _merge.update(repo, node, False, True, None, wlock)
if show_stats: _showstats(repo, stats)
return stats[3]
def merge(repo, node, force=None, remind=True, wlock=None):
"""branch merge with node, resolving changes"""
stats = _merge.update(repo, node, True, force, False, wlock)
_showstats(repo, stats)
if stats[3]:
pl = repo.parents()
repo.ui.status(_("There are unresolved merges,"
" you can redo the full merge using:\n"
" hg update -C %s\n"
" hg merge %s\n")
% (pl[0].rev(), pl[1].rev()))
elif remind:
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats[3]
def revert(repo, node, choose, wlock):
"""revert changes to revision in node without updating dirstate"""
return _merge.update(repo, node, False, True, choose, wlock)[3]
def verify(repo):
"""verify the consistency of a repository"""
return _verify.verify(repo)