hgsubversion: hgsubversion/svnexternals.py annotate

annotate hgsubversion/svnexternals.py @ 1100:91cf81a36236

svnexternals: import pathutil.canonpath if available hgsubversion broke with upstream Mercurial due to f962870712da. This fixes that.

author	Siddharth Agarwal <sid0@fb.com>
date	Fri, 22 Nov 2013 11:09:59 -0800
parents	07234759a3f7
children	5490194e688e

rev	line source
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	1 import cStringIO
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	2
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	3 import os, re, shutil, stat, subprocess
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 175 diff changeset	4 from mercurial import util as hgutil
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	5 from mercurial.i18n import _
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	6
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	7 try:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	8 from mercurial import subrepo
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	9 # require svnsubrepo and hg >= 1.7.1
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	10 subrepo.svnsubrepo
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	11 hgutil.checknlink
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	12 except (ImportError, AttributeError), e:
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	13 subrepo = None
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	14
817 3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	15 passpegrev = True # see svnsubrepo below
803 6b1ad75f8cda svnexternals: fix canonpath import after hg.bfeaa88b875d Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 789 diff changeset	16 try:
819 e30ff6d5feff Fix import based feature detection Patrick Mezard <pmezard@gmail.com> parents: 817 diff changeset	17 canonpath = hgutil.canonpath
817 3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	18 except (ImportError, AttributeError):
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	19 passpegrev = False
1100 91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	20 try:
91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	21 from mercurial import scmutil
91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	22 canonpath = scmutil.canonpath
91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	23 except (ImportError, AttributeError):
91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	24 from mercurial import pathutil
91cf81a36236 svnexternals: import pathutil.canonpath if available Siddharth Agarwal <sid0@fb.com> parents: 882 diff changeset	25 canonpath = pathutil.canonpath
803 6b1ad75f8cda svnexternals: fix canonpath import after hg.bfeaa88b875d Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 789 diff changeset	26
387 f6050c4dde31 svnexternals: Change an absolute import to be relative. Augie Fackler <durin42@gmail.com> parents: 340 diff changeset	27 import util
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	28
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	29 class externalsfile(dict):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	30 """Map svn directories to lists of externals entries.
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	31 """
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	32 def __init__(self):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	33 super(externalsfile, self).__init__()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	34 self.encoding = 'utf-8'
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	35
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	36 def __setitem__(self, key, value):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	37 if value is None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	38 value = []
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	39 elif isinstance(value, basestring):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	40 value = value.splitlines()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	41 if key == '.':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	42 key = ''
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	43 if not value:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	44 if key in self:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	45 del self[key]
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	46 else:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	47 super(externalsfile, self).__setitem__(key, value)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	48
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	49 def write(self):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	50 fp = cStringIO.StringIO()
286 552deb1351ce Replace mercurial.util.sort with sorted buildin (after mercurial a1a5a57efe90) Martijn Pieters <mj@zopatista.com> parents: 250 diff changeset	51 for target in sorted(self):
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	52 lines = self[target]
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	53 if not lines:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	54 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	55 if not target:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	56 target = '.'
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	57 fp.write('[%s]\n' % target)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	58 for l in lines:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	59 l = ' ' + l + '\n'
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	60 fp.write(l)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	61 return fp.getvalue()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	62
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	63 def read(self, data):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	64 self.clear()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	65 fp = cStringIO.StringIO(data)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	66 target = None
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	67 for line in fp.readlines():
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	68 if not line.strip():
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	69 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	70 if line.startswith('['):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	71 line = line.strip()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	72 if line[-1] != ']':
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 175 diff changeset	73 raise hgutil.Abort('invalid externals section name: %s' % line)
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	74 target = line[1:-1]
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	75 if target == '.':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	76 target = ''
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	77 elif line.startswith(' '):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	78 line = line.rstrip('\n')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	79 if target is None or not line:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	80 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: diff changeset	81 self.setdefault(target, []).append(line[1:])
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	82
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	83 def diff(ext1, ext2):
759 864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	84 """Compare 2 externalsfile and return a list of tuples like (dir,
864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	85 value1, value2) where value1 is the external value in ext1 for dir
864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	86 or None, and value2 the same in ext2.
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	87 """
759 864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	88 changes = []
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	89 for d in ext1:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	90 if d not in ext2:
759 864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	91 changes.append((d, '\n'.join(ext1[d]), None))
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	92 elif ext1[d] != ext2[d]:
759 864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	93 changes.append((d, '\n'.join(ext1[d]), '\n'.join(ext2[d])))
175 2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	94 for d in ext2:
2412800b1258 Support svn:externals changes via .hgsvnexternals updates Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	95 if d not in ext1:
759 864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	96 changes.append((d, None, '\n'.join(ext2[d])))
864b5b67a5f0 svnexternals: keep diff() simple for the caller, return a list Patrick Mezard <pmezard@gmail.com> parents: 758 diff changeset	97 return changes
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	98
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	99 class BadDefinition(Exception):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	100 pass
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	101
850 d3bc067c0f72 Cope with non standard schemes in externals Will Wykeham <will@wykeham.net> parents: 819 diff changeset	102 re_defold = re.compile(r'^\s(.?)\s+(?:-r\s(\d+\|\{REV\})\s+)?([a-zA-Z+]+://.)\s*$')
d3bc067c0f72 Cope with non standard schemes in externals Will Wykeham <will@wykeham.net> parents: 819 diff changeset	103 re_defnew = re.compile(r'^\s(?:-r\s(\d+\|\{REV\})\s+)?((?:[a-zA-Z+]+://\|\^/).)\s+(\S+)\s$')
d3bc067c0f72 Cope with non standard schemes in externals Will Wykeham <will@wykeham.net> parents: 819 diff changeset	104 re_scheme = re.compile(r'^[a-zA-Z+]+://')
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	105
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	106 def parsedefinition(line):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	107 """Parse an external definition line, return a tuple (path, rev, source)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	108 or raise BadDefinition.
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	109 """
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	110 # The parsing is probably not correct wrt path with whitespaces or
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	111 # potential quotes. svn documentation is not really talkative about
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	112 # these either.
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	113 pegrev, revgroup = None, 1
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	114 m = re_defnew.search(line)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	115 if m:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	116 rev, source, path = m.group(1, 2, 3)
315 963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	117 if '@' in source:
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	118 source, pegrev = source.rsplit('@', 1)
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	119 else:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	120 m = re_defold.search(line)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	121 if not m:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	122 raise BadDefinition()
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	123 revgroup = 2
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	124 path, rev, source = m.group(1, 2, 3)
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	125 try:
836 0cbf9fd89672 svnexternals: comment on the purpose of int(rev) Augie Fackler <durin42@gmail.com> parents: 825 diff changeset	126 int(rev) # ensure revision is int()able, so we bail otherwise
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	127 norevline = line[:m.start(revgroup)] + '{REV}' + line[m.end(revgroup):]
979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	128 except (TypeError, ValueError):
979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	129 norevline = line
979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	130 return (path, rev, source, pegrev, norevline)
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	131
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	132 class RelativeSourceError(Exception):
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	133 pass
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	134
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	135 def resolvesource(ui, svnroot, source):
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	136 if re_scheme.search(source):
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	137 return source
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	138 if source.startswith('^/'):
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	139 if svnroot is None:
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	140 raise RelativeSourceError()
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	141 return svnroot + source[1:]
782 1f1aeb1f5ffc svnexternals: missing EOL in ui.warn() Patrick Mezard <pmezard@gmail.com> parents: 781 diff changeset	142 ui.warn(_('ignoring unsupported non-fully qualified external: %r\n'
1f1aeb1f5ffc svnexternals: missing EOL in ui.warn() Patrick Mezard <pmezard@gmail.com> parents: 781 diff changeset	143 % source))
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	144 return None
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	145
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	146 def parsedefinitions(ui, repo, svnroot, exts):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	147 """Return (targetdir, revision, source) tuples. Fail if nested
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	148 targetdirs are detected. source is an svn project URL.
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	149 """
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	150 defs = []
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	151 for base in sorted(exts):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	152 for line in exts[base]:
789 a5be5ca638de externals: ignore externals blank or comment lines Patrick Mezard <pmezard@gmail.com> parents: 784 diff changeset	153 if not line.strip() or line.lstrip().startswith('#'):
a5be5ca638de externals: ignore externals blank or comment lines Patrick Mezard <pmezard@gmail.com> parents: 784 diff changeset	154 # Ignore comments and blank lines
a5be5ca638de externals: ignore externals blank or comment lines Patrick Mezard <pmezard@gmail.com> parents: 784 diff changeset	155 continue
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	156 try:
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	157 path, rev, source, pegrev, norevline = parsedefinition(line)
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	158 except BadDefinition:
782 1f1aeb1f5ffc svnexternals: missing EOL in ui.warn() Patrick Mezard <pmezard@gmail.com> parents: 781 diff changeset	159 ui.warn(_('ignoring invalid external definition: %r\n' % line))
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	160 continue
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	161 source = resolvesource(ui, svnroot, source)
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	162 if source is None:
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	163 continue
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	164 wpath = hgutil.pconvert(os.path.join(base, path))
803 6b1ad75f8cda svnexternals: fix canonpath import after hg.bfeaa88b875d Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 789 diff changeset	165 wpath = canonpath(repo.root, '', wpath)
761 979148947967 svnexternals: generate externals with a revision placeholder Patrick Mezard <pmezard@gmail.com> parents: 759 diff changeset	166 defs.append((wpath, rev, source, pegrev, norevline, base))
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	167 # Check target dirs are not nested
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	168 defs.sort()
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	169 for i, d in enumerate(defs):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	170 for d2 in defs[i+1:]:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	171 if d2[0].startswith(d[0] + '/'):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	172 raise hgutil.Abort(_('external directories cannot nest:\n%s\n%s')
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	173 % (d[0], d2[0]))
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	174 return defs
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	175
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	176 def computeactions(ui, repo, svnroot, ext1, ext2):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	177
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	178 def listdefs(data):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	179 defs = {}
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	180 exts = externalsfile()
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	181 exts.read(data)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	182 for d in parsedefinitions(ui, repo, svnroot, exts):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	183 defs[d[0]] = d
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	184 return defs
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	185
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	186 ext1 = listdefs(ext1)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	187 ext2 = listdefs(ext2)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	188 for wp1 in ext1:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	189 if wp1 in ext2:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	190 yield 'u', ext2[wp1]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	191 else:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	192 yield 'd', ext1[wp1]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	193 for wp2 in ext2:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	194 if wp2 not in ext1:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	195 yield 'u', ext2[wp2]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	196
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	197 def getsvninfo(svnurl):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	198 """Return a tuple (url, root) for supplied svn URL or working
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	199 directory path.
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	200 """
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	201 # Yes, this is ugly, but good enough for now
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	202 args = ['svn', 'info', '--xml', svnurl]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	203 shell = os.name == 'nt'
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	204 p = subprocess.Popen(args, shell=shell,
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	205 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	206 stdout = p.communicate()[0]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	207 if p.returncode:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	208 raise hgutil.Abort(_('cannot get information about %s')
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	209 % svnurl)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	210 m = re.search(r'<root>(.*)</root>', stdout, re.S)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	211 if not m:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	212 raise hgutil.Abort(_('cannot find SVN repository root from %s')
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	213 % svnurl)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	214 root = m.group(1).rstrip('/')
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	215
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	216 m = re.search(r'<url>(.*)</url>', stdout, re.S)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	217 if not m:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	218 raise hgutil.Abort(_('cannot find SVN repository URL from %s') % svnurl)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	219 url = m.group(1)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	220
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	221 m = re.search(r'<entry[^>]+revision="([^"]+)"', stdout, re.S)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	222 if not m:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	223 raise hgutil.Abort(_('cannot find SVN revision from %s') % svnurl)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	224 rev = m.group(1)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	225 return url, root, rev
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	226
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	227 class externalsupdater:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	228 def __init__(self, ui, repo):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	229 self.repo = repo
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	230 self.ui = ui
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	231
315 963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	232 def update(self, wpath, rev, source, pegrev):
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	233 path = self.repo.wjoin(wpath)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	234 revspec = []
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	235 if rev:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	236 revspec = ['-r', rev]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	237 if os.path.isdir(path):
825 c3450512237d svnexternals.py: style cleanups Yonggang Luo <luoyonggang@gmail.com> parents: 819 diff changeset	238 exturl, _extroot, extrev = getsvninfo(path)
315 963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	239 # Comparing the source paths is not enough, but I don't
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	240 # know how to compare path+pegrev. The following update
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	241 # might fail if the path was replaced by another unrelated
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	242 # one. It can be fixed manually by deleting the externals
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	243 # and updating again.
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	244 if source == exturl:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	245 if extrev != rev:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	246 self.ui.status(_('updating external on %s@%s\n') %
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	247 (wpath, rev or 'HEAD'))
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	248 cwd = os.path.join(self.repo.root, path)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	249 self.svn(['update'] + revspec, cwd)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	250 return
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	251 self.delete(wpath)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	252 cwd, dest = os.path.split(path)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	253 cwd = os.path.join(self.repo.root, cwd)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	254 if not os.path.isdir(cwd):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	255 os.makedirs(cwd)
315 963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	256 if not pegrev and rev:
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	257 pegrev = rev
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	258 if pegrev:
963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	259 source = '%s@%s' % (source, pegrev)
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	260 self.ui.status(_('fetching external %s@%s\n') % (wpath, rev or 'HEAD'))
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	261 self.svn(['co'] + revspec + [source, dest], cwd)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	262
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	263 def delete(self, wpath):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	264 path = self.repo.wjoin(wpath)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	265 if os.path.isdir(path):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	266 self.ui.status(_('removing external %s\n') % wpath)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	267
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	268 def onerror(function, path, excinfo):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	269 if function is not os.remove:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	270 raise
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	271 # read-only files cannot be unlinked under Windows
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	272 s = os.stat(path)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	273 if (s.st_mode & stat.S_IWRITE) != 0:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	274 raise
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	275 os.chmod(path, stat.S_IMODE(s.st_mode) \| stat.S_IWRITE)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	276 os.remove(path)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	277
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	278 shutil.rmtree(path, onerror=onerror)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	279 return 1
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	280
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	281 def svn(self, args, cwd):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	282 args = ['svn'] + args
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	283 self.ui.debug(_('updating externals: %r, cwd=%s\n') % (args, cwd))
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	284 shell = os.name == 'nt'
470 6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	285 p = subprocess.Popen(args, cwd=cwd, shell=shell,
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	286 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	287 for line in p.stdout:
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	288 self.ui.note(line)
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	289 p.wait()
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	290 if p.returncode != 0:
6bfaa9deb432 svnexternals: display svn commands output with --verbose Patrick Mezard <pmezard@gmail.com> parents: 387 diff changeset	291 raise hgutil.Abort("subprocess '%s' failed" % ' '.join(args))
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	292
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	293 def updateexternals(ui, args, repo, **opts):
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	294 """update repository externals
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	295 """
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	296 if len(args) > 2:
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	297 raise hgutil.Abort(_('updateexternals expects at most one changeset'))
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	298 node = None
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	299 if len(args) == 2:
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	300 svnurl = util.normalize_url(repo.ui.expandpath(args[0]))
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	301 args = args[1:]
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	302 else:
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 315 diff changeset	303 svnurl = util.normalize_url(repo.ui.expandpath('default'))
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	304 if args:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	305 node = args[0]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	306
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	307 svnroot = getsvninfo(svnurl)[1]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	308
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	309 # Retrieve current externals status
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	310 try:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	311 oldext = file(repo.join('svn/externals'), 'rb').read()
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	312 except IOError:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	313 oldext = ''
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	314 newext = ''
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	315 ctx = repo[node]
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	316 if '.hgsvnexternals' in ctx:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	317 newext = ctx['.hgsvnexternals'].data()
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	318
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	319 updater = externalsupdater(ui, repo)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	320 actions = computeactions(ui, repo, svnroot, oldext, newext)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	321 for action, ext in actions:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	322 if action == 'u':
315 963d27a0b1c2 svnexternals: do not use peg revisions as --rev replacements Patrick Mezard <pmezard@gmail.com> parents: 291 diff changeset	323 updater.update(ext[0], ext[1], ext[2], ext[3])
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	324 elif action == 'd':
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	325 updater.delete(ext[0])
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	326 else:
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	327 raise hgutil.Abort(_('unknown update actions: %r') % action)
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	328
ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 286 diff changeset	329 file(repo.join('svn/externals'), 'wb').write(newext)
757 6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	330
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	331 def getchanges(ui, repo, parentctx, exts):
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	332 """Take a parent changectx and the new externals definitions as an
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	333 externalsfile and return a dictionary mapping the special file
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	334 hgsubversion needs for externals bookkeeping, to their new content
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	335 as raw bytes or None if the file has to be removed.
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	336 """
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	337 mode = ui.config('hgsubversion', 'externals', 'svnexternals')
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	338 if mode == 'svnexternals':
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	339 files = {
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	340 '.hgsvnexternals': None,
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	341 }
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	342 if exts:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	343 files['.hgsvnexternals'] = exts.write()
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	344 elif mode == 'subrepos':
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	345 # XXX: clobering the subrepos files is good enough for now
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	346 files = {
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	347 '.hgsub': None,
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	348 '.hgsubstate': None,
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	349 }
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	350 if exts:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	351 defs = parsedefinitions(ui, repo, '', exts)
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	352 hgsub, hgsubstate = [], []
825 c3450512237d svnexternals.py: style cleanups Yonggang Luo <luoyonggang@gmail.com> parents: 819 diff changeset	353 for path, rev, _source, _pegrev, norevline, base in sorted(defs):
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	354 hgsub.append('%s = [hgsubversion] %s:%s\n'
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	355 % (path, base, norevline))
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	356 if rev is None:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	357 rev = 'HEAD'
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	358 hgsubstate.append('%s %s\n' % (rev, path))
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	359 files['.hgsub'] = ''.join(hgsub)
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	360 files['.hgsubstate'] = ''.join(hgsubstate)
776 f025d00bfc4a svnexternals: add 'ignore' mode to avoid converting externals Patrick Mezard <pmezard@gmail.com> parents: 764 diff changeset	361 elif mode == 'ignore':
f025d00bfc4a svnexternals: add 'ignore' mode to avoid converting externals Patrick Mezard <pmezard@gmail.com> parents: 764 diff changeset	362 files = {}
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	363 else:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	364 raise hgutil.Abort(_('unknown externals modes: %s') % mode)
757 6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	365
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	366 # Should the really be updated?
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	367 updates = {}
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	368 for fn, data in files.iteritems():
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	369 if data is not None:
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	370 if fn not in parentctx or parentctx[fn].data() != data:
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	371 updates[fn] = data
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	372 else:
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	373 if fn in parentctx:
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	374 updates[fn] = None
6e18d9ab6557 pull: stop handling .hgsvnexternals explicitely in memctx Patrick Mezard <pmezard@gmail.com> parents: 470 diff changeset	375 return updates
758 76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	376
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	377 def parse(ui, ctx):
758 76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	378 """Return the externals definitions stored in ctx as a (possibly empty)
76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	379 externalsfile().
76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	380 """
76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	381 external = externalsfile()
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	382 mode = ui.config('hgsubversion', 'externals', 'svnexternals')
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	383 if mode == 'svnexternals':
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	384 if '.hgsvnexternals' in ctx:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	385 external.read(ctx['.hgsvnexternals'].data())
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	386 elif mode == 'subrepos':
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	387 for path in ctx.substate:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	388 src, rev = ctx.substate[path][:2]
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	389 base, norevline = src.split(':', 1)
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	390 base = base.strip()
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	391 if rev is None:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	392 rev = 'HEAD'
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	393 line = norevline.replace('{REV}', rev)
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	394 external.setdefault(base, []).append(line)
776 f025d00bfc4a svnexternals: add 'ignore' mode to avoid converting externals Patrick Mezard <pmezard@gmail.com> parents: 764 diff changeset	395 elif mode == 'ignore':
f025d00bfc4a svnexternals: add 'ignore' mode to avoid converting externals Patrick Mezard <pmezard@gmail.com> parents: 764 diff changeset	396 pass
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	397 else:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	398 raise hgutil.Abort(_('unknown externals modes: %s') % mode)
758 76ebfc41f490 svnexternals: hide .hgsvnexternals parsing in parse() Patrick Mezard <pmezard@gmail.com> parents: 757 diff changeset	399 return external
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	400
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	401 if subrepo:
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	402 class svnsubrepo(subrepo.svnsubrepo):
c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	403 def __init__(self, ctx, path, state):
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	404 state = (state[0].split(':', 1)[1], state[1])
762 c31a1f92e1c6 svnexternals: preliminary support for subrepos based externals Patrick Mezard <pmezard@gmail.com> parents: 761 diff changeset	405 super(svnsubrepo, self).__init__(ctx, path, state)
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	406
784 f214fb3f92cd svnexternals: handle new overwrite argument of subrepo.get() Patrick Mezard <pmezard@gmail.com> parents: 782 diff changeset	407 def get(self, state, args, *kwargs):
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	408 # Resolve source first
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	409 line = state[0].split(':', 1)[1]
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	410 source, pegrev = parsedefinition(line)[2:4]
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	411 try:
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	412 # Getting the root SVN repository URL is expensive.
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	413 # Assume the externals is absolute.
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	414 source = resolvesource(self._ui, None, source)
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	415 except RelativeSourceError:
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	416 svnurl = self._ctx._repo.ui.expandpath('default')
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	417 svnroot = getsvninfo(util.normalize_url(svnurl))[1]
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	418 source = resolvesource(self._ui, svnroot, source)
817 3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	419 # hg < 1.9 svnsubrepo calls "svn checkout" with --rev
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	420 # only, so peg revisions are correctly used. 1.9 and
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	421 # higher, append the rev as a peg revision to the source
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	422 # URL, so we cannot add our own. We assume that "-r10
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	423 # url@2" will be similar to "url@10" most of the time.
3b613d32ef11 svnexternals: fix subrepo peg revision handling (7ef125fa9b35) Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	424 if pegrev is not None and passpegrev:
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	425 source = source + '@' + pegrev
784 f214fb3f92cd svnexternals: handle new overwrite argument of subrepo.get() Patrick Mezard <pmezard@gmail.com> parents: 782 diff changeset	426 state = (source, state[1])
f214fb3f92cd svnexternals: handle new overwrite argument of subrepo.get() Patrick Mezard <pmezard@gmail.com> parents: 782 diff changeset	427 # hg-1.7.4-c19b9282d3a7 introduced the overwrite argument
f214fb3f92cd svnexternals: handle new overwrite argument of subrepo.get() Patrick Mezard <pmezard@gmail.com> parents: 782 diff changeset	428 return super(svnsubrepo, self).get(state, args, *kwargs)
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	429
778 184d25bc1c0b svnexternals: add ignoreupdate param to svnsubrepo.dirty() Patrick Mezard <pmezard@gmail.com> parents: 776 diff changeset	430 def dirty(self, ignoreupdate=False):
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	431 # You cannot compare anything with HEAD. Just accept it
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	432 # can be anything.
781 16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	433 if hasattr(self, '_wcrevs'):
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	434 wcrevs = self._wcrevs()
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	435 else:
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	436 wcrev = self._wcrev()
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	437 wcrevs = (wcrev, wcrev)
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	438 if (('HEAD' in wcrevs or self._state[1] == 'HEAD' or
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	439 self._state[1] in wcrevs or ignoreupdate)
16252bea2026 svnexternals: update subrepo after mercurial changes Patrick Mezard <pmezard@gmail.com> parents: 778 diff changeset	440 and not self._wcchanged()[0]):
763 6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	441 return False
6463b34bbcb6 svnexternals: support subrepos based externals checkout Patrick Mezard <pmezard@gmail.com> parents: 762 diff changeset	442 return True
764 bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	443
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	444 def commit(self, text, user, date):
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	445 rev = super(svnsubrepo, self).commit(text, user, date)
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	446 # Keep unversioned externals unversioned
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	447 if self._state[1] == 'HEAD':
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	448 rev = 'HEAD'
bc5c176b63eb svnexternals: support pushing subrepo based externals Patrick Mezard <pmezard@gmail.com> parents: 763 diff changeset	449 return rev
882 07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	450
07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	451 def basestate(self):
07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	452 # basestate() was introduced by bcb973abcc0b in 2.2
07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	453 if self._state[1] == 'HEAD':
07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	454 return 'HEAD'
07234759a3f7 svnexternals: fix handling of subrepo pinned to HEAD in hg 2.2 Patrick Mezard <patrick@mezard.eu> parents: 851 diff changeset	455 return super(svnsubrepo, self).basestate()

Mercurial > hgsubversion

annotate hgsubversion/svnexternals.py @ 1100:91cf81a36236