Mercurial > hgsubversion

comparison hgsubversion/svnmeta.py @ 545:ebd8fb1a05e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up trailing whitespace
author Augie Fackler <durin42@gmail.com>
date Sat, 06 Feb 2010 10:34:49 -0600
parents 8dc759dc9ca9
children 9e6499c415a9
comparison
equal deleted inserted replaced
544:809c673bdd30 545:ebd8fb1a05e4
391 391
392 If ctx is None, build one from supplied changeid 392 If ctx is None, build one from supplied changeid
393 """ 393 """
394 if ctx is None: 394 if ctx is None:
395 ctx = self.repo[changeid] 395 ctx = self.repo[changeid]
396 extra = ctx.extra()['convert_revision'] 396 extra = ctx.extra()['convert_revision']
397 branchpath, revnum = extra[40:].rsplit('@', 1) 397 branchpath, revnum = extra[40:].rsplit('@', 1)
398 branch = self.localname(self.normalize(branchpath)) 398 branch = self.localname(self.normalize(branchpath))
399 if self.layout == 'single': 399 if self.layout == 'single':
400 branchpath = '' 400 branchpath = ''
401 if branchpath and branchpath[0] == '/': 401 if branchpath and branchpath[0] == '/':
444 else: 444 else:
445 # Subbranch or subtag copy 445 # Subbranch or subtag copy
446 t_name = t_name[:-(len(file)+1)] 446 t_name = t_name[:-(len(file)+1)]
447 found = t_name in addedtags 447 found = t_name in addedtags
448 if found and src_rev > addedtags[t_name][1]: 448 if found and src_rev > addedtags[t_name][1]:
449 addedtags[t_name] = branch, src_rev 449 addedtags[t_name] = branch, src_rev
450 elif (paths[p].action == 'D' and p.endswith(t_name) 450 elif (paths[p].action == 'D' and p.endswith(t_name)
451 and t_name in self.tags): 451 and t_name in self.tags):
452 branch = self.get_source_rev(self.tags[t_name])[1] 452 branch = self.get_source_rev(self.tags[t_name])[1]
453 deletedtags[t_name] = branch, None 453 deletedtags[t_name] = branch, None
454 continue 454 continue
524 assert path == '.hgtags' 524 assert path == '.hgtags'
525 return context.memfilectx(path=path, 525 return context.memfilectx(path=path,
526 data=tagdata, 526 data=tagdata,
527 islink=False, 527 islink=False,
528 isexec=False, 528 isexec=False,
529 copied=False) 529 copied=False)
530 revnum, branch = self.get_source_rev(ctx=parentctx)[:2] 530 revnum, branch = self.get_source_rev(ctx=parentctx)[:2]
531 newparent = None 531 newparent = None
532 for child in parentctx.children(): 532 for child in parentctx.children():
533 if (self.get_source_rev(ctx=child)[1] == branch 533 if (self.get_source_rev(ctx=child)[1] == branch
534 and child.extra().get('close', False)): 534 and child.extra().get('close', False)):