Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 4229:24c22a3f2ef8
pass repo.root to util.pathto() in preparation for the next patch
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 16 Mar 2007 00:22:57 -0300 |
parents | 7e1c8a565a4f |
children | c93562fb12cc |
comparison
equal
deleted
inserted
replaced
4228:c52b7176af94 | 4229:24c22a3f2ef8 |
---|---|
361 elif stat.S_ISFIFO(st.st_mode): kind = _('fifo') | 361 elif stat.S_ISFIFO(st.st_mode): kind = _('fifo') |
362 elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link') | 362 elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link') |
363 elif stat.S_ISSOCK(st.st_mode): kind = _('socket') | 363 elif stat.S_ISSOCK(st.st_mode): kind = _('socket') |
364 elif stat.S_ISDIR(st.st_mode): kind = _('directory') | 364 elif stat.S_ISDIR(st.st_mode): kind = _('directory') |
365 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % ( | 365 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % ( |
366 util.pathto(self.getcwd(), f), | 366 util.pathto(self.root, self.getcwd(), f), |
367 kind)) | 367 kind)) |
368 return False | 368 return False |
369 | 369 |
370 def walk(self, files=None, match=util.always, badmatch=None): | 370 def walk(self, files=None, match=util.always, badmatch=None): |
371 # filter out the stat | 371 # filter out the stat |
464 found = True | 464 found = True |
465 break | 465 break |
466 if not found: | 466 if not found: |
467 if inst.errno != errno.ENOENT or not badmatch: | 467 if inst.errno != errno.ENOENT or not badmatch: |
468 self.ui.warn('%s: %s\n' % ( | 468 self.ui.warn('%s: %s\n' % ( |
469 util.pathto(self.getcwd(), ff), | 469 util.pathto(self.root, self.getcwd(), ff), |
470 inst.strerror)) | 470 inst.strerror)) |
471 elif badmatch and badmatch(ff) and imatch(nf): | 471 elif badmatch and badmatch(ff) and imatch(nf): |
472 yield 'b', ff, None | 472 yield 'b', ff, None |
473 continue | 473 continue |
474 if stat.S_ISDIR(st.st_mode): | 474 if stat.S_ISDIR(st.st_mode): |