mercurial-scm/hg-stable: mercurial/hg.py annotate

annotate mercurial/hg.py @ 39854:d3d4b4b5f725

localrepo: support writing shared file (API) Now that we can create a shared repository via creation options, we can handle other special actions related to share at repo creation time as well. One of the things we do after creating a shared repository is write out a .hg/shared file containing the list of additional things to share. Of which only "bookmarks" is supported. We add a creation option to hold the set of additional items to share. If items are defined, we write out the .hg/shared file at repo creation time. As part of this, we no longer hold the repo lock when writing the file. I'm pretty sure we don't care about the tiny race condition window. I'm also pretty sure the reason we used the lock was because the vfs auditor on the repo instance complained otherwise. Since the repo creation code doesn't have an audited vfs, we don't need to appease it. Because we no longer need to tell the post share hook what items are shared, the "bookmarks" argument to that function has been dropped, incurring an API change. Differential Revision: https://phab.mercurial-scm.org/D4708

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Wed, 19 Sep 2018 17:27:37 -0700
parents	4ece3cdfd907
children	6637b079ae45

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 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4478 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2847 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 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8179 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10099 diff changeset	7 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	9 from __future__ import absolute_import
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	10
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	11 import errno
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29021 diff changeset	12 import hashlib
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	13 import os
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	14 import shutil
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36725 diff changeset	15 import stat
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	16
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	17 from .i18n import _
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	18 from .node import (
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	19 nullid,
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	20 )
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22818 diff changeset	21
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	22 from . import (
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	23 bookmarks,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	24 bundlerepo,
35766 72fdd99eb526 caches: make 'cachetocopy' available in scmutil Boris Feld <boris.feld@octobus.net> parents: 35713 diff changeset	25 cacheutil,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	26 cmdutil,
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	27 destutil,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	28 discovery,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	29 error,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	30 exchange,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	31 extensions,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	32 httppeer,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	33 localrepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	34 lock,
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	35 logcmdutil,
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35340 diff changeset	36 logexchange,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	37 merge as mergemod,
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	38 narrowspec,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	39 node,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	40 phases,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	41 scmutil,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	42 sshpeer,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	43 statichttprepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	44 ui as uimod,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	45 unionrepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	46 url,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	47 util,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	48 verify as verifymod,
31228 4cc3797aa59c vfs: use 'vfs' module directly in 'mercurial.hg' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31178 diff changeset	49 vfs as vfsmod,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	50 )
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	51
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	52 release = lock.release
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	53
29424 f21e0d91d386 share: move magic string to a constant Martijn Pieters <mjpieters@fb.com> parents: 29389 diff changeset	54 # shared features
f21e0d91d386 share: move magic string to a constant Martijn Pieters <mjpieters@fb.com> parents: 29389 diff changeset	55 sharedbookmarks = 'bookmarks'
f21e0d91d386 share: move magic string to a constant Martijn Pieters <mjpieters@fb.com> parents: 29389 diff changeset	56
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2738 diff changeset	57 def _local(path):
14825 de9eb6b1da4f util: rename the util.localpath that uses url to urllocalpath (issue2875) Mads Kiilerich <mads@kiilerich.com> parents: 14737 diff changeset	58 path = util.expandpath(util.urllocalpath(path))
11154 17031fea4e95 expand paths to local repository or bundle in appropriate classes Alexander Solovyov <piranha@piranha.org.ua> parents: 10728 diff changeset	59 return (os.path.isfile(path) and bundlerepo or localrepo)
2469 2e91ba371c4c hg.repository: make protocol table driven. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2431 diff changeset	60
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	61 def addbranchrevs(lrepo, other, branches, revs):
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	62 peer = other.peer() # a courtesy to callers using a localrepo for other
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	63 hashbranch, branches = branches
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	64 if not hashbranch and not branches:
22818 d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	65 x = revs or None
37481 7c848ab13eff addbranchrevs: no longer accept revset as "revs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37480 diff changeset	66 if revs:
22818 d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	67 y = revs[0]
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	68 else:
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	69 y = None
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	70 return x, y
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	71 if revs:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	72 revs = list(revs)
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	73 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	74 revs = []
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	75
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	76 if not peer.capable('branchmap'):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	77 if branches:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	78 raise error.Abort(_("remote branch lookup not supported"))
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	79 revs.append(hashbranch)
10380 ee72d89c0d9f addbranchrevs: fallback for older servers Sune Foldager <cryo@cyanite.org> parents: 10379 diff changeset	80 return revs, revs[0]
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	81
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	82 with peer.commandexecutor() as e:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	83 branchmap = e.callcommand('branchmap', {}).result()
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	84
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	85 def primary(branch):
6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	86 if branch == '.':
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	87 if not lrepo:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	88 raise error.Abort(_("dirstate branch not accessible"))
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	89 branch = lrepo.dirstate.branch()
6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	90 if branch in branchmap:
6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	91 revs.extend(node.hex(r) for r in reversed(branchmap[branch]))
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	92 return True
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	93 else:
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	94 return False
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	95
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	96 for branch in branches:
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	97 if not primary(branch):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	98 raise error.RepoLookupError(_("unknown branch '%s'") % branch)
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	99 if hashbranch:
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	100 if not primary(hashbranch):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	101 revs.append(hashbranch)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	102 return revs, revs[0]
d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	103
13824 ec1695350361 hg: use url.url to parse branch names in parseurl() Brodie Rao <brodie@bitheap.org> parents: 13823 diff changeset	104 def parseurl(path, branches=None):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	105 '''parse url#branch, returning (url, (branch, branches))'''
5177 92236732d5a1 move parseurl from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	106
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	107 u = util.url(path)
13897 375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 13826 diff changeset	108 branch = None
375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 13826 diff changeset	109 if u.fragment:
375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 13826 diff changeset	110 branch = u.fragment
375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 13826 diff changeset	111 u.fragment = None
31841 9ff5a124d111 py3: replace str() with bytes() Pulkit Goyal <7895pulkit@gmail.com> parents: 31465 diff changeset	112 return bytes(u), (branch, branches or [])
5177 92236732d5a1 move parseurl from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	113
14606 6e631c24c6d9 hg: move peerschemes back to schemes Matt Mackall <mpm@selenic.com> parents: 14605 diff changeset	114 schemes = {
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	115 'bundle': bundlerepo,
18944 a9c443b3b240 unionrepo: read-only operations on a union of two localrepos Mads Kiilerich <madski@unity3d.com> parents: 18553 diff changeset	116 'union': unionrepo,
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	117 'file': _local,
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 17191 diff changeset	118 'http': httppeer,
1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 17191 diff changeset	119 'https': httppeer,
1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 17191 diff changeset	120 'ssh': sshpeer,
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	121 'static-http': statichttprepo,
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	122 }
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	123
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	124 def _peerlookup(path):
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	125 u = util.url(path)
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	126 scheme = u.scheme or 'file'
14606 6e631c24c6d9 hg: move peerschemes back to schemes Matt Mackall <mpm@selenic.com> parents: 14605 diff changeset	127 thing = schemes.get(scheme) or schemes['file']
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	128 try:
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	129 return thing(path)
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	130 except TypeError:
25365 4cc3fb23881d hg: explicitly check that peer lookup object has instance() if call failed Yuya Nishihara <yuya@tcha.org> parents: 24945 diff changeset	131 # we can't test callable(thing) because 'thing' can be an unloaded
4cc3fb23881d hg: explicitly check that peer lookup object has instance() if call failed Yuya Nishihara <yuya@tcha.org> parents: 24945 diff changeset	132 # module that implements __call__
4cc3fb23881d hg: explicitly check that peer lookup object has instance() if call failed Yuya Nishihara <yuya@tcha.org> parents: 24945 diff changeset	133 if not util.safehasattr(thing, 'instance'):
4cc3fb23881d hg: explicitly check that peer lookup object has instance() if call failed Yuya Nishihara <yuya@tcha.org> parents: 24945 diff changeset	134 raise
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	135 return thing
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	136
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	137 def islocal(repo):
20355 7d269e7620c4 hg: note that islocal only accepts paths pointing to repos Siddharth Agarwal <sid0@fb.com> parents: 20354 diff changeset	138 '''return true if repo (or path pointing to repo) is local'''
33034 071732d9c210 py3: check for bytes instead of str in isinstance Pulkit Goyal <7895pulkit@gmail.com> parents: 32988 diff changeset	139 if isinstance(repo, bytes):
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	140 try:
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	141 return _peerlookup(repo).islocal(repo)
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	142 except AttributeError:
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	143 return False
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	144 return repo.local()
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	145
17887 0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	146 def openpath(ui, path):
0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	147 '''open path with open if local, url.open if remote'''
20354 b433b43364e4 hg.openpath: use url.islocal to tell if the path is local (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 20185 diff changeset	148 pathurl = util.url(path, parsequery=False, parsefragment=False)
b433b43364e4 hg.openpath: use url.islocal to tell if the path is local (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 20185 diff changeset	149 if pathurl.islocal():
b433b43364e4 hg.openpath: use url.islocal to tell if the path is local (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 20185 diff changeset	150 return util.posixfile(pathurl.localpath(), 'rb')
17887 0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	151 else:
0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	152 return url.open(ui, path)
0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	153
20858 bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	154 # a list of (ui, repo) functions called for wire peer initialization
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	155 wirepeersetupfuncs = []
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	156
37717 0664be4f0c1f hg: pass command intents to repo/peer creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37640 diff changeset	157 def _peerorrepo(ui, path, create=False, presetupfuncs=None,
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	158 intents=None, createopts=None):
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	159 """return a repository object for the specified path"""
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	160 obj = _peerlookup(path).instance(ui, path, create, intents=intents,
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	161 createopts=createopts)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	162 ui = getattr(obj, "ui", ui)
38838 d58958676b3c extensions: add detailed loading information Martijn Pieters <mj@zopatista.com> parents: 38753 diff changeset	163 if ui.configbool('devel', 'debug.extensions'):
39524 a5d6bf6032fb extensions: add timing for extensions reposetup Boris Feld <boris.feld@octobus.net> parents: 39415 diff changeset	164 log = lambda msg, *values: ui.debug('debug.extensions: ',
a5d6bf6032fb extensions: add timing for extensions reposetup Boris Feld <boris.feld@octobus.net> parents: 39415 diff changeset	165 msg % values, label='debug.extensions')
38838 d58958676b3c extensions: add detailed loading information Martijn Pieters <mj@zopatista.com> parents: 38753 diff changeset	166 else:
d58958676b3c extensions: add detailed loading information Martijn Pieters <mj@zopatista.com> parents: 38753 diff changeset	167 log = lambda a, *kw: None
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32221 diff changeset	168 for f in presetupfuncs or []:
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32221 diff changeset	169 f(ui, obj)
38838 d58958676b3c extensions: add detailed loading information Martijn Pieters <mj@zopatista.com> parents: 38753 diff changeset	170 log('- executing reposetup hooks\n')
39527 340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	171 with util.timedcm('all reposetup') as allreposetupstats:
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	172 for name, module in extensions.extensions(ui):
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	173 log(' - running reposetup for %s\n' % (name,))
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	174 hook = getattr(module, 'reposetup', None)
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	175 if hook:
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	176 with util.timedcm('reposetup %r', name) as stats:
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	177 hook(ui, obj)
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	178 log(' > reposetup for %r took %s\n', name, stats)
340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	179 log('> all reposetup took %s\n', allreposetupstats)
20858 bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	180 if not obj.local():
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	181 for f in wirepeersetupfuncs:
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	182 f(ui, obj)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	183 return obj
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	184
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	185 def repository(ui, path='', create=False, presetupfuncs=None, intents=None,
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	186 createopts=None):
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	187 """return a repository object for the specified path"""
37717 0664be4f0c1f hg: pass command intents to repo/peer creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37640 diff changeset	188 peer = _peerorrepo(ui, path, create, presetupfuncs=presetupfuncs,
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	189 intents=intents, createopts=createopts)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	190 repo = peer.local()
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	191 if not repo:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	192 raise error.Abort(_("repository '%s' is not local") %
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	193 (path or peer.url()))
18382 f3b21beb9802 filtering: rename filters to their antonyms Kevin Bullock <kbullock@ringworld.org> parents: 18303 diff changeset	194 return repo.filtered('visible')
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	195
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	196 def peer(uiorrepo, opts, path, create=False, intents=None, createopts=None):
14554 68db17047637 hg: add peer method Matt Mackall <mpm@selenic.com> parents: 14553 diff changeset	197 '''return a repository peer for the specified path'''
14839 510c893a726f peer: change arg name to convey it can be a repo as well Idan Kamara <idankk86@gmail.com> parents: 14825 diff changeset	198 rui = remoteui(uiorrepo, opts)
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	199 return _peerorrepo(rui, path, create, intents=intents,
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39527 diff changeset	200 createopts=createopts).peer()
14554 68db17047637 hg: add peer method Matt Mackall <mpm@selenic.com> parents: 14553 diff changeset	201
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	202 def defaultdest(source):
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	203 '''return default destination of clone if none is given
069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	204
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	205 >>> defaultdest(b'foo')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	206 'foo'
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	207 >>> defaultdest(b'/foo/bar')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	208 'bar'
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	209 >>> defaultdest(b'/')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	210 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	211 >>> defaultdest(b'')
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	212 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	213 >>> defaultdest(b'http://example.org/')
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	214 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	215 >>> defaultdest(b'http://example.org/foo/')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	216 'foo'
069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	217 '''
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	218 path = util.url(source).path
8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	219 if not path:
8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	220 return ''
8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	221 return os.path.basename(os.path.normpath(path))
2774 8cd3e19bf4a5 Add a doc string Matt Mackall <mpm@selenic.com> parents: 2768 diff changeset	222
36197 0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	223 def sharedreposource(repo):
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	224 """Returns repository object for source repository of a shared repo.
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	225
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	226 If repo is not a shared repository, returns None.
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	227 """
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	228 if repo.sharedpath == repo.path:
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	229 return None
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	230
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	231 if util.safehasattr(repo, 'srcrepo') and repo.srcrepo:
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	232 return repo.srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	233
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	234 # the sharedpath always ends in the .hg; we want the path to the repo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	235 source = repo.vfs.split(repo.sharedpath)[0]
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	236 srcurl, branches = parseurl(source)
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	237 srcrepo = repository(repo.ui, srcurl)
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	238 repo.srcrepo = srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	239 return srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	240
31148 23080c03a604 share: add --relative flag to store a relative path to the source Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 31078 diff changeset	241 def share(ui, source, dest=None, update=True, bookmarks=True, defaultpath=None,
23080c03a604 share: add --relative flag to store a relative path to the source Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 31078 diff changeset	242 relative=False):
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	243 '''create a shared repository'''
971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	244
971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	245 if not islocal(source):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	246 raise error.Abort(_('can only share local repositories'))
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	247
8807 8bf6eb68ddaf share: allow dest to default to the basename of source Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	248 if not dest:
10099 f5e46dfb38c7 share: use defaultdest to compute unspecified destination Brendan Cully <brendan@kublai.com> parents: 9984 diff changeset	249 dest = defaultdest(source)
9344 eb6af02307ec Merge with i18n-stable Matt Mackall <mpm@selenic.com> parents: 9245 diff changeset	250 else:
eb6af02307ec Merge with i18n-stable Matt Mackall <mpm@selenic.com> parents: 9245 diff changeset	251 dest = ui.expandpath(dest)
8807 8bf6eb68ddaf share: allow dest to default to the basename of source Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	252
36087 488e313954ea py3: check for bytes instead of str in hg.share() Gregory Szorc <gregory.szorc@gmail.com> parents: 36041 diff changeset	253 if isinstance(source, bytes):
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	254 origsource = ui.expandpath(source)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	255 source, branches = parseurl(origsource)
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	256 srcrepo = repository(ui, source)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	257 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	258 else:
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	259 srcrepo = source.local()
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	260 checkout = None
971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	261
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	262 shareditems = set()
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	263 if bookmarks:
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	264 shareditems.add(sharedbookmarks)
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	265
39853 4ece3cdfd907 localrepo: support shared repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39622 diff changeset	266 r = repository(ui, dest, create=True, createopts={
4ece3cdfd907 localrepo: support shared repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39622 diff changeset	267 'sharedrepo': srcrepo,
4ece3cdfd907 localrepo: support shared repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39622 diff changeset	268 'sharedrelative': relative,
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	269 'shareditems': shareditems,
39853 4ece3cdfd907 localrepo: support shared repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39622 diff changeset	270 })
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	271
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	272 postshare(srcrepo, r, defaultpath=defaultpath)
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	273 _postshareupdate(r, update, checkout=checkout)
34815 68e0bcb90357 subrepo: share instead of clone if the parent repo is shared (issue5675) (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 34805 diff changeset	274 return r
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	275
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	276 def unshare(ui, repo):
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	277 """convert a shared repository to a normal one
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	278
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	279 Copy the store data to the repo and remove the sharedpath data.
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	280
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	281 Returns a new repository object representing the unshared repository.
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	282
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	283 The passed repository object is not usable after this function is
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	284 called.
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	285 """
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	286
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	287 destlock = lock = None
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	288 lock = repo.lock()
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	289 try:
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	290 # we use locks here because if we race with commit, we
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	291 # can end up with extra data in the cloned revlogs that's
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	292 # not pointed to by changesets, thus causing verify to
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	293 # fail
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	294
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	295 destlock = copystore(ui, repo, repo.path)
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	296
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	297 sharefile = repo.vfs.join('sharedpath')
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	298 util.rename(sharefile, sharefile + '.old')
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	299
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	300 repo.requirements.discard('shared')
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	301 repo.requirements.discard('relshared')
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	302 repo._writerequirements()
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	303 finally:
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	304 destlock and destlock.release()
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	305 lock and lock.release()
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	306
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	307 # Removing share changes some fundamental properties of the repo instance.
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	308 # So we instantiate a new repo object and operate on it rather than
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	309 # try to keep the existing repo usable.
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	310 newrepo = repository(repo.baseui, repo.root, create=False)
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	311
34879 7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	312 # TODO: figure out how to access subrepos that exist, but were previously
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	313 # removed from .hgsub
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	314 c = newrepo['.']
34879 7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	315 subs = c.substate
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	316 for s in sorted(subs):
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	317 c.sub(s).unshare()
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	318
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	319 localrepo.poisonrepository(repo)
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	320
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	321 return newrepo
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	322
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	323 def postshare(sourcerepo, destrepo, defaultpath=None):
27354 bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	324 """Called after a new shared repo is created.
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	325
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	326 The new repo only has a requirements file and pointer to the source.
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	327 This function configures additional shared data.
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	328
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	329 Extensions can wrap this function and write additional entries to
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	330 destrepo/.hg/shared to indicate additional pieces of data to be shared.
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	331 """
30041 1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	332 default = defaultpath or sourcerepo.ui.config('paths', 'default')
27354 bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	333 if default:
35622 e925f33ac088 share: convert EOL of hgrc before writing to bytes IO Yuya Nishihara <yuya@tcha.org> parents: 35620 diff changeset	334 template = ('[paths]\n'
e925f33ac088 share: convert EOL of hgrc before writing to bytes IO Yuya Nishihara <yuya@tcha.org> parents: 35620 diff changeset	335 'default = %s\n')
e925f33ac088 share: convert EOL of hgrc before writing to bytes IO Yuya Nishihara <yuya@tcha.org> parents: 35620 diff changeset	336 destrepo.vfs.write('hgrc', util.tonativeeol(template % default))
27354 bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	337
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	338 def _postshareupdate(repo, update, checkout=None):
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	339 """Maybe perform a working directory update after a shared repo is created.
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	340
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	341 ``update`` can be a boolean or a revision to update to.
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	342 """
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	343 if not update:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	344 return
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	345
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	346 repo.ui.status(_("updating working directory\n"))
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	347 if update is not True:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	348 checkout = update
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	349 for test in (checkout, 'default', 'tip'):
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	350 if test is None:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	351 continue
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	352 try:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	353 uprev = repo.lookup(test)
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	354 break
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	355 except error.RepoLookupError:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	356 continue
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	357 _update(repo, uprev)
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	358
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	359 def copystore(ui, srcrepo, destpath):
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	360 '''copy files from store of srcrepo in destpath
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	361
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	362 returns destlock
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	363 '''
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	364 destlock = None
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	365 try:
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	366 hardlink = None
38386 63e6f5ae84bc copystore: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 37717 diff changeset	367 topic = _('linking') if hardlink else _('copying')
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	368 with ui.makeprogress(topic) as progress:
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	369 num = 0
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	370 srcpublishing = srcrepo.publishing()
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	371 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	372 dstvfs = vfsmod.vfs(destpath)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	373 for f in srcrepo.store.copylist():
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	374 if srcpublishing and f.endswith('phaseroots'):
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	375 continue
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	376 dstbase = os.path.dirname(f)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	377 if dstbase and not dstvfs.exists(dstbase):
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	378 dstvfs.mkdir(dstbase)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	379 if srcvfs.exists(f):
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	380 if f.endswith('data'):
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	381 # 'dstbase' may be empty (e.g. revlog format 0)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	382 lockfile = os.path.join(dstbase, "lock")
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	383 # lock to avoid premature writing to the target
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	384 destlock = lock.lock(dstvfs, lockfile)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	385 hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f),
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	386 hardlink, progress)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	387 num += n
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	388 if hardlink:
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	389 ui.debug("linked %d files\n" % num)
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	390 else:
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	391 ui.debug("copied %d files\n" % num)
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	392 return destlock
16705 c2d9ef43ff6c check-code: ignore naked excepts with a "re-raise" comment Brodie Rao <brodie@sf.io> parents: 16352 diff changeset	393 except: # re-raises
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	394 release(destlock)
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	395 raise
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	396
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	397 def clonewithshare(ui, peeropts, sharepath, source, srcpeer, dest, pull=False,
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	398 rev=None, update=True, stream=False):
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	399 """Perform a clone using a shared repo.
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	400
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	401 The store for the repository will be located at <sharepath>/.hg. The
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	402 specified revisions will be cloned or pulled from "source". A shared repo
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	403 will be created at "dest" and a working copy will be created if "update" is
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	404 True.
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	405 """
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	406 revs = None
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	407 if rev:
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	408 if not srcpeer.capable('lookup'):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	409 raise error.Abort(_("src repository does not support "
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	410 "revision lookup and so doesn't "
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	411 "support clone by revision"))
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	412
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	413 # TODO this is batchable.
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	414 remoterevs = []
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	415 for r in rev:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	416 with srcpeer.commandexecutor() as e:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	417 remoterevs.append(e.callcommand('lookup', {
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	418 'key': r,
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	419 }).result())
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	420 revs = remoterevs
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	421
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	422 # Obtain a lock before checking for or cloning the pooled repo otherwise
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	423 # 2 clients may race creating or populating it.
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	424 pooldir = os.path.dirname(sharepath)
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	425 # lock class requires the directory to exist.
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	426 try:
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	427 util.makedir(pooldir, False)
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	428 except OSError as e:
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	429 if e.errno != errno.EEXIST:
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	430 raise
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	431
31228 4cc3797aa59c vfs: use 'vfs' module directly in 'mercurial.hg' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31178 diff changeset	432 poolvfs = vfsmod.vfs(pooldir)
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	433 basename = os.path.basename(sharepath)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	434
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	435 with lock.lock(poolvfs, '%s.lock' % basename):
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	436 if os.path.exists(sharepath):
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	437 ui.status(_('(sharing from existing pooled repository %s)\n') %
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	438 basename)
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	439 else:
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	440 ui.status(_('(sharing from new pooled repository %s)\n') % basename)
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	441 # Always use pull mode because hardlinks in share mode don't work
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	442 # well. Never update because working copies aren't necessary in
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	443 # share mode.
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	444 clone(ui, peeropts, source, dest=sharepath, pull=True,
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	445 revs=rev, update=False, stream=stream)
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	446
30041 1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	447 # Resolve the value to put in [paths] section for the source.
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	448 if islocal(source):
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	449 defaultpath = os.path.abspath(util.urllocalpath(source))
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	450 else:
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	451 defaultpath = source
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	452
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	453 sharerepo = repository(ui, path=sharepath)
30041 1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	454 share(ui, sharerepo, dest=dest, update=False, bookmarks=False,
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	455 defaultpath=defaultpath)
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	456
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	457 # We need to perform a pull against the dest repo to fetch bookmarks
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	458 # and other non-store data that isn't shared by default. In the case of
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	459 # non-existing shared repo, this means we pull from the remote twice. This
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	460 # is a bit weird. But at the time it was implemented, there wasn't an easy
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	461 # way to pull just non-changegroup data.
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	462 destrepo = repository(ui, path=dest)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	463 exchange.pull(destrepo, srcpeer, heads=revs)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	464
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	465 _postshareupdate(destrepo, update)
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	466
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	467 return srcpeer, peer(ui, peeropts, dest)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	468
32525 963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	469 # Recomputing branch cache might be slow on big repos,
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	470 # so just copy it
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	471 def _copycache(srcrepo, dstcachedir, fname):
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	472 """copy a cache from srcrepo to destcachedir (if it exists)"""
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	473 srcbranchcache = srcrepo.vfs.join('cache/%s' % fname)
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	474 dstbranchcache = os.path.join(dstcachedir, fname)
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	475 if os.path.exists(srcbranchcache):
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	476 if not os.path.exists(dstcachedir):
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	477 os.mkdir(dstcachedir)
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	478 util.copyfile(srcbranchcache, dstbranchcache)
963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	479
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	480 def clone(ui, peeropts, source, dest=None, pull=False, revs=None,
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	481 update=True, stream=False, branch=None, shareopts=None,
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	482 storeincludepats=None, storeexcludepats=None):
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	483 """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	484
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	485 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	486 source and destination are URLs, as passed to the repository
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	487 function. Returns a pair of repository peers, the source and
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	488 newly created destination.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	489
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	490 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	491 .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	492 pushes.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	493
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	494 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	495 repository will be deleted.
2600 c4325f0a9b91 clean up trailing white space. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2597 diff changeset	496
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	497 Arguments:
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	498
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	499 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	500
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	501 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	502 name of source repository)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	503
23545 68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	504 pull: always pull from source repository, even in local case or if the
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	505 server prefers streaming
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	506
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	507 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	508 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	509
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	510 revs: revision to clone up to (implies pull=True)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	511
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	512 update: update working directory after clone completes, if
6526 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6525 diff changeset	513 destination is local repository (True means update to default rev,
cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6525 diff changeset	514 anything else is treated as a revision)
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	515
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	516 branch: branches to clone
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	517
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	518 shareopts: dict of options to control auto sharing behavior. The "pool" key
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	519 activates auto sharing mode and defines the directory for stores. The
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	520 "mode" key determines how to construct the directory name of the shared
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	521 repository. "identity" means the name is derived from the node of the first
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	522 changeset in the repository. "remote" means the name is derived from the
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	523 remote's path/URL. Defaults to "identity."
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	524
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	525 storeincludepats and storeexcludepats: sets of file patterns to include and
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	526 exclude in the repository copy, respectively. If not defined, all files
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	527 will be included (a "full" clone). Otherwise a "narrow" clone containing
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	528 only the requested files will be performed. If ``storeincludepats`` is not
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	529 defined but ``storeexcludepats`` is, ``storeincludepats`` is assumed to be
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	530 ``path:.``. If both are empty sets, no files will be cloned.
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	531 """
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4477 diff changeset	532
32988 11c0bb4ccc76 py3: replace str with bytes in isinstance() Pulkit Goyal <7895pulkit@gmail.com> parents: 32528 diff changeset	533 if isinstance(source, bytes):
6089 28054773438c clone: make things work when source is a repo object Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6088 diff changeset	534 origsource = ui.expandpath(source)
37263 3809eafedf2c parseurl: consistently call second output "branches" Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	535 source, branches = parseurl(origsource, branch)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	536 srcpeer = peer(ui, peeropts, source)
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	537 else:
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	538 srcpeer = source.peer() # in case we were called with a localrepo
37263 3809eafedf2c parseurl: consistently call second output "branches" Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	539 branches = (None, branch or [])
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	540 origsource = source = srcpeer.url()
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	541 revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	542
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	543 if dest is None:
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	544 dest = defaultdest(source)
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	545 if dest:
8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	546 ui.status(_("destination directory: %s\n") % dest)
9344 eb6af02307ec Merge with i18n-stable Matt Mackall <mpm@selenic.com> parents: 9245 diff changeset	547 else:
eb6af02307ec Merge with i18n-stable Matt Mackall <mpm@selenic.com> parents: 9245 diff changeset	548 dest = ui.expandpath(dest)
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	549
14825 de9eb6b1da4f util: rename the util.localpath that uses url to urllocalpath (issue2875) Mads Kiilerich <mads@kiilerich.com> parents: 14737 diff changeset	550 dest = util.urllocalpath(dest)
de9eb6b1da4f util: rename the util.localpath that uses url to urllocalpath (issue2875) Mads Kiilerich <mads@kiilerich.com> parents: 14737 diff changeset	551 source = util.urllocalpath(source)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	552
17159 36a3016811d1 localrepo: use the path relative to "self.vfs" instead of "path" argument FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16705 diff changeset	553 if not dest:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	554 raise error.Abort(_("empty destination path is not valid"))
21803 62cc4055c6c8 hg: use vfs functions in clone Chinmay Joshi <c@chinmayjoshi.com> parents: 21802 diff changeset	555
31228 4cc3797aa59c vfs: use 'vfs' module directly in 'mercurial.hg' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31178 diff changeset	556 destvfs = vfsmod.vfs(dest, expandpath=True)
21803 62cc4055c6c8 hg: use vfs functions in clone Chinmay Joshi <c@chinmayjoshi.com> parents: 21802 diff changeset	557 if destvfs.lexists():
62cc4055c6c8 hg: use vfs functions in clone Chinmay Joshi <c@chinmayjoshi.com> parents: 21802 diff changeset	558 if not destvfs.isdir():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	559 raise error.Abort(_("destination '%s' already exists") % dest)
21804 becb61de90a1 hg: update newly added listdir function of vfs in clone Chinmay Joshi <c@chinmayjoshi.com> parents: 21803 diff changeset	560 elif destvfs.listdir():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	561 raise error.Abort(_("destination '%s' is not empty") % dest)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	562
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	563 createopts = {}
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	564 narrow = False
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	565
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	566 if storeincludepats is not None:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	567 narrowspec.validatepatterns(storeincludepats)
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	568 narrow = True
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	569
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	570 if storeexcludepats is not None:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	571 narrowspec.validatepatterns(storeexcludepats)
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	572 narrow = True
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	573
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	574 if narrow:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	575 # Include everything by default if only exclusion patterns defined.
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	576 if storeexcludepats and not storeincludepats:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	577 storeincludepats = {'path:.'}
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	578
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	579 createopts['narrowfiles'] = True
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	580
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	581 shareopts = shareopts or {}
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	582 sharepool = shareopts.get('pool')
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	583 sharenamemode = shareopts.get('mode')
26026 d08e7449ff27 hg: avoid auto sharing when the clone destination is remote FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25761 diff changeset	584 if sharepool and islocal(dest):
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	585 sharepath = None
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	586 if sharenamemode == 'identity':
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	587 # Resolve the name from the initial changeset in the remote
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	588 # repository. This returns nullid when the remote is empty. It
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	589 # raises RepoLookupError if revision 0 is filtered or otherwise
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	590 # not available. If we fail to resolve, sharing is not enabled.
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	591 try:
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	592 with srcpeer.commandexecutor() as e:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	593 rootnode = e.callcommand('lookup', {
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	594 'key': '0',
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	595 }).result()
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	596
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	597 if rootnode != node.nullid:
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	598 sharepath = os.path.join(sharepool, node.hex(rootnode))
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	599 else:
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	600 ui.status(_('(not using pooled storage: '
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	601 'remote appears to be empty)\n'))
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	602 except error.RepoLookupError:
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	603 ui.status(_('(not using pooled storage: '
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	604 'unable to resolve identity of remote)\n'))
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	605 elif sharenamemode == 'remote':
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29021 diff changeset	606 sharepath = os.path.join(
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 35565 diff changeset	607 sharepool, node.hex(hashlib.sha1(source).digest()))
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	608 else:
29389 98e8313dcd9e i18n: translate abort messages liscju <piotr.listkiewicz@gmail.com> parents: 29341 diff changeset	609 raise error.Abort(_('unknown share naming mode: %s') %
98e8313dcd9e i18n: translate abort messages liscju <piotr.listkiewicz@gmail.com> parents: 29341 diff changeset	610 sharenamemode)
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	611
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	612 # TODO this is a somewhat arbitrary restriction.
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	613 if narrow:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	614 ui.status(_('(pooled storage not supported for narrow clones)\n'))
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	615 sharepath = None
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	616
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	617 if sharepath:
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	618 return clonewithshare(ui, peeropts, sharepath, source, srcpeer,
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	619 dest, pull=pull, rev=revs, update=update,
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	620 stream=stream)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	621
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	622 srclock = destlock = cleandir = None
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	623 srcrepo = srcpeer.local()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	624 try:
14377 f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	625 abspath = origsource
f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	626 if islocal(origsource):
14825 de9eb6b1da4f util: rename the util.localpath that uses url to urllocalpath (issue2875) Mads Kiilerich <mads@kiilerich.com> parents: 14737 diff changeset	627 abspath = os.path.abspath(util.urllocalpath(origsource))
14377 f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	628
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	629 if islocal(dest):
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	630 cleandir = dest
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	631
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	632 copy = False
17194 32a6a33b9a35 peer: remove cancopy from peer api; use directly on repo instead Sune Foldager <cryo@cyanite.org> parents: 17192 diff changeset	633 if (srcrepo and srcrepo.cancopy() and islocal(dest)
17671 fdd0fc046cf1 clfilter: introduce a `hassecret` function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17342 diff changeset	634 and not phases.hassecret(srcrepo)):
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	635 copy = not pull and not revs
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	636
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	637 # TODO this is a somewhat arbitrary restriction.
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	638 if narrow:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	639 copy = False
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	640
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	641 if copy:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	642 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	643 # we use a lock here because if we race with commit, we
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	644 # can end up with extra data in the cloned revlogs that's
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	645 # not pointed to by changesets, thus causing verify to
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	646 # fail
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	647 srclock = srcrepo.lock(wait=False)
7640 7197812e8d44 error: move lock errors Matt Mackall <mpm@selenic.com> parents: 7546 diff changeset	648 except error.LockError:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	649 copy = False
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	650
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	651 if copy:
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	652 srcrepo.hook('preoutgoing', throw=True, source='clone')
15381 c519cd8f0169 backout dbdb777502dc (issue3077) (issue3071) Matt Mackall <mpm@selenic.com> parents: 15355 diff changeset	653 hgdir = os.path.realpath(os.path.join(dest, ".hg"))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	654 if not os.path.exists(dest):
39218 143efea71c2a clone: allow local cloning to create more than one level of directories Matt Harbison <matt_harbison@yahoo.com> parents: 38838 diff changeset	655 util.makedirs(dest)
7935 39566bb99a9c on clone failure, only remove directories we created Steve Borho <steve@borho.org> parents: 7927 diff changeset	656 else:
39566bb99a9c on clone failure, only remove directories we created Steve Borho <steve@borho.org> parents: 7927 diff changeset	657 # only clean up directories we create ourselves
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	658 cleandir = hgdir
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	659 try:
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	660 destpath = hgdir
81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	661 util.makedir(destpath, notindexed=True)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25624 diff changeset	662 except OSError as inst:
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	663 if inst.errno == errno.EEXIST:
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	664 cleandir = None
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	665 raise error.Abort(_("destination '%s' already exists")
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	666 % dest)
9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	667 raise
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	668
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	669 destlock = copystore(ui, srcrepo, destpath)
22646 d6ecdb8bfa16 clone: copy `.hg/bookmarks` during copy clone Pierre-Yves David <pierre-yves.david@fb.com> parents: 22618 diff changeset	670 # copy bookmarks over
31331 4282feb79432 hg-mod: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31320 diff changeset	671 srcbookmarks = srcrepo.vfs.join('bookmarks')
22646 d6ecdb8bfa16 clone: copy `.hg/bookmarks` during copy clone Pierre-Yves David <pierre-yves.david@fb.com> parents: 22618 diff changeset	672 dstbookmarks = os.path.join(destpath, 'bookmarks')
d6ecdb8bfa16 clone: copy `.hg/bookmarks` during copy clone Pierre-Yves David <pierre-yves.david@fb.com> parents: 22618 diff changeset	673 if os.path.exists(srcbookmarks):
d6ecdb8bfa16 clone: copy `.hg/bookmarks` during copy clone Pierre-Yves David <pierre-yves.david@fb.com> parents: 22618 diff changeset	674 util.copyfile(srcbookmarks, dstbookmarks)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	675
17740 e6067bec18da branchcache: fetch source branchcache during clone (issue3378) Tomasz Kleczek <tomasz.kleczek@fb.com> parents: 17704 diff changeset	676 dstcachedir = os.path.join(destpath, 'cache')
35766 72fdd99eb526 caches: make 'cachetocopy' available in scmutil Boris Feld <boris.feld@octobus.net> parents: 35713 diff changeset	677 for cache in cacheutil.cachetocopy(srcrepo):
32526 3c8a71a8df11 local-clone: extract the listing of caches to copy Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32525 diff changeset	678 _copycache(srcrepo, dstcachedir, cache)
17740 e6067bec18da branchcache: fetch source branchcache during clone (issue3378) Tomasz Kleczek <tomasz.kleczek@fb.com> parents: 17704 diff changeset	679
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	680 # we need to re-init the repo after manually copying the data
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	681 # into it
17874 2ba70eec1cf0 peer: subrepo isolation, pass repo instead of repo.ui to hg.peer Simon Heimberg <simohe@besonet.ch> parents: 17872 diff changeset	682 destpeer = peer(srcrepo, peeropts, dest)
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	683 srcrepo.hook('outgoing', source='clone',
12144 be9c4131a8f4 clone, patch, convert: use hex(nullid) instead of '0'40 Martin Geisler <mg@lazybytes.net>* parents: 11818 diff changeset	684 node=node.hex(node.nullid))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	685 else:
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	686 try:
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	687 # only pass ui when no srcrepo
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	688 destpeer = peer(srcrepo or ui, peeropts, dest, create=True,
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	689 createopts=createopts)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25624 diff changeset	690 except OSError as inst:
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	691 if inst.errno == errno.EEXIST:
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	692 cleandir = None
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	693 raise error.Abort(_("destination '%s' already exists")
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	694 % dest)
9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	695 raise
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	696
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	697 if revs:
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	698 if not srcpeer.capable('lookup'):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	699 raise error.Abort(_("src repository does not support "
9171 a458b9bf4f3a hg: better wrapping of string literal Martin Geisler <mg@lazybytes.net> parents: 8907 diff changeset	700 "revision lookup and so doesn't "
a458b9bf4f3a hg: better wrapping of string literal Martin Geisler <mg@lazybytes.net> parents: 8907 diff changeset	701 "support clone by revision"))
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	702
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	703 # TODO this is batchable.
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	704 remoterevs = []
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	705 for rev in revs:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	706 with srcpeer.commandexecutor() as e:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	707 remoterevs.append(e.callcommand('lookup', {
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	708 'key': rev,
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	709 }).result())
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	710 revs = remoterevs
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	711
8417 39cf453da958 clone: try updating to the actual changeset specified in options Brett Carter <brett@rdnzl.net> parents: 8312 diff changeset	712 checkout = revs[0]
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	713 else:
54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	714 revs = None
27165 70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	715 local = destpeer.local()
70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	716 if local:
39571 cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	717 if narrow:
cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	718 with local.lock():
cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	719 local.setnarrowpats(storeincludepats, storeexcludepats)
cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	720
35565 bdae51a83dfb clonebundle: make it possible to retrieve the initial bundle through largefile Boris Feld <boris.feld@octobus.net> parents: 35442 diff changeset	721 u = util.url(abspath)
bdae51a83dfb clonebundle: make it possible to retrieve the initial bundle through largefile Boris Feld <boris.feld@octobus.net> parents: 35442 diff changeset	722 defaulturl = bytes(u)
bdae51a83dfb clonebundle: make it possible to retrieve the initial bundle through largefile Boris Feld <boris.feld@octobus.net> parents: 35442 diff changeset	723 local.ui.setconfig('paths', 'default', defaulturl, 'clone')
23545 68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	724 if not stream:
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	725 if pull:
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	726 stream = False
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	727 else:
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	728 stream = None
27165 70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	729 # internal config: ui.quietbookmarkmove
31465 2545ee88a57e clone: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31331 diff changeset	730 overrides = {('ui', 'quietbookmarkmove'): True}
2545ee88a57e clone: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31331 diff changeset	731 with local.ui.configoverride(overrides, 'clone'):
27165 70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	732 exchange.pull(local, srcpeer, revs,
39569 130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39566 diff changeset	733 streamclonerequested=stream,
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39566 diff changeset	734 includepats=storeincludepats,
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39566 diff changeset	735 excludepats=storeexcludepats)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	736 elif srcrepo:
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	737 # TODO lift restriction once exchange.push() accepts narrow
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	738 # push.
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	739 if narrow:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	740 raise error.Abort(_('narrow clone not available for '
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	741 'remote destinations'))
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	742
22647 5b6cd8526d56 clone: explicitly push bookmarks when cloning from local to remote Pierre-Yves David <pierre-yves.david@fb.com> parents: 22646 diff changeset	743 exchange.push(srcrepo, destpeer, revs=revs,
5b6cd8526d56 clone: explicitly push bookmarks when cloning from local to remote Pierre-Yves David <pierre-yves.david@fb.com> parents: 22646 diff changeset	744 bookmarks=srcrepo._bookmarks.keys())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	745 else:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	746 raise error.Abort(_("clone from remote to remote not supported")
56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26354 diff changeset	747 )
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	748
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	749 cleandir = None
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	750
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	751 destrepo = destpeer.local()
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	752 if destrepo:
22837 2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22818 diff changeset	753 template = uimod.samplehgrcs['cloned']
15552 62c9183a0bbb clone: don't save user's password in .hg/hgrc (Issue3122) Augie Fackler <durin42@gmail.com> parents: 15381 diff changeset	754 u = util.url(abspath)
62c9183a0bbb clone: don't save user's password in .hg/hgrc (Issue3122) Augie Fackler <durin42@gmail.com> parents: 15381 diff changeset	755 u.passwd = None
33713 6294654453ee py3: use bytes IO to write sample hgrc Yuya Nishihara <yuya@tcha.org> parents: 33034 diff changeset	756 defaulturl = bytes(u)
35620 545967ec33dc clone: use utility function to write hgrc Yuya Nishihara <yuya@tcha.org> parents: 35619 diff changeset	757 destrepo.vfs.write('hgrc', util.tonativeeol(template % defaulturl))
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20355 diff changeset	758 destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone')
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8807 diff changeset	759
35340 773a9a06047c clone: add support for storing remotenames while cloning Pulkit Goyal <7895pulkit@gmail.com> parents: 34957 diff changeset	760 if ui.configbool('experimental', 'remotenames'):
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35340 diff changeset	761 logexchange.pullremotenames(destrepo, srcpeer)
35340 773a9a06047c clone: add support for storing remotenames while cloning Pulkit Goyal <7895pulkit@gmail.com> parents: 34957 diff changeset	762
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	763 if update:
6526 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6525 diff changeset	764 if update is not True:
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	765 with srcpeer.commandexecutor() as e:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	766 checkout = e.callcommand('lookup', {
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	767 'key': update,
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	768 }).result()
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	769
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	770 uprev = None
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	771 status = None
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	772 if checkout is not None:
38753 e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	773 # Some extensions (at least hg-git and hg-subversion) have
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	774 # a peer.lookup() implementation that returns a name instead
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	775 # of a nodeid. We work around it here until we've figured
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	776 # out a better solution.
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	777 if len(checkout) == 20 and checkout in destrepo:
37480 c569e51ee449 clone: avoid using repo.lookup() with binary nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37313 diff changeset	778 uprev = checkout
38753 e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	779 elif scmutil.isrevsymbol(destrepo, checkout):
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	780 uprev = scmutil.revsymbol(destrepo, checkout).node()
37480 c569e51ee449 clone: avoid using repo.lookup() with binary nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37313 diff changeset	781 else:
26354 c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	782 if update is not True:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	783 try:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	784 uprev = destrepo.lookup(update)
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	785 except error.RepoLookupError:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	786 pass
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	787 if uprev is None:
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	788 try:
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	789 uprev = destrepo._bookmarks['@']
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17867 diff changeset	790 update = '@'
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	791 bn = destrepo[uprev].branch()
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	792 if bn == 'default':
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	793 status = _("updating to bookmark @\n")
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	794 else:
20868 5db105f216c3 i18n: fix "% inside _()" problems FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20858 diff changeset	795 status = (_("updating to bookmark @ on branch %s\n")
26353 7c20d501709b clone: fix over-indented continuation line Sean Farley <sean@farley.io> parents: 26240 diff changeset	796 % bn)
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	797 except KeyError:
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	798 try:
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	799 uprev = destrepo.branchtip('default')
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	800 except error.RepoLookupError:
c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	801 uprev = destrepo.lookup('tip')
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	802 if not status:
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	803 bn = destrepo[uprev].branch()
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	804 status = _("updating to branch %s\n") % bn
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	805 destrepo.ui.status(status)
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	806 _update(destrepo, uprev)
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17342 diff changeset	807 if update in destrepo._bookmarks:
24945 e0b0fbd47491 bookmarks: rename setcurrent to activate (API) Ryan McElroy <rmcelroy@fb.com> parents: 24440 diff changeset	808 bookmarks.activate(destrepo, update)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	809 finally:
15908 60cb4f381a78 bookmarks: backout locking change in 12dea4d998ec Matt Mackall <mpm@selenic.com> parents: 15887 diff changeset	810 release(srclock, destlock)
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	811 if cleandir is not None:
1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	812 shutil.rmtree(cleandir, True)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	813 if srcpeer is not None:
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	814 srcpeer.close()
19313 3b96d6e44a4d hg: move return statement after finally block simon@laptop-tosh parents: 18944 diff changeset	815 return srcpeer, destpeer
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	816
27402 5184089f5d30 hg: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27354 diff changeset	817 def _showstats(repo, stats, quietempty=False):
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	818 if quietempty and stats.isempty():
27402 5184089f5d30 hg: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27354 diff changeset	819 return
9454 dafadd7ff07e hg: avoid combining translated strings Martin Geisler <mg@lazybytes.net> parents: 9425 diff changeset	820 repo.ui.status(_("%d files updated, %d files merged, "
37110 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	821 "%d files removed, %d files unresolved\n") % (
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	822 stats.updatedcount, stats.mergedcount,
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	823 stats.removedcount, stats.unresolvedcount))
3316 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3195 diff changeset	824
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	825 def updaterepo(repo, node, overwrite, updatecheck=None):
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	826 """Update the working directory to node.
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	827
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	828 When overwrite is set, changes are clobbered, merged else
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	829
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	830 returns stats (see pydoc mercurial.merge.applyupdates)"""
27344 43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27165 diff changeset	831 return mergemod.update(repo, node, False, overwrite,
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	832 labels=['working copy', 'destination'],
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	833 updatecheck=updatecheck)
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	834
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	835 def update(repo, node, quietempty=False, updatecheck=None):
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	836 """update the working directory to node"""
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	837 stats = updaterepo(repo, node, False, updatecheck=updatecheck)
27404 1cf3543cc780 update: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27403 diff changeset	838 _showstats(repo, stats, quietempty)
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	839 if stats.unresolvedcount:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6338 diff changeset	840 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	841 return stats.unresolvedcount > 0
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	842
7546 c7f48414f3ad add a comment about the need of hg._update() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7280 diff changeset	843 # naming conflict in clone()
c7f48414f3ad add a comment about the need of hg._update() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7280 diff changeset	844 _update = update
c7f48414f3ad add a comment about the need of hg._update() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7280 diff changeset	845
27403 50b6a04f817f histedit: omit useless message from abort timeless <timeless@mozdev.org> parents: 27402 diff changeset	846 def clean(repo, node, show_stats=True, quietempty=False):
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2778 diff changeset	847 """forcibly switch the working directory to node, clobbering changes"""
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	848 stats = updaterepo(repo, node, True)
31320 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31228 diff changeset	849 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	850 if show_stats:
27403 50b6a04f817f histedit: omit useless message from abort timeless <timeless@mozdev.org> parents: 27402 diff changeset	851 _showstats(repo, stats, quietempty)
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	852 return stats.unresolvedcount > 0
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	853
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	854 # naming conflict in updatetotally()
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	855 _clean = clean
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	856
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	857 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	858 """Update the working directory with extra care for non-file components
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	859
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	860 This takes care of non-file components below:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	861
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	862 :bookmark: might be advanced or (in)activated
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	863
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	864 This takes arguments below:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	865
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	866 :checkout: to which revision the working directory is updated
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	867 :brev: a name, which might be a bookmark to be activated after updating
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	868 :clean: whether changes in the working directory can be discarded
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	869 :updatecheck: how to deal with a dirty working directory
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	870
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	871 Valid values for updatecheck are (None => linear):
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	872
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	873 * abort: abort if the working directory is dirty
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	874 * none: don't check (merge working directory changes into destination)
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	875 * linear: check that update is linear before merging working directory
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	876 changes into destination
31178 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31177 diff changeset	877 * noconflict: check that the update does not result in file merges
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	878
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	879 This returns whether conflict is detected at updating or not.
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	880 """
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	881 if updatecheck is None:
34705 23ed47a895d5 config: graduate experimental.updatecheck to commands.update.check Augie Fackler <augie@google.com> parents: 34146 diff changeset	882 updatecheck = ui.config('commands', 'update.check')
31178 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31177 diff changeset	883 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
31177 696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	884 # If not configured, or invalid value configured
696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	885 updatecheck = 'linear'
28503 138ec8835e63 hg: acquire wlock while updating the working directory via updatetotally FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28501 diff changeset	886 with repo.wlock():
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	887 movemarkfrom = None
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	888 warndest = False
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	889 if checkout is None:
30982 11c253997b0e destutil: drop now-unused "check" parameter from destupdate() Martin von Zweigbergk <martinvonz@google.com> parents: 30062 diff changeset	890 updata = destutil.destupdate(repo, clean=clean)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	891 checkout, movemarkfrom, brev = updata
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	892 warndest = True
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	893
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	894 if clean:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	895 ret = _clean(repo, checkout)
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	896 else:
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	897 if updatecheck == 'abort':
30983 7beb3ec34443 update: move check for dirty wdir into hg.updatetotally() Martin von Zweigbergk <martinvonz@google.com> parents: 30982 diff changeset	898 cmdutil.bailifchanged(repo, merge=False)
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	899 updatecheck = 'none'
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	900 ret = _update(repo, checkout, updatecheck=updatecheck)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	901
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	902 if not ret and movemarkfrom:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	903 if movemarkfrom == repo['.'].node():
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	904 pass # no-op update
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	905 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
29906 a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	906 b = ui.label(repo._activebookmark, 'bookmarks.active')
a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	907 ui.status(_("updating bookmark %s\n") % b)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	908 else:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	909 # this can happen with a non-linear update
29906 a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	910 b = ui.label(repo._activebookmark, 'bookmarks')
a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	911 ui.status(_("(leaving bookmark %s)\n") % b)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	912 bookmarks.deactivate(repo)
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	913 elif brev in repo._bookmarks:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	914 if brev != repo._activebookmark:
29906 a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	915 b = ui.label(brev, 'bookmarks.active')
a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	916 ui.status(_("(activating bookmark %s)\n") % b)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	917 bookmarks.activate(repo, brev)
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	918 elif brev:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	919 if repo._activebookmark:
29906 a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	920 b = ui.label(repo._activebookmark, 'bookmarks')
a77d48219edd update: label bookmark name in message Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29765 diff changeset	921 ui.status(_("(leaving bookmark %s)\n") % b)
28501 66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	922 bookmarks.deactivate(repo)
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	923
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	924 if warndest:
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	925 destutil.statusotherdests(ui, repo)
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	926
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	927 return ret
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	928
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	929 def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	930 abort=False):
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13047 diff changeset	931 """Branch merge with node, resolving changes. Return true if any
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13047 diff changeset	932 unresolved conflicts."""
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	933 if not abort:
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	934 stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	935 labels=labels)
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	936 else:
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	937 ms = mergemod.mergestate.read(repo)
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	938 if ms.active():
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	939 # there were conflicts
35713 7ffbd911dbc9 merge: use public interface ms.localctx instead of ms._local Pulkit Goyal <7895pulkit@gmail.com> parents: 35704 diff changeset	940 node = ms.localctx.hex()
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	941 else:
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	942 # there were no conficts, mergestate was not stored
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	943 node = repo['.'].hex()
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	944
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	945 repo.ui.status(_("aborting the merge, updating back to"
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	946 " %s\n") % node[:12])
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	947 stats = mergemod.update(repo, node, branchmerge=False, force=True,
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	948 labels=labels)
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	949
3316 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3195 diff changeset	950 _showstats(repo, stats)
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	951 if stats.unresolvedcount:
7821 9fe7e6acf525 merge: better error messages to lead users to hg update --clean to abandon merges. Augie Fackler <durin42@gmail.com> parents: 7640 diff changeset	952 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
35704 41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	953 "or 'hg merge --abort' to abandon\n"))
41ef02ba329b merge: add `--abort` flag which can abort the merge Pulkit Goyal <7895pulkit@gmail.com> parents: 35622 diff changeset	954 elif remind and not abort:
3316 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3195 diff changeset	955 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	956 return stats.unresolvedcount > 0
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2778 diff changeset	957
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	958 def _incoming(displaychlist, subreporecurse, ui, repo, source,
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	959 opts, buffered=False):
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	960 """
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	961 Helper for incoming / gincoming.
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	962 displaychlist gets called with
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	963 (remoterepo, incomingchangesetlist, displayer) parameters,
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	964 and is supposed to contain only code that can't be unified.
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	965 """
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	966 source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
14556 517e1d88bf7e hg: change various repository() users to use peer() where appropriate Matt Mackall <mpm@selenic.com> parents: 14555 diff changeset	967 other = peer(repo, opts, source)
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	968 ui.status(_('comparing with %s\n') % util.hidepassword(source))
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	969 revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	970
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	971 if revs:
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	972 revs = [other.lookup(rev) for rev in revs]
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	973 other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other,
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	974 revs, opts["bundle"], opts["force"])
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	975 try:
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	976 if not chlist:
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	977 ui.status(_("no changes found\n"))
8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	978 return subreporecurse()
31077 16d7db8f752c incoming: delay pager activation until right before printing changes Augie Fackler <augie@google.com> parents: 30983 diff changeset	979 ui.pager('incoming')
36041 fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 35928 diff changeset	980 displayer = logcmdutil.changesetdisplayer(ui, other, opts,
fcde8946c553 logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API) Yuya Nishihara <yuya@tcha.org> parents: 35928 diff changeset	981 buffered=buffered)
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	982 displaychlist(other, chlist, displayer)
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	983 displayer.close()
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	984 finally:
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	985 cleanupfn()
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	986 subreporecurse()
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	987 return 0 # exit code is zero since we found incoming changes
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	988
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	989 def incoming(ui, repo, source, opts):
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	990 def subreporecurse():
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	991 ret = 1
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	992 if opts.get('subrepos'):
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	993 ctx = repo[None]
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	994 for subpath in sorted(ctx.substate):
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	995 sub = ctx.sub(subpath)
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	996 ret = min(ret, sub.incoming(ui, source, opts))
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	997 return ret
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	998
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	999 def display(other, chlist, displayer):
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	1000 limit = logcmdutil.getlimit(opts)
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1001 if opts.get('newest_first'):
12729 55f0648c7e2d incoming: rename variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12400 diff changeset	1002 chlist.reverse()
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1003 count = 0
12729 55f0648c7e2d incoming: rename variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12400 diff changeset	1004 for n in chlist:
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1005 if limit is not None and count >= limit:
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1006 break
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1007 parents = [p for p in other.changelog.parents(n) if p != nullid]
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1008 if opts.get('no_merges') and len(parents) == 2:
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1009 continue
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1010 count += 1
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1011 displayer.show(other[n])
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1012 return _incoming(display, subreporecurse, ui, repo, source, opts)
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1013
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1014 def _outgoing(ui, repo, dest, opts):
35442 0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1015 path = ui.paths.getpath(dest, default=('default-push', 'default'))
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1016 if not path:
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1017 raise error.Abort(_('default repository not configured!'),
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1018 hint=_("see 'hg help config.paths'"))
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1019 dest = path.pushloc or path.loc
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1020 branches = path.branch, opts.get('branch') or []
0ebd94ac56d1 outgoing: respect ":pushurl" paths (issue5365) Hollis Blanchard <hollis_blanchard@mentor.com> parents: 35356 diff changeset	1021
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14073 diff changeset	1022 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1023 revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1024 if revs:
37313 70c52800940b outgoing: avoid repo.lookup() for converting revnum to nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37264 diff changeset	1025 revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1026
14556 517e1d88bf7e hg: change various repository() users to use peer() where appropriate Matt Mackall <mpm@selenic.com> parents: 14555 diff changeset	1027 other = peer(repo, opts, dest)
32221 448ed4d3ee90 outgoing: run on filtered repo Martin von Zweigbergk <martinvonz@google.com> parents: 31841 diff changeset	1028 outgoing = discovery.findcommonoutgoing(repo, other, revs,
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15741 diff changeset	1029 force=opts.get('force'))
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15741 diff changeset	1030 o = outgoing.missing
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1031 if not o:
17248 6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17198 diff changeset	1032 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
21050 025ec0f08cb6 hg: make "_outgoing()" return peer object for remote repository FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21049 diff changeset	1033 return o, other
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1034
12271 01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1035 def outgoing(ui, repo, dest, opts):
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1036 def recurse():
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1037 ret = 1
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1038 if opts.get('subrepos'):
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1039 ctx = repo[None]
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1040 for subpath in sorted(ctx.substate):
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1041 sub = ctx.sub(subpath)
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1042 ret = min(ret, sub.outgoing(ui, dest, opts))
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1043 return ret
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1044
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	1045 limit = logcmdutil.getlimit(opts)
21050 025ec0f08cb6 hg: make "_outgoing()" return peer object for remote repository FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21049 diff changeset	1046 o, other = _outgoing(ui, repo, dest, opts)
21049 f117a0ba5289 hg: make "_outgoing()" return empty list instead of "None" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20870 diff changeset	1047 if not o:
21051 1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21050 diff changeset	1048 cmdutil.outgoinghooks(ui, repo, other, opts, o)
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1049 return recurse()
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1050
12271 01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1051 if opts.get('newest_first'):
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1052 o.reverse()
31078 d2ed0abce08e outgoing: avoid running pager until we're actually showing changes Augie Fackler <augie@google.com> parents: 31077 diff changeset	1053 ui.pager('outgoing')
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	1054 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
12271 01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1055 count = 0
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1056 for n in o:
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1057 if limit is not None and count >= limit:
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1058 break
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1059 parents = [p for p in repo.changelog.parents(n) if p != nullid]
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1060 if opts.get('no_merges') and len(parents) == 2:
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1061 continue
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1062 count += 1
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1063 displayer.show(repo[n])
01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1064 displayer.close()
21051 1004d3cd65fd outgoing: introduce "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21050 diff changeset	1065 cmdutil.outgoinghooks(ui, repo, other, opts, o)
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1066 recurse()
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1067 return 0 # exit code is zero since we found outgoing changes
12271 01dc8ba3e032 outgoing: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12144 diff changeset	1068
2778 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2775 diff changeset	1069 def verify(repo):
fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2775 diff changeset	1070 """verify the consistency of a repository"""
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1071 ret = verifymod.verify(repo)
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1072
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1073 # Broken subrepo references in hidden csets don't seem worth worrying about,
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1074 # since they can't be pushed/pulled, and --hidden can be used if they are a
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1075 # concern.
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1076
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1077 # pathto() is needed for -R case
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1078 revs = repo.revs("filelog(%s)",
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1079 util.pathto(repo.root, repo.getcwd(), '.hgsubstate'))
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1080
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1081 if revs:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1082 repo.ui.status(_('checking subrepo links\n'))
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1083 for rev in revs:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1084 ctx = repo[rev]
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1085 try:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1086 for subpath in ctx.substate:
29021 92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28655 diff changeset	1087 try:
92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28655 diff changeset	1088 ret = (ctx.sub(subpath, allowcreate=False).verify()
92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28655 diff changeset	1089 or ret)
92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28655 diff changeset	1090 except error.RepoError as e:
37579 ce566e0f73d0 py3: use '%d' for integers instead of '%s' Pulkit Goyal <7895pulkit@gmail.com> parents: 37481 diff changeset	1091 repo.ui.warn(('%d: %s\n') % (rev, e))
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1092 except Exception:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1093 repo.ui.warn(_('.hgsubstate is corrupt in revision %s\n') %
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1094 node.short(ctx.node()))
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1095
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1096 return ret
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1097
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1098 def remoteui(src, opts):
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1099 'build a remote ui from ui or repo and opts'
14952 4c523a2af6e7 hg: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14839 diff changeset	1100 if util.safehasattr(src, 'baseui'): # looks like a repository
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1101 dst = src.baseui.copy() # drop repo-specific config
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1102 src = src.ui # copy target options from repo
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1103 else: # assume it's a global ui object
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1104 dst = src.copy() # keep all global options
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1105
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1106 # copy ssh-specific options
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1107 for o in 'ssh', 'remotecmd':
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1108 v = opts.get(o) or src.config('ui', o)
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1109 if v:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20355 diff changeset	1110 dst.setconfig("ui", o, v, 'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1111
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1112 # copy bundle-specific options
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1113 r = src.config('bundle', 'mainreporoot')
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1114 if r:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20355 diff changeset	1115 dst.setconfig('bundle', 'mainreporoot', r, 'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1116
13192 4d03707916d3 https: use web.cacerts configuration from local repo to validate remote repo Mads Kiilerich <mads@kiilerich.com> parents: 12735 diff changeset	1117 # copy selected local settings to the remote ui
29616 3fde328d0913 hg: copy [hostsecurity] options to remote ui instances (issue5305) Gregory Szorc <gregory.szorc@gmail.com> parents: 29594 diff changeset	1118 for sect in ('auth', 'hostfingerprints', 'hostsecurity', 'http_proxy'):
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1119 for key, val in src.configitems(sect):
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20355 diff changeset	1120 dst.setconfig(sect, key, val, 'copied')
13192 4d03707916d3 https: use web.cacerts configuration from local repo to validate remote repo Mads Kiilerich <mads@kiilerich.com> parents: 12735 diff changeset	1121 v = src.config('web', 'cacerts')
29594 e417664a3339 ssl: remove special case of web.cacerts=! from remoteui() Yuya Nishihara <yuya@tcha.org> parents: 29424 diff changeset	1122 if v:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20355 diff changeset	1123 dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1124
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1125 return dst
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1126
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1127 # Files of interest
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1128 # Used to check if the repository has changed looking at mtime and size of
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26654 diff changeset	1129 # these files.
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1130 foi = [('spath', '00changelog.i'),
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1131 ('spath', 'phaseroots'), # ! phase can change content at the same size
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1132 ('spath', 'obsstore'),
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1133 ('path', 'bookmarks'), # ! bookmark can change content at the same size
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1134 ]
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1135
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1136 class cachedlocalrepo(object):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1137 """Holds a localrepository that can be cached and reused."""
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1138
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1139 def __init__(self, repo):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1140 """Create a new cached repo from an existing repo.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1141
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1142 We assume the passed in repo was recently created. If the
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1143 repo has changed between when it was created and when it was
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1144 turned into a cache, it may not refresh properly.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1145 """
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1146 assert isinstance(repo, localrepo.localrepository)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1147 self._repo = repo
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1148 self._state, self.mtime = self._repostate()
28119 91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1149 self._filtername = repo.filtername
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1150
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1151 def fetch(self):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1152 """Refresh (if necessary) and return a repository.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1153
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1154 If the cached instance is out of date, it will be recreated
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1155 automatically and returned.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1156
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1157 Returns a tuple of the repo and a boolean indicating whether a new
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1158 repo instance was created.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1159 """
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1160 # We compare the mtimes and sizes of some well-known files to
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1161 # determine if the repo changed. This is not precise, as mtimes
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1162 # are susceptible to clock skew and imprecise filesystems and
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1163 # file content can change while maintaining the same size.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1164
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1165 state, mtime = self._repostate()
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1166 if state == self._state:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1167 return self._repo, False
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1168
28119 91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1169 repo = repository(self._repo.baseui, self._repo.url())
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1170 if self._filtername:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1171 self._repo = repo.filtered(self._filtername)
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1172 else:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1173 self._repo = repo.unfiltered()
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1174 self._state = state
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1175 self.mtime = mtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1176
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1177 return self._repo, True
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1178
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1179 def _repostate(self):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1180 state = []
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1181 maxmtime = -1
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1182 for attr, fname in foi:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1183 prefix = getattr(self._repo, attr)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1184 p = os.path.join(prefix, fname)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1185 try:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1186 st = os.stat(p)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1187 except OSError:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1188 st = os.stat(prefix)
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36725 diff changeset	1189 state.append((st[stat.ST_MTIME], st.st_size))
ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36725 diff changeset	1190 maxmtime = max(maxmtime, st[stat.ST_MTIME])
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1191
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1192 return tuple(state), maxmtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1193
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1194 def copy(self):
26240 2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1195 """Obtain a copy of this class instance.
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1196
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1197 A new localrepository instance is obtained. The new instance should be
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1198 completely independent of the original.
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1199 """
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1200 repo = repository(self._repo.baseui, self._repo.origroot)
28119 91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1201 if self._filtername:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1202 repo = repo.filtered(self._filtername)
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1203 else:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1204 repo = repo.unfiltered()
26240 2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1205 c = cachedlocalrepo(repo)
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1206 c._state = self._state
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1207 c.mtime = self.mtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1208 return c

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hg.py @ 39854:d3d4b4b5f725