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

annotate mercurial/hg.py @ 51704:fb15ba66c702 stable

subrepo: propagate non-default path on outgoing There was already a fix made in 5dbff89cf107 for pull and push commands. I did the same for the outgoing command. The problem I identified is that when the parent repository has multiple paths, the outgoing command was not respecting the parent path used and was always using the default path for subrepositories.

author	Felipe Resende <felipe@fcresende.dev.br>
date	Sun, 31 Mar 2024 17:57:46 -0300
parents	653b7a19f1de
children	19ae7730636a

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 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46796 diff changeset	3 # Copyright 2005-2007 Olivia Mackall <olivia@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
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	10 import os
48352 f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	11 import posixpath
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	12 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	13 import stat
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	14 import weakref
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	15
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	16 from .i18n import _
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	17 from .node import (
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	18 hex,
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	19 sha1nodeconstants,
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	20 short,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	21 )
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	22
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	23 from . import (
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	24 bookmarks,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	25 bundlerepo,
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,
46915 efc6f6a794bd outgoing: merge the code handling --graph with the main one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46914 diff changeset	32 graphmod,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	33 httppeer,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	34 localrepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	35 lock,
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	36 logcmdutil,
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35340 diff changeset	37 logexchange,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	38 merge as mergemod,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44659 diff changeset	39 mergestate as mergestatemod,
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	40 narrowspec,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	41 phases,
45392 77b8588dd84e requirements: introduce new requirements related module Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	42 requirements,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	43 scmutil,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	44 sshpeer,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	45 statichttprepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	46 ui as uimod,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	47 unionrepo,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	48 url,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	49 util,
130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	50 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	51 vfs as vfsmod,
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	52 )
47310 7edaf91c7886 updatecaches: use the `caches` argument instead of a special `full` value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47244 diff changeset	53 from .interfaces import repository as repositorymod
46398 1099541b6462 hg: convert an exception to bytes in the repo creation exception handler Matt Harbison <matt_harbison@yahoo.com> parents: 46314 diff changeset	54 from .utils import (
1099541b6462 hg: convert an exception to bytes in the repo creation exception handler Matt Harbison <matt_harbison@yahoo.com> parents: 46314 diff changeset	55 hashutil,
1099541b6462 hg: convert an exception to bytes in the repo creation exception handler Matt Harbison <matt_harbison@yahoo.com> parents: 46314 diff changeset	56 stringutil,
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	57 urlutil,
46398 1099541b6462 hg: convert an exception to bytes in the repo creation exception handler Matt Harbison <matt_harbison@yahoo.com> parents: 46314 diff changeset	58 )
1099541b6462 hg: convert an exception to bytes in the repo creation exception handler Matt Harbison <matt_harbison@yahoo.com> parents: 46314 diff changeset	59
42823 268662aac075 interfaces: create a new folder for interfaces and move repository.py in it Pulkit Goyal <pulkit@yandex-team.ru> parents: 42604 diff changeset	60
25939 130c0b83e963 hg: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25761 diff changeset	61 release = lock.release
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	62
29424 f21e0d91d386 share: move magic string to a constant Martijn Pieters <mjpieters@fb.com> parents: 29389 diff changeset	63 # shared features
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	64 sharedbookmarks = b'bookmarks'
29424 f21e0d91d386 share: move magic string to a constant Martijn Pieters <mjpieters@fb.com> parents: 29389 diff changeset	65
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	66
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	67 def addbranchrevs(lrepo, other, branches, revs, remotehidden=False):
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	68 if hasattr(other, 'peer'):
49858 2a5feacc4085 addbranchrevs: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49857 diff changeset	69 # a courtesy to callers using a localrepo for other
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	70 peer = other.peer(remotehidden=remotehidden)
49858 2a5feacc4085 addbranchrevs: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49857 diff changeset	71 else:
2a5feacc4085 addbranchrevs: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49857 diff changeset	72 peer = other
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	73 hashbranch, branches = branches
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	74 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	75 x = revs or None
37481 7c848ab13eff addbranchrevs: no longer accept revset as "revs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 37480 diff changeset	76 if revs:
22818 d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	77 y = revs[0]
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	78 else:
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	79 y = None
d7b114493315 repair: use `first` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22648 diff changeset	80 return x, y
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	81 if revs:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	82 revs = list(revs)
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	83 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	84 revs = []
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24290 diff changeset	85
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	86 if not peer.capable(b'branchmap'):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	87 if branches:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	88 raise error.Abort(_(b"remote branch lookup not supported"))
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	89 revs.append(hashbranch)
10380 ee72d89c0d9f addbranchrevs: fallback for older servers Sune Foldager <cryo@cyanite.org> parents: 10379 diff changeset	90 return revs, revs[0]
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	91
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	92 with peer.commandexecutor() as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	93 branchmap = e.callcommand(b'branchmap', {}).result()
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	94
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	95 def primary(branch):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	96 if branch == b'.':
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	97 if not lrepo:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	98 raise error.Abort(_(b"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	99 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	100 if branch in branchmap:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	101 revs.extend(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	102 return True
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	103 else:
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	104 return False
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	105
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	106 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	107 if not primary(branch):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	108 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	109 if hashbranch:
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 12735 diff changeset	110 if not primary(hashbranch):
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 11312 diff changeset	111 revs.append(hashbranch)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	112 return revs, revs[0]
d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	113
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	114
49797 d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	115 def _isfile(path):
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	116 try:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	117 # we use os.stat() directly here instead of os.path.isfile()
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	118 # because the latter started returning `False` on invalid path
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	119 # exceptions starting in 3.8 and we care about handling
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	120 # invalid paths specially here.
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	121 st = os.stat(path)
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	122 except ValueError as e:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	123 msg = stringutil.forcebytestr(e)
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	124 raise error.Abort(_(b'invalid path %s: %s') % (path, msg))
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	125 except OSError:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	126 return False
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	127 else:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	128 return stat.S_ISREG(st.st_mode)
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	129
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	130
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	131 class LocalFactory:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	132 """thin wrapper to dispatch between localrepo and bundle repo"""
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	133
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	134 @staticmethod
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	135 def islocal(path: bytes) -> bool:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	136 path = util.expandpath(urlutil.urllocalpath(path))
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	137 return not _isfile(path)
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	138
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	139 @staticmethod
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	140 def instance(ui, path, args, *kwargs):
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	141 path = util.expandpath(urlutil.urllocalpath(path))
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	142 if _isfile(path):
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	143 cls = bundlerepo
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	144 else:
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	145 cls = localrepo
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	146 return cls.instance(ui, path, args, *kwargs)
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	147
d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	148
49801 f73f02ef8cb6 peer-or-repo: split the scheme between repo and peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49800 diff changeset	149 repo_schemes = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	150 b'bundle': bundlerepo,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	151 b'union': unionrepo,
49797 d9791643aab7 peer-or-repo: make sure object in "scheme" have a `instance` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49796 diff changeset	152 b'file': LocalFactory,
49801 f73f02ef8cb6 peer-or-repo: split the scheme between repo and peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49800 diff changeset	153 }
f73f02ef8cb6 peer-or-repo: split the scheme between repo and peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49800 diff changeset	154
f73f02ef8cb6 peer-or-repo: split the scheme between repo and peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49800 diff changeset	155 peer_schemes = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	156 b'http': httppeer,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	157 b'https': httppeer,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	158 b'ssh': sshpeer,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	159 b'static-http': statichttprepo,
14568 5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	160 }
5f002e3336ba hg: split peer and repo lookup tables Matt Mackall <mpm@selenic.com> parents: 14556 diff changeset	161
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	162
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	163 def islocal(repo):
20355 7d269e7620c4 hg: note that islocal only accepts paths pointing to repos Siddharth Agarwal <sid0@fb.com> parents: 20354 diff changeset	164 '''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	165 if isinstance(repo, bytes):
49861 be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	166 u = urlutil.url(repo)
be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	167 scheme = u.scheme or b'file'
be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	168 if scheme in peer_schemes:
be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	169 cls = peer_schemes[scheme]
49862 f075a9463ee7 peer: use a dedicated name for the `peer` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49861 diff changeset	170 cls.make_peer # make sure we load the module
49861 be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	171 elif scheme in repo_schemes:
be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	172 cls = repo_schemes[scheme]
49862 f075a9463ee7 peer: use a dedicated name for the `peer` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49861 diff changeset	173 cls.instance # make sure we load the module
49861 be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	174 else:
be3fcd9e5e52 peer: dissolve `_peerlookup` into its last two callers Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49860 diff changeset	175 cls = LocalFactory
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	176 if hasattr(cls, 'islocal'):
49800 0d5b2e010614 peer-or-repo: stop relying on AttributeError in `islocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49799 diff changeset	177 return cls.islocal(repo) # pytype: disable=module-attr
0d5b2e010614 peer-or-repo: stop relying on AttributeError in `islocal` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49799 diff changeset	178 return False
49799 b478e1b132e9 repo-or-peer: deprecate calling `islocal` on non-path object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49798 diff changeset	179 repo.ui.deprecwarn(b"use obj.local() instead of islocal(obj)", b"6.4")
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	180 return repo.local()
9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	181
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	182
42109 2a3c0106ded9 import: suppress accept: header timeless <timeless@mozdev.org> parents: 41498 diff changeset	183 def openpath(ui, path, sendaccept=True):
17887 0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	184 '''open path with open if local, url.open if remote'''
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	185 pathurl = urlutil.url(path, parsequery=False, parsefragment=False)
20354 b433b43364e4 hg.openpath: use url.islocal to tell if the path is local (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 20185 diff changeset	186 if pathurl.islocal():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	187 return util.posixfile(pathurl.localpath(), b'rb')
17887 0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	188 else:
42109 2a3c0106ded9 import: suppress accept: header timeless <timeless@mozdev.org> parents: 41498 diff changeset	189 return url.open(ui, path, sendaccept=sendaccept)
17887 0e2846b2482c url: use open and not url.open for local files (issue3624) Siddharth Agarwal <sid0@fb.com> parents: 17882 diff changeset	190
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	191
20858 bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	192 # 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	193 wirepeersetupfuncs = []
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20825 diff changeset	194
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	195
49796 1e6c37360527 peer-or-repo: move the object setup in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49313 diff changeset	196 def _setup_repo_or_peer(ui, obj, presetupfuncs=None):
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	197 ui = getattr(obj, "ui", ui)
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32221 diff changeset	198 for f in presetupfuncs or []:
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32221 diff changeset	199 f(ui, obj)
41006 6f2510b581a0 extensions: use ui.log() interface to provide detailed loading information Yuya Nishihara <yuya@tcha.org> parents: 40682 diff changeset	200 ui.log(b'extension', b'- executing reposetup hooks\n')
43238 101ae8bbfa02 cleanup: hgdemandimport.tracing accepts strings, not bytes Augie Fackler <augie@google.com> parents: 43117 diff changeset	201 with util.timedcm('all reposetup') as allreposetupstats:
39527 340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	202 for name, module in extensions.extensions(ui):
41006 6f2510b581a0 extensions: use ui.log() interface to provide detailed loading information Yuya Nishihara <yuya@tcha.org> parents: 40682 diff changeset	203 ui.log(b'extension', b' - running reposetup for %s\n', name)
39527 340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	204 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	205 if hook:
43238 101ae8bbfa02 cleanup: hgdemandimport.tracing accepts strings, not bytes Augie Fackler <augie@google.com> parents: 43117 diff changeset	206 with util.timedcm('reposetup %r', name) as stats:
39527 340170192874 extensions: trace the total time of running all reposetup callbacks Boris Feld <boris.feld@octobus.net> parents: 39524 diff changeset	207 hook(ui, obj)
49796 1e6c37360527 peer-or-repo: move the object setup in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49313 diff changeset	208 msg = b' > reposetup for %s took %s\n'
1e6c37360527 peer-or-repo: move the object setup in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49313 diff changeset	209 ui.log(b'extension', msg, name, stats)
41006 6f2510b581a0 extensions: use ui.log() interface to provide detailed loading information Yuya Nishihara <yuya@tcha.org> parents: 40682 diff changeset	210 ui.log(b'extension', b'> 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	211 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	212 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	213 f(ui, obj)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	214
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	215
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	216 def repository(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 ui,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	218 path=b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 create=False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	220 presetupfuncs=None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	221 intents=None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 createopts=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	223 ):
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	224 """return a repository object for the specified path"""
49805 ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	225 scheme = urlutil.url(path).scheme
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	226 if scheme is None:
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	227 scheme = b'file'
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	228 cls = repo_schemes.get(scheme)
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	229 if cls is None:
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	230 if scheme in peer_schemes:
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	231 raise error.Abort(_(b"repository '%s' is not local") % path)
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	232 cls = LocalFactory
ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	233 repo = cls.instance(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	234 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	235 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	236 create,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	237 intents=intents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	238 createopts=createopts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	239 )
49805 ebb5e38fdafc peer-or-repo: build a repo directly in the `repo` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49804 diff changeset	240 _setup_repo_or_peer(ui, repo, presetupfuncs=presetupfuncs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	241 return repo.filtered(b'visible')
14605 9f1139cf5c76 hg: rearrange peer scheme lookup Matt Mackall <mpm@selenic.com> parents: 14568 diff changeset	242
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	243
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	244 def peer(
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	245 uiorrepo,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	246 opts,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	247 path,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	248 create=False,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	249 intents=None,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	250 createopts=None,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	251 remotehidden=False,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	252 ):
14554 68db17047637 hg: add peer method Matt Mackall <mpm@selenic.com> parents: 14553 diff changeset	253 '''return a repository peer for the specified path'''
49866 ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	254 ui = getattr(uiorrepo, 'ui', uiorrepo)
14839 510c893a726f peer: change arg name to convey it can be a repo as well Idan Kamara <idankk86@gmail.com> parents: 14825 diff changeset	255 rui = remoteui(uiorrepo, opts)
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	256 if hasattr(path, 'url'):
49866 ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	257 # this is already a urlutil.path object
ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	258 peer_path = path
49819 aa36771ef505 path: have `peer` constructor accept a `path` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49813 diff changeset	259 else:
49866 ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	260 peer_path = urlutil.path(ui, None, rawloc=path, validate_path=False)
ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	261 scheme = peer_path.url.scheme # pytype: disable=attribute-error
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	262 if scheme in peer_schemes:
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	263 cls = peer_schemes[scheme]
49862 f075a9463ee7 peer: use a dedicated name for the `peer` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49861 diff changeset	264 peer = cls.make_peer(
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	265 rui,
49869 5f71fff8dc74 peer: pass the `path` object to `make_peer` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49867 diff changeset	266 peer_path,
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	267 create,
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	268 intents=intents,
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	269 createopts=createopts,
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	270 remotehidden=remotehidden,
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	271 )
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	272 _setup_repo_or_peer(rui, peer)
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	273 else:
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	274 # this is a repository
49866 ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	275 repo_path = peer_path.loc # pytype: disable=attribute-error
ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	276 if not repo_path:
ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	277 repo_path = peer_path.rawloc # pytype: disable=attribute-error
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	278 repo = repository(
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	279 rui,
49866 ec30fe6917ec peer: build a `path` object on the fly when needed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49862 diff changeset	280 repo_path,
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	281 create,
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	282 intents=intents,
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	283 createopts=createopts,
c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	284 )
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50230 diff changeset	285 peer = repo.peer(path=peer_path, remotehidden=remotehidden)
49804 c0acf5440fe1 peer-or-repo: build a peer directly in the `peer` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49803 diff changeset	286 return peer
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	287
14554 68db17047637 hg: add peer method Matt Mackall <mpm@selenic.com> parents: 14553 diff changeset	288
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	289 def defaultdest(source):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	290 """return default destination of clone if none is given
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	291
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	292 >>> defaultdest(b'foo')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	293 'foo'
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	294 >>> defaultdest(b'/foo/bar')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	295 'bar'
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	296 >>> defaultdest(b'/')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	297 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	298 >>> defaultdest(b'')
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	299 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	300 >>> 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	301 ''
34146 0fa781320203 doctest: bulk-replace string literals with b'' for Python 3 Yuya Nishihara <yuya@tcha.org> parents: 33713 diff changeset	302 >>> defaultdest(b'http://example.org/foo/')
20799 069bf1b821c8 clone: add doctest for default destination Yuya Nishihara <yuya@tcha.org> parents: 20790 diff changeset	303 'foo'
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	304 """
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	305 path = urlutil.url(source).path
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	306 if not path:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	307 return b''
20800 8253e55930a3 clone: abort if default destination has no meaningful name (BC) Yuya Nishihara <yuya@tcha.org> parents: 20799 diff changeset	308 return os.path.basename(os.path.normpath(path))
2774 8cd3e19bf4a5 Add a doc string Matt Mackall <mpm@selenic.com> parents: 2768 diff changeset	309
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	310
36197 0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	311 def sharedreposource(repo):
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	312 """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	313
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	314 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	315 """
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	316 if repo.sharedpath == repo.path:
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	317 return None
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	318
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	319 if hasattr(repo, 'srcrepo') and repo.srcrepo:
36197 0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	320 return repo.srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	321
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	322 # 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	323 source = repo.vfs.split(repo.sharedpath)[0]
46908 4452cb788404 urlutil: extract `parseurl` from `hg` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46907 diff changeset	324 srcurl, branches = urlutil.parseurl(source)
36197 0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	325 srcrepo = repository(repo.ui, srcurl)
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	326 repo.srcrepo = srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	327 return srcrepo
0fe7e39dc683 hg: move share._getsrcrepo into core Gregory Szorc <gregory.szorc@gmail.com> parents: 36087 diff changeset	328
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	329
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	330 def share(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	331 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	332 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	333 dest=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	334 update=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	335 bookmarks=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	336 defaultpath=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	337 relative=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	338 ):
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	339 '''create a shared repository'''
971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	340
49798 229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	341 not_local_msg = _(b'can only share local repositories')
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	342 if hasattr(source, 'local'):
49798 229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	343 if source.local() is None:
229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	344 raise error.Abort(not_local_msg)
229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	345 elif not islocal(source):
229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	346 # XXX why are we getting bytes here ?
229e0ed88895 share: stop using 'islocal' with repo instance Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49797 diff changeset	347 raise error.Abort(not_local_msg)
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	348
8807 8bf6eb68ddaf share: allow dest to default to the basename of source Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	349 if not dest:
10099 f5e46dfb38c7 share: use defaultdest to compute unspecified destination Brendan Cully <brendan@kublai.com> parents: 9984 diff changeset	350 dest = defaultdest(source)
9344 eb6af02307ec Merge with i18n-stable Matt Mackall <mpm@selenic.com> parents: 9245 diff changeset	351 else:
49856 5f36784c300f path: use `get_clone_path_obj` in share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49830 diff changeset	352 dest = urlutil.get_clone_path_obj(ui, dest).loc
8807 8bf6eb68ddaf share: allow dest to default to the basename of source Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	353
36087 488e313954ea py3: check for bytes instead of str in hg.share() Gregory Szorc <gregory.szorc@gmail.com> parents: 36041 diff changeset	354 if isinstance(source, bytes):
49856 5f36784c300f path: use `get_clone_path_obj` in share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49830 diff changeset	355 source_path = urlutil.get_clone_path_obj(ui, source)
5f36784c300f path: use `get_clone_path_obj` in share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49830 diff changeset	356 srcrepo = repository(ui, source_path.loc)
5f36784c300f path: use `get_clone_path_obj` in share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49830 diff changeset	357 branches = (source_path.branch, [])
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10358 diff changeset	358 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	359 else:
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	360 srcrepo = source.local()
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	361 checkout = None
971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	362
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	363 shareditems = set()
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	364 if bookmarks:
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	365 shareditems.add(sharedbookmarks)
d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	366
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	367 r = repository(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	368 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	369 dest,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	370 create=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	371 createopts={
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	372 b'sharedrepo': srcrepo,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	373 b'sharedrelative': relative,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	374 b'shareditems': shareditems,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	375 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	376 )
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	377
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	378 postshare(srcrepo, r, defaultpath=defaultpath)
40622 fb490d798be0 share: reload repo after adjusting it in postshare() Martin von Zweigbergk <martinvonz@google.com> parents: 40505 diff changeset	379 r = repository(ui, dest)
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	380 _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	381 return r
8800 971e38a9344b add helper function to create shared repos Matt Mackall <mpm@selenic.com> parents: 8649 diff changeset	382
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	383
45496 b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	384 def _prependsourcehgrc(repo):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	385 """copies the source repo config and prepend it in current repo .hg/hgrc
45496 b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	386 on unshare. This is only done if the share was perfomed using share safe
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	387 method where we share config of source in shares"""
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	388 srcvfs = vfsmod.vfs(repo.sharedpath)
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	389 dstvfs = vfsmod.vfs(repo.path)
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	390
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	391 if not srcvfs.exists(b'hgrc'):
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	392 return
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	393
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	394 currentconfig = b''
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	395 if dstvfs.exists(b'hgrc'):
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	396 currentconfig = dstvfs.read(b'hgrc')
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	397
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	398 with dstvfs(b'hgrc', b'wb') as fp:
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	399 sourceconfig = srcvfs.read(b'hgrc')
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	400 fp.write(b"# Config copied from shared source\n")
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	401 fp.write(sourceconfig)
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	402 fp.write(b'\n')
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	403 fp.write(currentconfig)
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	404
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	405
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	406 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	407 """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	408
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	409 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	410
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	411 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	412
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	413 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	414 called.
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	415 """
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	416
41413 bc843e251134 unshare: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41387 diff changeset	417 with repo.lock():
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	418 # 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	419 # 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	420 # 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	421 # fail
9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	422 destlock = copystore(ui, repo, repo.path)
41413 bc843e251134 unshare: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41387 diff changeset	423 with destlock or util.nullcontextmanager():
45496 b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	424 if requirements.SHARESAFE_REQUIREMENT in repo.requirements:
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	425 # we were sharing .hg/hgrc of the share source with the current
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	426 # repo. We need to copy that while unsharing otherwise it can
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	427 # disable hooks and other checks
b71858b42963 localrepo: load the share source .hg/hgrc also in share-safe mode (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45406 diff changeset	428 _prependsourcehgrc(repo)
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	429
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	430 sharefile = repo.vfs.join(b'sharedpath')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	431 util.rename(sharefile, sharefile + b'.old')
41413 bc843e251134 unshare: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41387 diff changeset	432
45406 034d94f8761b requirements: introduce constants for `shared` and `relshared` requirements Pulkit Goyal <7895pulkit@gmail.com> parents: 45392 diff changeset	433 repo.requirements.discard(requirements.SHARED_REQUIREMENT)
034d94f8761b requirements: introduce constants for `shared` and `relshared` requirements Pulkit Goyal <7895pulkit@gmail.com> parents: 45392 diff changeset	434 repo.requirements.discard(requirements.RELATIVE_SHARED_REQUIREMENT)
45106 a03c177a4679 scmutil: add writereporequirements() and route requires writing through it Pulkit Goyal <7895pulkit@gmail.com> parents: 44915 diff changeset	435 scmutil.writereporequirements(repo)
34878 9f7ecc5bbc28 share: move the implementation of 'unshare' to the 'hg' module Matt Harbison <matt_harbison@yahoo.com> parents: 34815 diff changeset	436
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	437 # 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	438 # 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	439 # 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	440 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	441
34879 7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	442 # 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	443 # removed from .hgsub
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	444 c = newrepo[b'.']
34879 7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	445 subs = c.substate
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	446 for s in sorted(subs):
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	447 c.sub(s).unshare()
7d51a7792f52 subrepo: implement 'unshare' for Mercurial subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 34878 diff changeset	448
39622 c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	449 localrepo.poisonrepository(repo)
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	450
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	451 return newrepo
c5e6c1ba1c79 hg: don't reuse repo instance after unshare() Gregory Szorc <gregory.szorc@gmail.com> parents: 39571 diff changeset	452
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	453
39854 d3d4b4b5f725 localrepo: support writing shared file (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39853 diff changeset	454 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	455 """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	456
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	457 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	458 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	459
bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	460 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	461 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	462 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 default = defaultpath or sourcerepo.ui.config(b'paths', b'default')
27354 bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	464 if default:
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43089 diff changeset	465 template = b'[paths]\ndefault = %s\n'
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	466 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default))
45392 77b8588dd84e requirements: introduce new requirements related module Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	467 if requirements.NARROW_REQUIREMENT in sourcerepo.requirements:
50230 99faa396e186 narrow: write the narrow spec in a transaction during share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50228 diff changeset	468 with destrepo.wlock(), destrepo.lock(), destrepo.transaction(
99faa396e186 narrow: write the narrow spec in a transaction during share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50228 diff changeset	469 b"narrow-share"
99faa396e186 narrow: write the narrow spec in a transaction during share Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50228 diff changeset	470 ):
41229 50ca531f1f24 narrow: copy store narrowspec to working copy immediately Martin von Zweigbergk <martinvonz@google.com> parents: 41046 diff changeset	471 narrowspec.copytoworkingcopy(destrepo)
27354 bced7180db19 hg: establish function for performing post-share actions Gregory Szorc <gregory.szorc@gmail.com> parents: 27344 diff changeset	472
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	473
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	474 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	475 """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	476
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	477 ``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	478 """
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	479 if not update:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	480 return
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	481
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	482 repo.ui.status(_(b"updating working directory\n"))
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	483 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	484 checkout = update
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	485 for test in (checkout, b'default', b'tip'):
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	486 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	487 continue
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	488 try:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	489 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	490 break
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	491 except error.RepoLookupError:
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	492 continue
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	493 _update(repo, uprev)
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	494
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	495
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	496 def copystore(ui, srcrepo, destpath):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	497 """copy files from store of srcrepo in destpath
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	498
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	499 returns destlock
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	500 """
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	501 destlock = None
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	502 try:
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	503 hardlink = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	504 topic = _(b'linking') if hardlink else _(b'copying')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 with ui.makeprogress(topic, unit=_(b'files')) as progress:
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	506 num = 0
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	507 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	508 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	509 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	510 for f in srcrepo.store.copylist():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	511 if srcpublishing and f.endswith(b'phaseroots'):
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	512 continue
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	513 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	514 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	515 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	516 if srcvfs.exists(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	517 if f.endswith(b'data'):
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	518 # 'dstbase' may be empty (e.g. revlog format 0)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	519 lockfile = os.path.join(dstbase, b"lock")
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	520 # 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	521 destlock = lock.lock(dstvfs, lockfile)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	522 hardlink, n = util.copyfiles(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	523 srcvfs.join(f), dstvfs.join(f), hardlink, progress
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	524 )
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	525 num += n
ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	526 if hardlink:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	527 ui.debug(b"linked %d files\n" % num)
39415 ddfd80029306 hg: ensure the progress bar is completed when copying the store Matt Harbison <matt_harbison@yahoo.com> parents: 39219 diff changeset	528 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 ui.debug(b"copied %d files\n" % num)
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	530 return destlock
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	531 except: # re-raises
15078 193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	532 release(destlock)
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	533 raise
193e7018dc8c hg: extract copying the store out of clone Simon Heimberg <simohe@besonet.ch> parents: 14952 diff changeset	534
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	535
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	536 def clonewithshare(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	537 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	538 peeropts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	539 sharepath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	540 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	541 srcpeer,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	542 dest,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	543 pull=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	544 rev=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	545 update=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	546 stream=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	547 ):
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	548 """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	549
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	550 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	551 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	552 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	553 True.
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	554 """
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	555 revs = None
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	556 if rev:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	557 if not srcpeer.capable(b'lookup'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	558 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	559 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	560 b"src repository does not support "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	561 b"revision lookup and so doesn't "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	562 b"support clone by revision"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	563 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	564 )
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	565
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	566 # TODO this is batchable.
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	567 remoterevs = []
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	568 for r in rev:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	569 with srcpeer.commandexecutor() as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	570 remoterevs.append(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	571 e.callcommand(
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	572 b'lookup',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	573 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	574 b'key': r,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	575 },
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	576 ).result()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	577 )
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	578 revs = remoterevs
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	579
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	580 # 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	581 # 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	582 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	583 # 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	584 try:
d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	585 util.makedir(pooldir, False)
49313 53e9422a9b45 py3: catch FileExistsError instead of checking errno == EEXIST Manuel Jacob <me@manueljacob.de> parents: 49309 diff changeset	586 except FileExistsError:
53e9422a9b45 py3: catch FileExistsError instead of checking errno == EEXIST Manuel Jacob <me@manueljacob.de> parents: 49309 diff changeset	587 pass
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	588
31228 4cc3797aa59c vfs: use 'vfs' module directly in 'mercurial.hg' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31178 diff changeset	589 poolvfs = vfsmod.vfs(pooldir)
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	590 basename = os.path.basename(sharepath)
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	591
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	592 with lock.lock(poolvfs, b'%s.lock' % basename):
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	593 if os.path.exists(sharepath):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	594 ui.status(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	595 _(b'(sharing from existing pooled repository %s)\n') % basename
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	596 )
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	597 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	598 ui.status(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	599 _(b'(sharing from new pooled repository %s)\n') % basename
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	600 )
28289 d493d64757eb hg: obtain lock when creating share from pooled repo (issue5104) Gregory Szorc <gregory.szorc@gmail.com> parents: 27637 diff changeset	601 # 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	602 # 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	603 # share mode.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	604 clone(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	605 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	606 peeropts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	607 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	608 dest=sharepath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	609 pull=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	610 revs=rev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	611 update=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	612 stream=stream,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	613 )
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	614
30041 1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	615 # 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	616 if islocal(source):
47626 1fdf315eff66 windows: use abspath in mercurial/hg.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47453 diff changeset	617 defaultpath = util.abspath(urlutil.urllocalpath(source))
30041 1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	618 else:
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	619 defaultpath = source
1779dde4c9ef hg: set default path correctly when doing a clone+share (issue5378) Gregory Szorc <gregory.szorc@gmail.com> parents: 29906 diff changeset	620
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	621 sharerepo = repository(ui, path=sharepath)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	622 destrepo = share(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	623 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	624 sharerepo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	625 dest=dest,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	626 update=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	627 bookmarks=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	628 defaultpath=defaultpath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	629 )
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	630
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	631 # 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	632 # 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	633 # 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	634 # 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	635 # 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	636 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	637
28632 a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	638 _postshareupdate(destrepo, update)
a2c2dd399f3b hg: perform update after pulling during clone with share (issue5103) Gregory Szorc <gregory.szorc@gmail.com> parents: 28289 diff changeset	639
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	640 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	641
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	642
46124 5b9bb4e9a3bf share: properly copy cache files when cloning from a share Joerg Sonnenberger <joerg@bec.de> parents: 46114 diff changeset	643 # Recomputing caches is often slow on big repos, so copy them.
32525 963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	644 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	645 """copy a cache from srcrepo to destcachedir (if it exists)"""
46124 5b9bb4e9a3bf share: properly copy cache files when cloning from a share Joerg Sonnenberger <joerg@bec.de> parents: 46114 diff changeset	646 srcfname = srcrepo.cachevfs.join(fname)
5b9bb4e9a3bf share: properly copy cache files when cloning from a share Joerg Sonnenberger <joerg@bec.de> parents: 46114 diff changeset	647 dstfname = os.path.join(dstcachedir, fname)
5b9bb4e9a3bf share: properly copy cache files when cloning from a share Joerg Sonnenberger <joerg@bec.de> parents: 46114 diff changeset	648 if os.path.exists(srcfname):
32525 963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	649 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	650 os.mkdir(dstcachedir)
46124 5b9bb4e9a3bf share: properly copy cache files when cloning from a share Joerg Sonnenberger <joerg@bec.de> parents: 46114 diff changeset	651 util.copyfile(srcfname, dstfname)
32525 963de566de2f local-clone: extract the closure copying caches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32418 diff changeset	652
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	653
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	654 def clone(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	655 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	656 peeropts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	657 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	658 dest=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	659 pull=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	660 revs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	661 update=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	662 stream=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	663 branch=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	664 shareopts=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	665 storeincludepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	666 storeexcludepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	667 depth=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	668 ):
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	669 """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	670
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	671 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	672 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	673 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	674 newly created destination.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	675
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	676 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	677 .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	678 pushes.
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	679
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	680 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	681 repository will be deleted.
2600 c4325f0a9b91 clean up trailing white space. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2597 diff changeset	682
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	683 Arguments:
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	684
532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	685 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	686
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	687 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	688 name of source repository)
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	689
23545 68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	690 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	691 server prefers streaming
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	692
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	693 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	694 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	695
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	696 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	697
5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	698 update: update working directory after clone completes, if
6526 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6525 diff changeset	699 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	700 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	701
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	702 branch: branches to clone
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	703
0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	704 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	705 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	706 "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	707 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	708 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	709 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	710
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	711 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	712 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	713 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	714 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	715 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	716 ``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	717 """
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4477 diff changeset	718
32988 11c0bb4ccc76 py3: replace str with bytes in isinstance() Pulkit Goyal <7895pulkit@gmail.com> parents: 32528 diff changeset	719 if isinstance(source, bytes):
49857 0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	720 src_path = urlutil.get_clone_path_obj(ui, source)
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	721 if src_path is None:
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	722 srcpeer = peer(ui, peeropts, b'')
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	723 origsource = source = b''
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	724 branches = (None, branch or [])
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	725 else:
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	726 srcpeer = peer(ui, peeropts, src_path)
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	727 origsource = src_path.rawloc
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	728 branches = (src_path.branch, branch or [])
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	729 source = src_path.loc
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	730 else:
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	731 if hasattr(source, 'peer'):
49859 8a38cd76588f clone: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49858 diff changeset	732 srcpeer = source.peer() # in case we were called with a localrepo
8a38cd76588f clone: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49858 diff changeset	733 else:
8a38cd76588f clone: explicitly detect the need to fetch a peer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49858 diff changeset	734 srcpeer = source
37263 3809eafedf2c parseurl: consistently call second output "branches" Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	735 branches = (None, branch or [])
49857 0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	736 # XXX path: simply use the peer `path` object when this become available
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	737 origsource = source = srcpeer.url()
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	738 srclock = destlock = destwlock = cleandir = None
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	739 destpeer = None
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	740 try:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	741 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	742
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	743 if dest is None:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	744 dest = defaultdest(source)
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	745 if dest:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	746 ui.status(_(b"destination directory: %s\n") % dest)
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	747 else:
49857 0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	748 dest_path = urlutil.get_clone_path_obj(ui, dest)
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	749 if dest_path is not None:
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	750 dest = dest_path.rawloc
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	751 else:
0d7ecac8b6f7 path: pass `path` to `peer` in `hg clone` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49856 diff changeset	752 dest = b''
2719 532809ba1db5 hg.py: add islocal() and defaultdest() functions, refactor Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2631 diff changeset	753
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	754 dest = urlutil.urllocalpath(dest)
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	755 source = urlutil.urllocalpath(source)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	756
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	757 if not dest:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	758 raise error.InputError(_(b"empty destination path is not valid"))
21803 62cc4055c6c8 hg: use vfs functions in clone Chinmay Joshi <c@chinmayjoshi.com> parents: 21802 diff changeset	759
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	760 destvfs = vfsmod.vfs(dest, expandpath=True)
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	761 if destvfs.lexists():
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	762 if not destvfs.isdir():
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	763 raise error.InputError(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	764 _(b"destination '%s' already exists") % dest
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	765 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	766 elif destvfs.listdir():
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	767 raise error.InputError(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	768 _(b"destination '%s' is not empty") % dest
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	769 )
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	770
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	771 createopts = {}
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	772 narrow = False
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	773
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	774 if storeincludepats is not None:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	775 narrowspec.validatepatterns(storeincludepats)
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	776 narrow = True
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	777
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	778 if storeexcludepats is not None:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	779 narrowspec.validatepatterns(storeexcludepats)
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	780 narrow = True
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	781
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	782 if narrow:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	783 # Include everything by default if only exclusion patterns defined.
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	784 if storeexcludepats and not storeincludepats:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	785 storeincludepats = {b'path:.'}
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	786
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	787 createopts[b'narrowfiles'] = True
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	788
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	789 if depth:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	790 createopts[b'shallowfilestore'] = True
40390 7e3b6c4f01a2 localrepo: support marking repos as having shallow file storage Gregory Szorc <gregory.szorc@gmail.com> parents: 40366 diff changeset	791
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	792 if srcpeer.capable(b'lfs-serve'):
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	793 # Repository creation honors the config if it disabled the extension, so
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	794 # we can't just announce that lfs will be enabled. This check avoids
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	795 # saying that lfs will be enabled, and then saying it's an unknown
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	796 # feature. The lfs creation option is set in either case so that a
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	797 # requirement is added. If the extension is explicitly disabled but the
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	798 # requirement is set, the clone aborts early, before transferring any
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	799 # data.
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	800 createopts[b'lfs'] = True
40324 6637b079ae45 lfs: autoload the extension when cloning from repo with lfs enabled Matt Harbison <matt_harbison@yahoo.com> parents: 39854 diff changeset	801
49600 7d6c8943353a hg: show the correct message when cloning an LFS repo with extension disabled Matt Harbison <matt_harbison@yahoo.com> parents: 49313 diff changeset	802 if b'lfs' in extensions.disabled():
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	803 ui.status(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	804 _(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	805 b'(remote is using large file support (lfs), but it is '
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	806 b'explicitly disabled in the local configuration)\n'
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	807 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	808 )
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	809 else:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	810 ui.status(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	811 _(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	812 b'(remote is using large file support (lfs); lfs will '
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	813 b'be enabled for this repository)\n'
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	814 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	815 )
40324 6637b079ae45 lfs: autoload the extension when cloning from repo with lfs enabled Matt Harbison <matt_harbison@yahoo.com> parents: 39854 diff changeset	816
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	817 shareopts = shareopts or {}
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	818 sharepool = shareopts.get(b'pool')
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	819 sharenamemode = shareopts.get(b'mode')
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	820 if sharepool and islocal(dest):
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	821 sharepath = None
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	822 if sharenamemode == b'identity':
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	823 # Resolve the name from the initial changeset in the remote
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	824 # repository. This returns nullid when the remote is empty. It
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	825 # raises RepoLookupError if revision 0 is filtered or otherwise
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	826 # not available. If we fail to resolve, sharing is not enabled.
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	827 try:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	828 with srcpeer.commandexecutor() as e:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	829 rootnode = e.callcommand(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	830 b'lookup',
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	831 {
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	832 b'key': b'0',
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	833 },
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	834 ).result()
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	835
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	836 if rootnode != sha1nodeconstants.nullid:
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	837 sharepath = os.path.join(sharepool, hex(rootnode))
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	838 else:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	839 ui.status(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	840 _(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	841 b'(not using pooled storage: '
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	842 b'remote appears to be empty)\n'
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	843 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	844 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	845 except error.RepoLookupError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	846 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	847 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	848 b'(not using pooled storage: '
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	849 b'unable to resolve identity of remote)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	850 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	851 )
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	852 elif sharenamemode == b'remote':
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	853 sharepath = os.path.join(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	854 sharepool, hex(hashutil.sha1(source).digest())
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	855 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	856 else:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	857 raise error.Abort(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	858 _(b'unknown share naming mode: %s') % sharenamemode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	859 )
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	860
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	861 # TODO this is a somewhat arbitrary restriction.
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	862 if narrow:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	863 ui.status(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	864 _(b'(pooled storage not supported for narrow clones)\n')
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	865 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	866 sharepath = None
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	867
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	868 if sharepath:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	869 return clonewithshare(
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	870 ui,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	871 peeropts,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	872 sharepath,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	873 source,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	874 srcpeer,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	875 dest,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	876 pull=pull,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	877 rev=revs,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	878 update=update,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	879 stream=stream,
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	880 )
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	881
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	882 srcrepo = srcpeer.local()
25761 0d37b9b21467 hg: support for auto sharing stores when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 25660 diff changeset	883
14377 f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	884 abspath = origsource
f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	885 if islocal(origsource):
47626 1fdf315eff66 windows: use abspath in mercurial/hg.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47453 diff changeset	886 abspath = util.abspath(urlutil.urllocalpath(origsource))
14377 f90d5641c78b clone: make default path absolute for all local paths Brendan Cully <brendan@kublai.com> parents: 14213 diff changeset	887
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	888 if islocal(dest):
47422 1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	889 if os.path.exists(dest):
1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	890 # only clean up directories we create ourselves
1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	891 hgdir = os.path.realpath(os.path.join(dest, b".hg"))
1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	892 cleandir = hgdir
1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	893 else:
1c7f3d911d0f clone: cleanup the "cleanup dir" logic used during local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47310 diff changeset	894 cleandir = dest
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	895
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	896 copy = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	897 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	898 srcrepo
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	899 and srcrepo.cancopy()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	900 and islocal(dest)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	901 and not phases.hassecret(srcrepo)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	902 ):
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	903 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	904
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	905 # 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	906 if narrow:
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	907 copy = False
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	908
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	909 if copy:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	910 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	911 # 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	912 # 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	913 # 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	914 # fail
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	915 srclock = srcrepo.lock(wait=False)
7640 7197812e8d44 error: move lock errors Matt Mackall <mpm@selenic.com> parents: 7546 diff changeset	916 except error.LockError:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	917 copy = False
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	918
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	919 if copy:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	920 srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	921
47448 d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	922 destrootpath = urlutil.urllocalpath(dest)
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	923 dest_reqs = localrepo.clone_requirements(ui, createopts, srcrepo)
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	924 localrepo.createrepository(
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	925 ui,
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	926 destrootpath,
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	927 requirements=dest_reqs,
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	928 )
d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	929 destrepo = localrepo.makelocalrepository(ui, destrootpath)
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	930
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	931 destwlock = destrepo.wlock()
47453 377d8fc20e34 clone: reuse the stream clone logic for local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47448 diff changeset	932 destlock = destrepo.lock()
377d8fc20e34 clone: reuse the stream clone logic for local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47448 diff changeset	933 from . import streamclone # avoid cycle
47448 d1c1fd7ac46d clone: use "official" API to create local clone destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47422 diff changeset	934
47453 377d8fc20e34 clone: reuse the stream clone logic for local clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47448 diff changeset	935 streamclone.local_copy(srcrepo, destrepo)
17740 e6067bec18da branchcache: fetch source branchcache during clone (issue3378) Tomasz Kleczek <tomasz.kleczek@fb.com> parents: 17704 diff changeset	936
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	937 # 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	938 # 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	939 destpeer = peer(srcrepo, peeropts, dest)
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	940
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	941 # make the peer aware that is it already locked
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	942 #
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	943 # important:
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	944 #
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	945 # We still need to release that lock at the end of the function
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	946 destpeer.local()._lockref = weakref.ref(destlock)
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	947 destpeer.local()._wlockref = weakref.ref(destwlock)
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	948 # dirstate also needs to be copied because `_wlockref` has a reference
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	949 # to it: this dirstate is saved to disk when the wlock is released
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	950 destpeer.local().dirstate = destrepo.dirstate
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	951
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	952 srcrepo.hook(
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	953 b'outgoing', source=b'clone', node=srcrepo.nodeconstants.nullhex
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	954 )
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	955 else:
5569 9e209193f18d clone: fix race with same target directory (issue716) Matt Mackall <mpm@selenic.com> parents: 5277 diff changeset	956 try:
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	957 # only pass ui when no srcrepo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	958 destpeer = peer(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	959 srcrepo or ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	960 peeropts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	961 dest,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	962 create=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	963 createopts=createopts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	964 )
49313 53e9422a9b45 py3: catch FileExistsError instead of checking errno == EEXIST Manuel Jacob <me@manueljacob.de> parents: 49309 diff changeset	965 except FileExistsError:
53e9422a9b45 py3: catch FileExistsError instead of checking errno == EEXIST Manuel Jacob <me@manueljacob.de> parents: 49309 diff changeset	966 cleandir = None
53e9422a9b45 py3: catch FileExistsError instead of checking errno == EEXIST Manuel Jacob <me@manueljacob.de> parents: 49309 diff changeset	967 raise error.Abort(_(b"destination '%s' already exists") % dest)
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	968
37264 54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	969 if revs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	970 if not srcpeer.capable(b'lookup'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	971 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	972 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	973 b"src repository does not support "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	974 b"revision lookup and so doesn't "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	975 b"support clone by revision"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	976 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	977 )
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	978
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	979 # TODO this is batchable.
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	980 remoterevs = []
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	981 for rev in revs:
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	982 with srcpeer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	983 remoterevs.append(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	984 e.callcommand(
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	985 b'lookup',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	986 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	987 b'key': rev,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	988 },
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	989 ).result()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	990 )
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	991 revs = remoterevs
ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	992
8417 39cf453da958 clone: try updating to the actual changeset specified in options Brett Carter <brett@rdnzl.net> parents: 8312 diff changeset	993 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	994 else:
54435fd09f1d clone: rename "rev" to "revs" since there can be many Martin von Zweigbergk <martinvonz@google.com> parents: 37263 diff changeset	995 revs = None
27165 70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	996 local = destpeer.local()
70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	997 if local:
39571 cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	998 if narrow:
50228 6065a8936b00 narrow: write the narrow spec in a transaction during clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49927 diff changeset	999 with local.wlock(), local.lock(), local.transaction(
6065a8936b00 narrow: write the narrow spec in a transaction during clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49927 diff changeset	1000 b'narrow-clone'
6065a8936b00 narrow: write the narrow spec in a transaction during clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49927 diff changeset	1001 ):
39571 cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	1002 local.setnarrowpats(storeincludepats, storeexcludepats)
41236 44a51c1c8e17 narrow: move copytonarrowspec() out of setnarrowpats() Martin von Zweigbergk <martinvonz@google.com> parents: 41229 diff changeset	1003 narrowspec.copytoworkingcopy(local)
39571 cb675e95a2c2 hg: write narrow patterns after repo creation Gregory Szorc <gregory.szorc@gmail.com> parents: 39569 diff changeset	1004
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	1005 u = urlutil.url(abspath)
35565 bdae51a83dfb clonebundle: make it possible to retrieve the initial bundle through largefile Boris Feld <boris.feld@octobus.net> parents: 35442 diff changeset	1006 defaulturl = bytes(u)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1007 local.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
23545 68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	1008 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	1009 if pull:
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	1010 stream = False
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	1011 else:
68c434799559 hg.clone: set 'stream' depending on whether --pull was requested or not Siddharth Agarwal <sid0@fb.com> parents: 23139 diff changeset	1012 stream = None
27165 70884715725e localrepo: remove clone method by hoisting into hg.py Augie Fackler <augie@google.com> parents: 26781 diff changeset	1013 # internal config: ui.quietbookmarkmove
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1014 overrides = {(b'ui', b'quietbookmarkmove'): True}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1015 with local.ui.configoverride(overrides, b'clone'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1016 exchange.pull(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1017 local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1018 srcpeer,
48253 7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	1019 heads=revs,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1020 streamclonerequested=stream,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1021 includepats=storeincludepats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1022 excludepats=storeexcludepats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1023 depth=depth,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1024 )
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	1025 elif srcrepo:
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	1026 # 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	1027 # push.
65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	1028 if narrow:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1029 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1030 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1031 b'narrow clone not available for '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1032 b'remote destinations'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1033 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1034 )
39566 65b5900f30be hg: recognize include and exclude patterns when cloning Gregory Szorc <gregory.szorc@gmail.com> parents: 39565 diff changeset	1035
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1036 exchange.push(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1037 srcrepo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1038 destpeer,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1039 revs=revs,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1040 bookmarks=srcrepo._bookmarks.keys(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1041 )
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	1042 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1043 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1044 _(b"clone from remote to remote not supported")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1045 )
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	1046
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	1047 cleandir = None
2597 5ba8be56fa8f clone: move code into hg module. make doc better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2595 diff changeset	1048
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	1049 destrepo = destpeer.local()
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	1050 if destrepo:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1051 template = uimod.samplehgrcs[b'cloned']
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	1052 u = urlutil.url(abspath)
15552 62c9183a0bbb clone: don't save user's password in .hg/hgrc (Issue3122) Augie Fackler <durin42@gmail.com> parents: 15381 diff changeset	1053 u.passwd = None
33713 6294654453ee py3: use bytes IO to write sample hgrc Yuya Nishihara <yuya@tcha.org> parents: 33034 diff changeset	1054 defaulturl = bytes(u)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1055 destrepo.vfs.write(b'hgrc', util.tonativeeol(template % defaulturl))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1056 destrepo.ui.setconfig(b'paths', b'default', defaulturl, b'clone')
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8807 diff changeset	1057
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1058 if ui.configbool(b'experimental', b'remotenames'):
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35340 diff changeset	1059 logexchange.pullremotenames(destrepo, srcpeer)
35340 773a9a06047c clone: add support for storing remotenames while cloning Pulkit Goyal <7895pulkit@gmail.com> parents: 34957 diff changeset	1060
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	1061 if update:
6526 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6525 diff changeset	1062 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	1063 with srcpeer.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1064 checkout = e.callcommand(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1065 b'lookup',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1066 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1067 b'key': update,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1068 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1069 ).result()
37640 ce8828217369 hg: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37579 diff changeset	1070
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	1071 uprev = None
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1072 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	1073 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	1074 # 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	1075 # 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	1076 # 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	1077 # out a better solution.
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	1078 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	1079 uprev = checkout
38753 e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	1080 elif scmutil.isrevsymbol(destrepo, checkout):
e06a10d3b926 clone: process 'lookup' return as an arbitrary symbol Boris Feld <boris.feld@octobus.net> parents: 38386 diff changeset	1081 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	1082 else:
26354 c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	1083 if update is not True:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	1084 try:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	1085 uprev = destrepo.lookup(update)
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	1086 except error.RepoLookupError:
c1fb2cab6260 clone: check update rev for being True Sean Farley <sean@farley.io> parents: 26353 diff changeset	1087 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	1088 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	1089 try:
46198 72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1090 if destrepo._activebookmark:
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1091 uprev = destrepo.lookup(destrepo._activebookmark)
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1092 update = destrepo._activebookmark
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1093 else:
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1094 uprev = destrepo._bookmarks[b'@']
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1095 update = b'@'
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1096 bn = destrepo[uprev].branch()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1097 if bn == b'default':
46198 72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1098 status = _(b"updating to bookmark %s\n" % update)
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1099 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1100 status = (
46198 72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1101 _(b"updating to bookmark %s on branch %s\n")
72007a9ac064 clone: update to active bookmark, if set Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 46124 diff changeset	1102 ) % (update, 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	1103 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	1104 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1105 uprev = destrepo.branchtip(b'default')
17867 c9339efed653 clone: make sure to use "@" as bookmark and "default" as branch (issue3677) Thomas Arendsen Hein <thomas@intevation.de> parents: 17844 diff changeset	1106 except error.RepoLookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1107 uprev = destrepo.lookup(b'tip')
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1108 if not status:
36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1109 bn = destrepo[uprev].branch()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1110 status = _(b"updating to branch %s\n") % bn
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17875 diff changeset	1111 destrepo.ui.status(status)
14463 81f559d1b9b2 hg: remove underscores in clone function Martin Geisler <mg@aragost.com> parents: 14377 diff changeset	1112 _update(destrepo, uprev)
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17342 diff changeset	1113 if update in destrepo._bookmarks:
24945 e0b0fbd47491 bookmarks: rename setcurrent to activate (API) Ryan McElroy <rmcelroy@fb.com> parents: 24440 diff changeset	1114 bookmarks.activate(destrepo, update)
46314 95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1115 if destlock is not None:
95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1116 release(destlock)
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	1117 if destwlock is not None:
b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	1118 release(destlock)
46314 95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1119 # here is a tiny windows were someone could end up writing the
95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1120 # repository before the cache are sure to be warm. This is "fine"
95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1121 # as the only "bad" outcome would be some slowness. That potential
95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1122 # slowness already affect reader.
95a615dd77bf clone: make sure we warm the cache after a clone Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46198 diff changeset	1123 with destrepo.lock():
47310 7edaf91c7886 updatecaches: use the `caches` argument instead of a special `full` value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47244 diff changeset	1124 destrepo.updatecaches(caches=repositorymod.CACHES_POST_CLONE)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4853 diff changeset	1125 finally:
48343 b74ee41addee sparse: lock the store when updating requirements config Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48253 diff changeset	1126 release(srclock, destlock, destwlock)
18441 1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	1127 if cleandir is not None:
1f794204abbd hg: replace DirCleanup class with normal try/finally use Augie Fackler <raf@durin42.com> parents: 18382 diff changeset	1128 shutil.rmtree(cleandir, True)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	1129 if srcpeer is not None:
5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17159 diff changeset	1130 srcpeer.close()
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1131 if destpeer and destpeer.local() is None:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1132 destpeer.close()
19313 3b96d6e44a4d hg: move return statement after finally block simon@laptop-tosh parents: 18944 diff changeset	1133 return srcpeer, destpeer
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	1134
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1135
27402 5184089f5d30 hg: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27354 diff changeset	1136 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	1137 if quietempty and stats.isempty():
27402 5184089f5d30 hg: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27354 diff changeset	1138 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1139 repo.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1140 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1141 b"%d files updated, %d files merged, "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1142 b"%d files removed, %d files unresolved\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1143 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1144 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1145 stats.updatedcount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1146 stats.mergedcount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1147 stats.removedcount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1148 stats.unresolvedcount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1149 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1150 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1151
3316 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3195 diff changeset	1152
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1153 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	1154 """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	1155
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	1156 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	1157
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	1158 returns stats (see pydoc mercurial.merge.applyupdates)"""
45608 00402df57db7 updaterepo: add deprecation warning Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	1159 repo.ui.deprecwarn(
00402df57db7 updaterepo: add deprecation warning Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	1160 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()',
00402df57db7 updaterepo: add deprecation warning Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	1161 b'5.7',
00402df57db7 updaterepo: add deprecation warning Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	1162 )
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45562 diff changeset	1163 return mergemod._update(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1164 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1165 node,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1166 branchmerge=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1167 force=overwrite,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1168 labels=[b'working copy', b'destination'],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1169 updatecheck=updatecheck,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1170 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1171
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17887 diff changeset	1172
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1173 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	1174 """update the working directory to node"""
45580 5c8230ca37f2 merge: replace calls to hg.updaterepo() by merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	1175 stats = mergemod.update(repo[node], updatecheck=updatecheck)
27404 1cf3543cc780 update: add quietempty flag to _showstats timeless <timeless@mozdev.org> parents: 27403 diff changeset	1176 _showstats(repo, stats, quietempty)
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	1177 if stats.unresolvedcount:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1178 repo.ui.status(_(b"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	1179 return stats.unresolvedcount > 0
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	1180
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1181
7546 c7f48414f3ad add a comment about the need of hg._update() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7280 diff changeset	1182 # 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	1183 _update = update
c7f48414f3ad add a comment about the need of hg._update() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7280 diff changeset	1184
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1185
27403 50b6a04f817f histedit: omit useless message from abort timeless <timeless@mozdev.org> parents: 27402 diff changeset	1186 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	1187 """forcibly switch the working directory to node, clobbering changes"""
45562 03726f5b6092 merge: use merge.clean_update() when applicable Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	1188 stats = mergemod.clean_update(repo[node])
44240 abcc82bf0717 clean: check that there are no conflicts after Martin von Zweigbergk <martinvonz@google.com> parents: 44060 diff changeset	1189 assert stats.unresolvedcount == 0
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	1190 if show_stats:
27403 50b6a04f817f histedit: omit useless message from abort timeless <timeless@mozdev.org> parents: 27402 diff changeset	1191 _showstats(repo, stats, quietempty)
46774 af7535249ea9 hg: make `clean` return consistent with the `update` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46733 diff changeset	1192 return False
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: 2774 diff changeset	1193
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1194
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	1195 # 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	1196 _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	1197
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1198 _VALID_UPDATECHECKS = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1199 mergemod.UPDATECHECK_ABORT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1200 mergemod.UPDATECHECK_NONE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1201 mergemod.UPDATECHECK_LINEAR,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1202 mergemod.UPDATECHECK_NO_CONFLICT,
42973 ee1ef76d7339 hg: have `updatetotally` more thoroughly check updatecheck argument (API) Augie Fackler <augie@google.com> parents: 42972 diff changeset	1203 }
ee1ef76d7339 hg: have `updatetotally` more thoroughly check updatecheck argument (API) Augie Fackler <augie@google.com> parents: 42972 diff changeset	1204
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1205
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1206 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	1207 """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	1208
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1209 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	1210
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1211 :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	1212
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1213 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	1214
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1215 :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	1216 :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	1217 :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	1218 :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	1219
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1220 Valid values for updatecheck are the UPDATECHECK_* constants
1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1221 defined in the merge module. Passing `None` will result in using the
1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1222 configured default.
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1223
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1224 * ABORT: abort if the working directory is dirty
1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1225 * NONE: don't check (merge working directory changes into destination)
1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1226 * LINEAR: check that update is linear before merging working directory
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1227 changes into destination
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1228 * NO_CONFLICT: 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	1229
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1230 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	1231 """
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1232 if updatecheck is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1233 updatecheck = ui.config(b'commands', b'update.check')
42973 ee1ef76d7339 hg: have `updatetotally` more thoroughly check updatecheck argument (API) Augie Fackler <augie@google.com> parents: 42972 diff changeset	1234 if updatecheck not in _VALID_UPDATECHECKS:
31177 696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1235 # If not configured, or invalid value configured
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1236 updatecheck = mergemod.UPDATECHECK_LINEAR
42973 ee1ef76d7339 hg: have `updatetotally` more thoroughly check updatecheck argument (API) Augie Fackler <augie@google.com> parents: 42972 diff changeset	1237 if updatecheck not in _VALID_UPDATECHECKS:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1238 raise ValueError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1239 r'Invalid updatecheck value %r (can accept %r)'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1240 % (updatecheck, _VALID_UPDATECHECKS)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1241 )
28503 138ec8835e63 hg: acquire wlock while updating the working directory via updatetotally FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28501 diff changeset	1242 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	1243 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	1244 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	1245 if checkout is None:
30982 11c253997b0e destutil: drop now-unused "check" parameter from destupdate() Martin von Zweigbergk <martinvonz@google.com> parents: 30062 diff changeset	1246 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	1247 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	1248 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	1249
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1250 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	1251 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	1252 else:
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1253 if updatecheck == mergemod.UPDATECHECK_ABORT:
30983 7beb3ec34443 update: move check for dirty wdir into hg.updatetotally() Martin von Zweigbergk <martinvonz@google.com> parents: 30982 diff changeset	1254 cmdutil.bailifchanged(repo, merge=False)
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42823 diff changeset	1255 updatecheck = mergemod.UPDATECHECK_NONE
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31148 diff changeset	1256 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	1257
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1258 if not ret and movemarkfrom:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1259 if movemarkfrom == repo[b'.'].node():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1260 pass # no-op update
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1261 elif bookmarks.update(repo, [movemarkfrom], repo[b'.'].node()):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1262 b = ui.label(repo._activebookmark, b'bookmarks.active')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1263 ui.status(_(b"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	1264 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	1265 # this can happen with a non-linear update
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1266 b = ui.label(repo._activebookmark, b'bookmarks')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1267 ui.status(_(b"(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	1268 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	1269 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	1270 if brev != repo._activebookmark:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1271 b = ui.label(brev, b'bookmarks.active')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1272 ui.status(_(b"(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	1273 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	1274 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	1275 if repo._activebookmark:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1276 b = ui.label(repo._activebookmark, b'bookmarks')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1277 ui.status(_(b"(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	1278 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	1279
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1280 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	1281 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	1282
66513f6ca038 commands: centralize code to update with extra care for non-file components FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28324 diff changeset	1283 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	1284
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1285
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1286 def merge(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1287 ctx,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1288 force=False,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1289 remind=True,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45866 diff changeset	1290 labels=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1291 ):
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13047 diff changeset	1292 """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	1293 unresolved conflicts."""
44454 2f290136b7d6 merge: make hg.merge() take a context instead of a node Martin von Zweigbergk <martinvonz@google.com> parents: 44430 diff changeset	1294 repo = ctx.repo()
2f290136b7d6 merge: make hg.merge() take a context instead of a node Martin von Zweigbergk <martinvonz@google.com> parents: 44430 diff changeset	1295 stats = mergemod.merge(ctx, force=force, labels=labels)
3316 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3195 diff changeset	1296 _showstats(repo, stats)
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	1297 if stats.unresolvedcount:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1298 repo.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1299 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1300 b"use 'hg resolve' to retry unresolved file merges "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1301 b"or 'hg merge --abort' to abandon\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1302 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1303 )
42600 3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1304 elif remind:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1305 repo.ui.status(_(b"(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	1306 return stats.unresolvedcount > 0
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2778 diff changeset	1307
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1308
42604 209f2b8a50dc abort: removed labels argument from abortmerge() Taapas Agrawal <taapas2897@gmail.com> parents: 42600 diff changeset	1309 def abortmerge(ui, repo):
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44659 diff changeset	1310 ms = mergestatemod.mergestate.read(repo)
42600 3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1311 if ms.active():
3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1312 # there were conflicts
3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1313 node = ms.localctx.hex()
3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1314 else:
3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1315 # there were no conficts, mergestate was not stored
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1316 node = repo[b'.'].hex()
42600 3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1317
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43089 diff changeset	1318 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
44317 f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44253 diff changeset	1319 stats = mergemod.clean_update(repo[node])
44250 2b6632d64328 merge: check that there are no conflicts after --abort Martin von Zweigbergk <martinvonz@google.com> parents: 44240 diff changeset	1320 assert stats.unresolvedcount == 0
42600 3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1321 _showstats(repo, stats)
3bc400ccbf99 abort: added support for merge Taapas Agrawal <taapas2897@gmail.com> parents: 42197 diff changeset	1322
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1323
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1324 def _incoming(
46950 279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1325 displaychlist,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1326 subreporecurse,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1327 ui,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1328 repo,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1329 source,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1330 opts,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1331 buffered=False,
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1332 subpath=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1333 ):
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1334 """
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1335 Helper for incoming / gincoming.
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1336 displaychlist gets called with
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1337 (remoterepo, incomingchangesetlist, displayer) parameters,
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1338 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	1339 """
48252 607e9322fc89 path: return path instance directly from get_pull_paths Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48185 diff changeset	1340 srcs = urlutil.get_pull_paths(repo, ui, [source])
46932 dec31caf5fd6 incoming: use `urlutil.get_pull_paths` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46931 diff changeset	1341 srcs = list(srcs)
dec31caf5fd6 incoming: use `urlutil.get_pull_paths` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46931 diff changeset	1342 if len(srcs) != 1:
47005 27602e030a1f incoming: use bytes for an error message Matt Harbison <matt_harbison@yahoo.com> parents: 46953 diff changeset	1343 msg = _(b'for now, incoming supports only a single source, %d provided')
46932 dec31caf5fd6 incoming: use `urlutil.get_pull_paths` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46931 diff changeset	1344 msg %= len(srcs)
dec31caf5fd6 incoming: use `urlutil.get_pull_paths` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46931 diff changeset	1345 raise error.Abort(msg)
48252 607e9322fc89 path: return path instance directly from get_pull_paths Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48185 diff changeset	1346 path = srcs[0]
49830 e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1347 if subpath is None:
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1348 peer_path = path
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1349 url = path.loc
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1350 else:
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1351 # XXX path: we are losing the `path` object here. Keeping it would be
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1352 # valuable. For example as a "variant" as we do for pushes.
46950 279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1353 subpath = urlutil.url(subpath)
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1354 if subpath.isabs():
49830 e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1355 peer_path = url = bytes(subpath)
46950 279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1356 else:
49830 e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1357 p = urlutil.url(path.loc)
48352 f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1358 if p.islocal():
f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1359 normpath = os.path.normpath
f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1360 else:
f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1361 normpath = posixpath.normpath
f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1362 p.path = normpath(b'%s/%s' % (p.path, subpath))
49830 e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1363 peer_path = url = bytes(p)
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1364 other = peer(repo, opts, peer_path)
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1365 cleanupfn = other.close
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1366 try:
49830 e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1367 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(url))
e64b1e9f4892 path: pass `path` to `peer` in `hg incoming` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49819 diff changeset	1368 branches = (path.branch, opts.get(b'branch', []))
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1369 revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1370
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1371 if revs:
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1372 revs = [other.lookup(rev) for rev in revs]
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1373 other, chlist, cleanupfn = bundlerepo.getremotechanges(
48185 1d70fb83ff4a hg: let extensions call the func without populating opts keys Sushil khanchi <sushilkhanchi97@gmail.com> parents: 48128 diff changeset	1374 ui, repo, other, revs, opts.get(b"bundle"), opts.get(b"force")
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1375 )
a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46314 diff changeset	1376
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	1377 if not chlist:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1378 ui.status(_(b"no changes found\n"))
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	1379 return subreporecurse()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1380 ui.pager(b'incoming')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1381 displayer = logcmdutil.changesetdisplayer(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1382 ui, other, opts, buffered=buffered
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1383 )
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1384 displaychlist(other, chlist, displayer)
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1385 displayer.close()
33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1386 finally:
14161 8a0fca925992 bundlerepo: fix and improve getremotechanges Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14156 diff changeset	1387 cleanupfn()
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1388 subreporecurse()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1389 return 0 # exit code is zero since we found incoming changes
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1390
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1391
46950 279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1392 def incoming(ui, repo, source, opts, subpath=None):
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1393 def subreporecurse():
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1394 ret = 1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1395 if opts.get(b'subrepos'):
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1396 ctx = repo[None]
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1397 for subpath in sorted(ctx.substate):
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1398 sub = ctx.sub(subpath)
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1399 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	1400 return ret
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12314 diff changeset	1401
12730 33e1fd2aeb3c incoming: unify code for incoming and graphlog.incoming Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12729 diff changeset	1402 def display(other, chlist, displayer):
35928 c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API) Yuya Nishihara <yuya@tcha.org> parents: 35766 diff changeset	1403 limit = logcmdutil.getlimit(opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1404 if opts.get(b'newest_first'):
12729 55f0648c7e2d incoming: rename variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12400 diff changeset	1405 chlist.reverse()
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1406 count = 0
12729 55f0648c7e2d incoming: rename variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12400 diff changeset	1407 for n in chlist:
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1408 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	1409 break
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	1410 parents = [
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	1411 p for p in other.changelog.parents(n) if p != repo.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46953 diff changeset	1412 ]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1413 if opts.get(b'no_merges') and len(parents) == 2:
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1414 continue
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1415 count += 1
e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1416 displayer.show(other[n])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1417
46950 279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1418 return _incoming(
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1419 display, subreporecurse, ui, repo, source, opts, subpath=subpath
279df499511e incoming: kill the `repo._subtoppath =` hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46934 diff changeset	1420 )
12273 e392d00ab5b0 incoming: move code from commands to cmdutil Martin Geisler <mg@lazybytes.net> parents: 12271 diff changeset	1421
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1422
51700 42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1423 def _outgoing_filter(repo, revs, opts):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1424 """apply revision filtering/ordering option for outgoing"""
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1425 limit = logcmdutil.getlimit(opts)
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1426 no_merges = opts.get(b'no_merges')
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1427 if opts.get(b'newest_first'):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1428 revs.reverse()
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1429 if limit is None and not no_merges:
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1430 for r in revs:
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1431 yield r
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1432 return
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1433
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1434 count = 0
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1435 cl = repo.changelog
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1436 for n in revs:
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1437 if limit is not None and count >= limit:
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1438 break
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1439 parents = [p for p in cl.parents(n) if p != repo.nullid]
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1440 if no_merges and len(parents) == 2:
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1441 continue
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1442 count += 1
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1443 yield n
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1444
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1445
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1446 def _outgoing_recurse(ui, repo, dests, opts):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1447 ret = 1
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1448 if opts.get(b'subrepos'):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1449 ctx = repo[None]
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1450 for subpath in sorted(ctx.substate):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1451 sub = ctx.sub(subpath)
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1452 ret = min(ret, sub.outgoing(ui, dests, opts))
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1453 return ret
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1454
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1455
51701 c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1456 def display_outgoing_revs(ui, repo, o, opts):
51702 75123bc60b66 outgoing: move sorting in the display function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51701 diff changeset	1457 # make sure this is ordered by revision number
75123bc60b66 outgoing: move sorting in the display function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51701 diff changeset	1458 cl = repo.changelog
75123bc60b66 outgoing: move sorting in the display function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51701 diff changeset	1459 o.sort(key=cl.rev)
51701 c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1460 if opts.get(b'graph'):
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1461 revdag = logcmdutil.graphrevs(repo, o, opts)
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1462 ui.pager(b'outgoing')
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1463 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1464 logcmdutil.displaygraph(
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1465 ui, repo, revdag, displayer, graphmod.asciiedges
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1466 )
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1467 else:
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1468 ui.pager(b'outgoing')
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1469 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1470 for n in _outgoing_filter(repo, o, opts):
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1471 displayer.show(repo[n])
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1472 displayer.close()
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1473
c53b6498ed1a outgoing: extract changeset display in its own function Felipe Resende <felipe@fcresende.dev.br> parents: 51700 diff changeset	1474
51704 fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1475 _no_subtoppath = object()
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1476
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1477
51700 42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1478 def outgoing(ui, repo, dests, opts, subpath=None):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1479 if opts.get(b'graph'):
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1480 logcmdutil.checkunsupportedgraphflags([], opts)
42863c4ff80f subrepo: move code around Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51488 diff changeset	1481 ret = 1
46931 d4e4ccb75f99 outgoing: accept multiple destinations Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46930 diff changeset	1482 for path in urlutil.get_push_paths(repo, ui, dests):
49813 1470a533d28a path: directly use the push_variant in outgoing internals Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49806 diff changeset	1483 dest = path.loc
51704 fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1484 prev_subtopath = getattr(repo, "_subtoppath", _no_subtoppath)
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1485 try:
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1486 repo._subtoppath = dest
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1487 if subpath is not None:
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1488 subpath = urlutil.url(subpath)
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1489 if subpath.isabs():
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1490 dest = bytes(subpath)
48352 f98d4d0a299a subrepo: make -S work again on Windows for incoming/outgoing to remote repos Matt Harbison <matt_harbison@yahoo.com> parents: 48343 diff changeset	1491 else:
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1492 p = urlutil.url(dest)
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1493 if p.islocal():
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1494 normpath = os.path.normpath
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1495 else:
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1496 normpath = posixpath.normpath
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1497 p.path = normpath(b'%s/%s' % (p.path, subpath))
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1498 dest = bytes(p)
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1499 branches = path.branch, opts.get(b'branch') or []
46930 0afe96e374a7 outgoing: pass subrepo path using function argument instead of abssource hack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46915 diff changeset	1500
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1501 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1502 revs, checkout = addbranchrevs(
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1503 repo, repo, branches, opts.get(b'rev')
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1504 )
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1505 if revs:
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1506 revs = [
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1507 repo[rev].node() for rev in logcmdutil.revrange(repo, revs)
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1508 ]
51487 436aee94f2d7 Backed out changeset fc317bd5b637 Rapha?l Gom?s <rgomes@octobus.net> parents: 51485 diff changeset	1509
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1510 other = peer(repo, opts, dest)
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1511 try:
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1512 outgoing = discovery.findcommonoutgoing(
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1513 repo, other, revs, force=opts.get(b'force')
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1514 )
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1515 o = outgoing.missing
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1516 if not o:
653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1517 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
51704 fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1518 else:
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1519 ret = 0
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1520 display_outgoing_revs(ui, repo, o, opts)
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1521
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1522 cmdutil.outgoinghooks(ui, repo, other, opts, o)
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1523 ret = min(ret, _outgoing_recurse(ui, repo, dests, opts))
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1524 except: # re-raises
51704 fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1525 raise
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1526 finally:
51703 653b7a19f1de outgoing: pre-indent some code Felipe Resende <felipe@fcresende.dev.br> parents: 51702 diff changeset	1527 other.close()
51704 fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1528 finally:
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1529 if prev_subtopath is _no_subtoppath:
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1530 del repo._subtoppath
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1531 else:
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1532 repo._subtoppath = prev_subtopath
fb15ba66c702 subrepo: propagate non-default path on outgoing Felipe Resende <felipe@fcresende.dev.br> parents: 51703 diff changeset	1533 return ret
12735 8888e56ac417 outgoing: unify common graphlog.outgoing and hg.outgoing code Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12734 diff changeset	1534
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1535
42197 57539e5ea2e0 verify: introduce a notion of "level" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42109 diff changeset	1536 def verify(repo, level=None):
2778 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2775 diff changeset	1537 """verify the consistency of a repository"""
42197 57539e5ea2e0 verify: introduce a notion of "level" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42109 diff changeset	1538 ret = verifymod.verify(repo, level=level)
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1539
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1540 # 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	1541 # 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	1542 # concern.
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1543
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1544 # pathto() is needed for -R case
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1545 revs = repo.revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1546 b"filelog(%s)", util.pathto(repo.root, repo.getcwd(), b'.hgsubstate')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1547 )
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1548
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1549 if revs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1550 repo.ui.status(_(b'checking subrepo links\n'))
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1551 for rev in revs:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1552 ctx = repo[rev]
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1553 try:
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1554 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	1555 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1556 ret = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1557 ctx.sub(subpath, allowcreate=False).verify() or ret
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1558 )
29021 92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28655 diff changeset	1559 except error.RepoError as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1560 repo.ui.warn(b'%d: %s\n' % (rev, e))
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1561 except Exception:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1562 repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1563 _(b'.hgsubstate is corrupt in revision %s\n')
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	1564 % short(ctx.node())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1565 )
25591 f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1566
f1d46075b13a verify: check the subrepository references in .hgsubstate Matt Harbison <matt_harbison@yahoo.com> parents: 25365 diff changeset	1567 return ret
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1568
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1569
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1570 def remoteui(src, opts):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43238 diff changeset	1571 """build a remote ui from ui or repo and opts"""
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50934 diff changeset	1572 if hasattr(src, 'baseui'): # looks like a repository
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1573 dst = src.baseui.copy() # drop repo-specific config
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1574 src = src.ui # copy target options from repo
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1575 else: # assume it's a global ui object
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1576 dst = src.copy() # keep all global options
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1577
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1578 # copy ssh-specific options
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1579 for o in b'ssh', b'remotecmd':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1580 v = opts.get(o) or src.config(b'ui', o)
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1581 if v:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1582 dst.setconfig(b"ui", o, v, b'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1583
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1584 # copy bundle-specific options
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1585 r = src.config(b'bundle', b'mainreporoot')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1586 if r:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1587 dst.setconfig(b'bundle', b'mainreporoot', r, b'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1588
13192 4d03707916d3 https: use web.cacerts configuration from local repo to validate remote repo Mads Kiilerich <mads@kiilerich.com> parents: 12735 diff changeset	1589 # copy selected local settings to the remote ui
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1590 for sect in (b'auth', b'hostfingerprints', b'hostsecurity', b'http_proxy'):
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1591 for key, val in src.configitems(sect):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1592 dst.setconfig(sect, key, val, b'copied')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1593 v = src.config(b'web', b'cacerts')
29594 e417664a3339 ssl: remove special case of web.cacerts=! from remoteui() Yuya Nishihara <yuya@tcha.org> parents: 29424 diff changeset	1594 if v:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1595 dst.setconfig(b'web', b'cacerts', util.expandpath(v), b'copied')
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1596
d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11256 diff changeset	1597 return dst
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1598
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1599
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1600 # Files of interest
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1601 # 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	1602 # these files.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1603 foi = [
50934 1339158a8a40 cachedlocalrepo: use sysstr for attribute name of "file of interest" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50606 diff changeset	1604 ('spath', b'00changelog.i'),
1339158a8a40 cachedlocalrepo: use sysstr for attribute name of "file of interest" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50606 diff changeset	1605 ('spath', b'phaseroots'), # ! phase can change content at the same size
1339158a8a40 cachedlocalrepo: use sysstr for attribute name of "file of interest" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50606 diff changeset	1606 ('spath', b'obsstore'),
1339158a8a40 cachedlocalrepo: use sysstr for attribute name of "file of interest" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50606 diff changeset	1607 ('path', b'bookmarks'), # ! bookmark can change content at the same size
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1608 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42973 diff changeset	1609
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1610
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	1611 class cachedlocalrepo:
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1612 """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	1613
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1614 def __init__(self, repo):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1615 """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	1616
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1617 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	1618 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	1619 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	1620 """
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1621 assert isinstance(repo, localrepo.localrepository)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1622 self._repo = repo
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1623 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	1624 self._filtername = repo.filtername
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1625
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1626 def fetch(self):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1627 """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	1628
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1629 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	1630 automatically and returned.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1631
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1632 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	1633 repo instance was created.
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1634 """
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1635 # 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	1636 # 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	1637 # 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	1638 # 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	1639
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1640 state, mtime = self._repostate()
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1641 if state == self._state:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1642 return self._repo, False
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1643
28119 91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1644 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	1645 if self._filtername:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1646 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	1647 else:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1648 self._repo = repo.unfiltered()
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1649 self._state = state
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1650 self.mtime = mtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1651
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1652 return self._repo, True
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1653
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1654 def _repostate(self):
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1655 state = []
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1656 maxmtime = -1
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1657 for attr, fname in foi:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1658 prefix = getattr(self._repo, attr)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1659 p = os.path.join(prefix, fname)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1660 try:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1661 st = os.stat(p)
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1662 except OSError:
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1663 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	1664 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	1665 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	1666
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1667 return tuple(state), maxmtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1668
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1669 def copy(self):
26240 2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1670 """Obtain a copy of this class instance.
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1671
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1672 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	1673 completely independent of the original.
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1674 """
2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1675 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	1676 if self._filtername:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1677 repo = repo.filtered(self._filtername)
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1678 else:
91a827e760df hg: make cachedlocalrepo cache appropriate repoview object FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28020 diff changeset	1679 repo = repo.unfiltered()
26240 2b1434e5eaa0 hg: always create new localrepository instance Gregory Szorc <gregory.szorc@gmail.com> parents: 26219 diff changeset	1680 c = cachedlocalrepo(repo)
26219 ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1681 c._state = self._state
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1682 c.mtime = self.mtime
ae33fff17c1e hg: establish a cache for localrepository instances Gregory Szorc <gregory.szorc@gmail.com> parents: 26103 diff changeset	1683 return c

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hg.py @ 51704:fb15ba66c702 stable