Navigation

Changeset 4697

Timestamp:

11/01/08 14:22:31 (2 months ago)

Author:

eblot

Message:

Fixes #3985. No more error when pretty branch name groups are not defined within the regular expression

Files:

r4024	r4697
131	131	self.clone = (int(base_rev), src_mo.group('branch'))
132	132	self.branchname = path_mo.group('branch')
133		self.prettyname = path_mo.group('branchname') or self.branchname
	133	mo_dict = path_mo.groupdict()
	134	self.prettyname = 'branchname' in mo_dict and mo_dict['branchname'] \
	135	or self.branchname
134	136	return True
135	137
…	…
154	156	raise BranchPathError, "'%s' != '%s'" % (br, branch)
155	157	self.branchname = branch
156		self.prettyname = mo.group('branchname') or self.branchname
	158	mo_dict = mo.groupdict()
	159	self.prettyname = 'branchname' in mo_dict and mo_dict['branchname'] \
	160	or self.branchname
157	161	return True
158	162
…	…
212	216	self.env.log.info("PREV: %s %s %s" % (prev_path, prev_rev, prev_chg))
213	217	self.clone = (int(prev_rev), prev_path)
214		self.name = path_mo.group('tag')
215		self.prettyname = path_mo.group('tagname') or self.name
	218	mo_dict = path_mo.groupdict()
	219	if 'tag' not in mo_dict:
	220	return False
	221	self.name = mo_dict['tag']
	222	self.prettyname = mo_dict.setdefault('tagname', self.name)
216	223	return True
217	224
…	…
429	436	mo = info and bcre.match(info['path'])
430	437	if mo:
431		if mo.group('branch'):
	438	mo_dict = mo.groupdict()
	439	if 'branch' in mo_dict and mo_dict['branch']:
432	440	chgset = BranchChangeset(self, vc)
433		~~elif mo.group('tag')~~:
	441	if 'tag' in mo_dict and mo_dict['tag']:
434	442	chgset = TagChangeset(self, vc)
435	443	if chgset and chgset.build(bcre):

r4024	r4697
266	266	def __init__(self):
267	267	"""Reads the configuration and run sanity checks"""
	268	self.env.log.debug('Revtree RE: %s' % self.branchre)
268	269	self.bcre = re.compile(self.branchre)
269	270	self.rt = RevtreeSystem(self.env)