equal
deleted
inserted
replaced
830 'b' file was not found and matched badmatch |
830 'b' file was not found and matched badmatch |
831 ''' |
831 ''' |
832 |
832 |
833 if node: |
833 if node: |
834 fdict = dict.fromkeys(files) |
834 fdict = dict.fromkeys(files) |
835 for fn in self.manifest.read(self.changelog.read(node)[0]): |
835 mdict = self.manifest.read(self.changelog.read(node)[0]) |
|
836 mfiles = mdict.keys() |
|
837 mfiles.sort() |
|
838 for fn in mfiles: |
836 for ffn in fdict: |
839 for ffn in fdict: |
837 # match if the file is the exact name or a directory |
840 # match if the file is the exact name or a directory |
838 if ffn == fn or fn.startswith("%s/" % ffn): |
841 if ffn == fn or fn.startswith("%s/" % ffn): |
839 del fdict[ffn] |
842 del fdict[ffn] |
840 break |
843 break |
841 if match(fn): |
844 if match(fn): |
842 yield 'm', fn |
845 yield 'm', fn |
843 for fn in fdict: |
846 ffiles = fdict.keys() |
|
847 ffiles.sort() |
|
848 for fn in ffiles: |
844 if badmatch and badmatch(fn): |
849 if badmatch and badmatch(fn): |
845 if match(fn): |
850 if match(fn): |
846 yield 'b', fn |
851 yield 'b', fn |
847 else: |
852 else: |
848 self.ui.warn(_('%s: No such file in rev %s\n') % ( |
853 self.ui.warn(_('%s: No such file in rev %s\n') % ( |