Mercurial > hg

comparison mercurial/context.py @ 6529:0c611355481b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 12 Apr 2008 21:34:01 +0200
parents fb502719c75c a7582980d654
children 76021ec849c8
comparison
equal deleted inserted replaced
6528:bd6bf5798f39 6529:0c611355481b
531 return '' 531 return ''
532 532
533 pnode = self._parents[0].changeset()[0] 533 pnode = self._parents[0].changeset()[0]
534 orig = self._repo.dirstate.copies().get(path, path) 534 orig = self._repo.dirstate.copies().get(path, path)
535 node, flag = self._repo.manifest.find(pnode, orig) 535 node, flag = self._repo.manifest.find(pnode, orig)
536 is_link = util.linkfunc(self._repo.root, lambda p: 'l' in flag) 536 is_link = util.linkfunc(self._repo.root,
537 is_exec = util.execfunc(self._repo.root, lambda p: 'x' in flag) 537 lambda p: flag and 'l' in flag)
538 is_exec = util.execfunc(self._repo.root,
539 lambda p: flag and 'x' in flag)
538 try: 540 try:
539 return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '') 541 return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
540 except OSError: 542 except OSError:
541 pass 543 pass
542 544