Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 4232:0d51eb296fb9
Merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 16 Mar 2007 00:45:18 -0300 |
parents | 5ccbc0be6cdb 24c22a3f2ef8 |
children | b11a2fb59cf5 4a1504264261 |
comparison
equal
deleted
inserted
replaced
4224:2a8b6d78d7ee | 4232:0d51eb296fb9 |
---|---|
900 if badmatch and badmatch(fn): | 900 if badmatch and badmatch(fn): |
901 if match(fn): | 901 if match(fn): |
902 yield 'b', fn | 902 yield 'b', fn |
903 else: | 903 else: |
904 self.ui.warn(_('%s: No such file in rev %s\n') % ( | 904 self.ui.warn(_('%s: No such file in rev %s\n') % ( |
905 util.pathto(self.getcwd(), fn), short(node))) | 905 util.pathto(self.root, self.getcwd(), fn), short(node))) |
906 else: | 906 else: |
907 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch): | 907 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch): |
908 yield src, fn | 908 yield src, fn |
909 | 909 |
910 def status(self, node1=None, node2=None, files=[], match=util.always, | 910 def status(self, node1=None, node2=None, files=[], match=util.always, |