mercurial-source: mercurial/hg.py annotate

annotate mercurial/hg.py @ 4074:0f9381cf9723

Try to pass repo.ui to reposetup hooks The ui object we received in this function may belong to another repo, which could be confusing from the hook point of view. Trying to use the ui object from the newly created repo should avoid this confusion.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Thu, 08 Feb 2007 16:31:21 -0200
parents	ad6f34c83c3d
children	e6d26e71f049

rev	line source
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1 # hg.py - repository classes for mercurial
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2835 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2835 diff changeset	4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	9 from node import *
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	10 from repo import *
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	11 from demandload import *
2431 d90a9d7c7d4d replace old-http:// syntax by static-http:// and deprecate the redundant hg:// Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1945 diff changeset	12 from i18n import gettext as _
1945 dec6d3c13dbf new type of repo: bundle://path/to/repo+/path/to/bundlename Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1102 diff changeset	13 demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo")
2823 1c6beafbae97 Use demandload @ syntax Matt Mackall <mpm@selenic.com> parents: 2822 diff changeset	14 demandload(globals(), "errno lock os shutil util merge@_merge verify@_verify")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	15
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	16 def _local(path):
3188 705e30c0a230 Make hg.repository work with no path argument Brendan Cully <brendan@kublai.com> parents: 3069 diff changeset	17 return (os.path.isfile(util.drop_scheme('file', path)) and
2768 b1b1aa6f275c allow None for path of hg.repository Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2740 diff changeset	18 bundlerepo or localrepo)
2469 2e91ba371c4c hg.repository: make protocol table driven. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2431 diff changeset	19
2472 e6ec81a8feea make repo scheme table driven. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2431 diff changeset	20 schemes = {
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	21 'bundle': bundlerepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	22 'file': _local,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	23 'hg': httprepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	24 'http': httprepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	25 'https': httprepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	26 'old-http': statichttprepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	27 'ssh': sshrepo,
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	28 'static-http': statichttprepo,
2469 2e91ba371c4c hg.repository: make protocol table driven. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2431 diff changeset	29 }
2e91ba371c4c hg.repository: make protocol table driven. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2431 diff changeset	30
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	31 def _lookup(path):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	32 scheme = 'file'
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	33 if path:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	34 c = path.find(':')
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	35 if c > 0:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	36 scheme = path[:c]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	37 thing = schemes.get(scheme) or schemes['file']
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	38 try:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	39 return thing(path)
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	40 except TypeError:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	41 return thing
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2798 diff changeset	42
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	43 def islocal(repo):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	44 '''return true if repo or path is local'''
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	45 if isinstance(repo, str):
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	46 try:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	47 return _lookup(repo).islocal(repo)
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	48 except AttributeError:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2737 diff changeset	49 return False
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	50 return repo.local()
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	51
2835 2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	52 repo_setup_hooks = []
2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	53
3188 705e30c0a230 Make hg.repository work with no path argument Brendan Cully <brendan@kublai.com> parents: 3069 diff changeset	54 def repository(ui, path='', create=False):
2798 8cd3e19bf4a5 Add a doc string Matt Mackall <mpm@selenic.com> parents: 2768 diff changeset	55 """return a repository object for the specified path"""
2835 2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	56 repo = _lookup(path).instance(ui, path, create)
4074 0f9381cf9723 Try to pass repo.ui to reposetup hooks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3869 diff changeset	57 ui = getattr(repo, "ui", ui)
2835 2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	58 for hook in repo_setup_hooks:
2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	59 hook(ui, repo)
2ff57e3113a4 call reposetup functions of extension modules whenever repo created Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	60 return repo
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	61
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	62 def defaultdest(source):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	63 '''return default destination of clone if none is given'''
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	64 return os.path.basename(os.path.normpath(source))
2798 8cd3e19bf4a5 Add a doc string Matt Mackall <mpm@selenic.com> parents: 2768 diff changeset	65
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	66 def clone(ui, source, dest=None, pull=False, rev=None, update=True,
479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	67 stream=False):
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	68 """Make a copy of an existing repository.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	69
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	70 Create a copy of an existing repository in a new directory. The
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	71 source and destination are URLs, as passed to the repository
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	72 function. Returns a pair of repository objects, the source and
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	73 newly created destination.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	74
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	75 The location of the source is added to the new repository's
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	76 .hg/hgrc file, as the default to be used for future pulls and
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	77 pushes.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	78
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	79 If an exception is raised, the partly cloned/updated destination
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	80 repository will be deleted.
2600 c4325f0a9b91 clean up trailing white space. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2597 diff changeset	81
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	82 Arguments:
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	83
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	84 source: repository object or URL
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	85
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	86 dest: URL of destination repository to create (defaults to base
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	87 name of source repository)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	88
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	89 pull: always pull from source repository, even in local case
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	90
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	91 stream: stream raw data uncompressed from repository (fast over
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	92 LAN, slow over WAN)
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	93
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	94 rev: revision to clone up to (implies pull=True)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	95
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	96 update: update working directory after clone completes, if
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	97 destination is local repository
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	98 """
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	99 if isinstance(source, str):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	100 src_repo = repository(ui, source)
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	101 else:
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	102 src_repo = source
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	103 source = src_repo.url()
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	104
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	105 if dest is None:
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	106 dest = defaultdest(source)
3841 aaeb7f5d1052 Show the destionation for clone if not specified manually. Thomas Arendsen Hein <thomas@intevation.de> parents: 3791 diff changeset	107 ui.status(_("destination directory: %s\n") % dest)
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	108
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	109 def localpath(path):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	110 if path.startswith('file://'):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	111 return path[7:]
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	112 if path.startswith('file:'):
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	113 return path[5:]
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	114 return path
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	115
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	116 dest = localpath(dest)
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	117 source = localpath(source)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	118
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	119 if os.path.exists(dest):
3069 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3034 diff changeset	120 raise util.Abort(_("destination '%s' already exists") % dest)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	121
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	122 class DirCleanup(object):
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	123 def __init__(self, dir_):
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	124 self.rmtree = shutil.rmtree
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	125 self.dir_ = dir_
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	126 def close(self):
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	127 self.dir_ = None
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	128 def __del__(self):
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	129 if self.dir_:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	130 self.rmtree(self.dir_, True)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	131
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	132 dir_cleanup = None
3849 972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	133 if islocal(dest):
972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	134 dir_cleanup = DirCleanup(dest)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	135
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	136 abspath = source
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	137 copy = False
3849 972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	138 if src_repo.local() and islocal(dest):
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	139 abspath = os.path.abspath(source)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	140 copy = not pull and not rev
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	141
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	142 src_lock, dest_lock = None, None
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	143 if copy:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	144 try:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	145 # we use a lock here because if we race with commit, we
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	146 # can end up with extra data in the cloned revlogs that's
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	147 # not pointed to by changesets, thus causing verify to
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	148 # fail
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	149 src_lock = src_repo.lock()
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	150 except lock.LockException:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	151 copy = False
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	152
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	153 if copy:
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	154 def force_copy(src, dst):
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	155 try:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	156 util.copyfiles(src, dst)
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	157 except OSError, inst:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	158 if inst.errno != errno.ENOENT:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	159 raise
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	160
3791 8643b9f90b51 introduce localrepo.spath for the store path, sopener fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3713 diff changeset	161 src_store = os.path.realpath(src_repo.spath)
3849 972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	162 if not os.path.exists(dest):
972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	163 os.mkdir(dest)
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	164 dest_path = os.path.realpath(os.path.join(dest, ".hg"))
3849 972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	165 os.mkdir(dest_path)
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	166 if src_repo.spath != src_repo.path:
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	167 dest_store = os.path.join(dest_path, "store")
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	168 os.mkdir(dest_store)
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	169 else:
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	170 dest_store = dest_path
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	171 # copy the requires file
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	172 force_copy(src_repo.join("requires"),
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	173 os.path.join(dest_path, "requires"))
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	174 # we lock here to avoid premature writing to the target
3791 8643b9f90b51 introduce localrepo.spath for the store path, sopener fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3713 diff changeset	175 dest_lock = lock.lock(os.path.join(dest_store, "lock"))
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	176
3713 8ae88ed2a3b6 don't create the .hg/data at init time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3680 diff changeset	177 files = ("data",
8ae88ed2a3b6 don't create the .hg/data at init time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3680 diff changeset	178 "00manifest.d", "00manifest.i",
8ae88ed2a3b6 don't create the .hg/data at init time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3680 diff changeset	179 "00changelog.d", "00changelog.i")
8ae88ed2a3b6 don't create the .hg/data at init time Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3680 diff changeset	180 for f in files:
3791 8643b9f90b51 introduce localrepo.spath for the store path, sopener fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3713 diff changeset	181 src = os.path.join(src_store, f)
8643b9f90b51 introduce localrepo.spath for the store path, sopener fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3713 diff changeset	182 dst = os.path.join(dest_store, f)
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3849 diff changeset	183 force_copy(src, dst)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	184
2631 8f564a875b50 codingstyle: use spaces instead of tabs Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2621 diff changeset	185 # we need to re-init the repo after manually copying the data
8f564a875b50 codingstyle: use spaces instead of tabs Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2621 diff changeset	186 # into it
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	187 dest_repo = repository(ui, dest)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	188
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	189 else:
3849 972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	190 dest_repo = repository(ui, dest, create=True)
972d14a5a227 don't use localrepo.__init__ to create the dest repo with clone+hardlinks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3791 diff changeset	191
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	192 revs = None
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	193 if rev:
3448 6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3441 diff changeset	194 if 'lookup' not in src_repo.capabilities:
6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3441 diff changeset	195 raise util.Abort(_("src repository does not support revision "
6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3441 diff changeset	196 "lookup and so doesn't support clone by "
6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3441 diff changeset	197 "revision"))
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	198 revs = [src_repo.lookup(r) for r in rev]
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	199
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	200 if dest_repo.local():
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	201 dest_repo.clone(src_repo, heads=revs, stream=stream)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	202 elif src_repo.local():
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	203 src_repo.push(dest_repo, revs=revs)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	204 else:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	205 raise util.Abort(_("clone from remote to remote not supported"))
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	206
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	207 if src_lock:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	208 src_lock.release()
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	209
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	210 if dest_repo.local():
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	211 fp = dest_repo.opener("hgrc", "w", text=True)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	212 fp.write("[paths]\n")
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	213 fp.write("default = %s\n" % abspath)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	214 fp.close()
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	215
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	216 if dest_lock:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	217 dest_lock.release()
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	218
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	219 if update:
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	220 _update(dest_repo, dest_repo.changelog.tip())
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	221 if dir_cleanup:
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	222 dir_cleanup.close()
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	223
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	224 return src_repo, dest_repo
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2798 diff changeset	225
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	226 def _showstats(repo, stats):
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	227 stats = ((stats[0], _("updated")),
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	228 (stats[1], _("merged")),
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	229 (stats[2], _("removed")),
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	230 (stats[3], _("unresolved")))
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	231 note = ", ".join([_("%d files %s") % s for s in stats])
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	232 repo.ui.status("%s\n" % note)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	233
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	234 def _update(repo, node): return update(repo, node)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	235
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	236 def update(repo, node):
30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	237 """update the working directory to node, merging linear changes"""
3869 ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	238 pl = repo.parents()
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	239 stats = _merge.update(repo, node, False, False, None, None)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	240 _showstats(repo, stats)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	241 if stats[3]:
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	242 repo.ui.status(_("There are unresolved merges with"
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	243 " locally modified files.\n"))
3869 ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	244 if stats[1]:
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	245 repo.ui.status(_("You can finish the partial merge using:\n"))
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	246 else:
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	247 repo.ui.status(_("You can redo the full merge using:\n"))
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	248 # len(pl)==1, otherwise _merge.update() would have raised util.Abort:
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	249 repo.ui.status(_(" hg update %s\n hg update %s\n")
ad6f34c83c3d Add instructions how to redo/finish failed merge with local working directory. Thomas Arendsen Hein <thomas@intevation.de> parents: 3854 diff changeset	250 % (pl[0].rev(), repo.changectx(node).rev()))
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	251 return stats[3]
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2798 diff changeset	252
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	253 def clean(repo, node, wlock=None, show_stats=True):
30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	254 """forcibly switch the working directory to node, clobbering changes"""
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	255 stats = _merge.update(repo, node, False, True, None, wlock)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	256 if show_stats: _showstats(repo, stats)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	257 return stats[3]
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2798 diff changeset	258
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	259 def merge(repo, node, force=None, remind=True, wlock=None):
30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	260 """branch merge with node, resolving changes"""
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	261 stats = _merge.update(repo, node, True, force, False, wlock)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	262 _showstats(repo, stats)
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	263 if stats[3]:
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	264 pl = repo.parents()
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	265 repo.ui.status(_("There are unresolved merges,"
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	266 " you can redo the full merge using:\n"
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	267 " hg update -C %s\n"
3679 2956948b81f3 fix warnings generated by pygettext.py. Marcos Chaves <marcos.nospam@gmail.com> parents: 3448 diff changeset	268 " hg merge %s\n")
3680 69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	269 % (pl[0].rev(), pl[1].rev()))
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	270 elif remind:
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	271 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	272 return stats[3]
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	273
2826 3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	274 def revert(repo, node, choose, wlock):
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2802 diff changeset	275 """revert changes to revision in node without updating dirstate"""
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3188 diff changeset	276 return _merge.update(repo, node, False, True, choose, wlock)[3]
2802 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	277
fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	278 def verify(repo):
fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	279 """verify the consistency of a repository"""
fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	280 return _verify.verify(repo)

Mercurial > hg > mercurial-source

annotate mercurial/hg.py @ 4074:0f9381cf9723