equal
deleted
inserted
replaced
885 |
885 |
886 # are we comparing working dir against its parent? |
886 # are we comparing working dir against its parent? |
887 if compareworking: |
887 if compareworking: |
888 if lookup: |
888 if lookup: |
889 # do a full compare of any files that might have changed |
889 # do a full compare of any files that might have changed |
890 mnode = self.changelog.read(self.dirstate.parents()[0])[0] |
890 ctx = self.changectx() |
891 getnode = lambda fn: (self.manifest.find(mnode, fn)[0] or |
|
892 nullid) |
|
893 for f in lookup: |
891 for f in lookup: |
894 if fcmp(f, getnode): |
892 if f not in ctx or ctx[f].cmp(self.wread(f)): |
895 modified.append(f) |
893 modified.append(f) |
896 else: |
894 else: |
897 if list_clean: |
895 if list_clean: |
898 clean.append(f) |
896 clean.append(f) |
899 if not wlock and not mywlock: |
897 if not wlock and not mywlock: |