Mercurial > hgsubversion

comparison hg_delta_editor.py @ 43:af7ac6c03452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a bug with added files from outside branches/trunk/tags.
author Augie Fackler <durin42@gmail.com>
date Mon, 27 Oct 2008 12:33:52 -0500
parents 496c0354019c
children 987e44afa71e
comparison
equal deleted inserted replaced
42:485ae93bc358 43:af7ac6c03452
508 if copyfrom_path: 508 if copyfrom_path:
509 self.ui.status('A+ %s\n' % path) 509 self.ui.status('A+ %s\n' % path)
510 # TODO(augie) handle this better, actually mark a copy 510 # TODO(augie) handle this better, actually mark a copy
511 (from_file, 511 (from_file,
512 from_branch) = self._path_and_branch_for_path(copyfrom_path) 512 from_branch) = self._path_and_branch_for_path(copyfrom_path)
513 if not from_file:
514 self.missing_plaintexts.add(path)
515 return
513 ha = self.get_parent_revision(copyfrom_revision + 1, 516 ha = self.get_parent_revision(copyfrom_revision + 1,
514 from_branch) 517 from_branch)
515 ctx = self.repo.changectx(ha) 518 ctx = self.repo.changectx(ha)
516 if from_file in ctx: 519 if from_file in ctx:
517 fctx = ctx.filectx(from_file) 520 fctx = ctx.filectx(from_file)