equal
deleted
inserted
replaced
170 for lfile in unsure: |
170 for lfile in unsure: |
171 standin = lfutil.standin(lfile) |
171 standin = lfutil.standin(lfile) |
172 if standin not in ctx1: |
172 if standin not in ctx1: |
173 # from second parent |
173 # from second parent |
174 modified.append(lfile) |
174 modified.append(lfile) |
175 elif ctx1[standin].data().strip() \ |
175 elif lfutil.readasstandin(ctx1[standin]) \ |
176 != lfutil.hashfile(self.wjoin(lfile)): |
176 != lfutil.hashfile(self.wjoin(lfile)): |
177 modified.append(lfile) |
177 modified.append(lfile) |
178 else: |
178 else: |
179 if listclean: |
179 if listclean: |
180 clean.append(lfile) |
180 clean.append(lfile) |
186 |
186 |
187 for lfile in tocheck: |
187 for lfile in tocheck: |
188 standin = lfutil.standin(lfile) |
188 standin = lfutil.standin(lfile) |
189 if standin in ctx1: |
189 if standin in ctx1: |
190 abslfile = self.wjoin(lfile) |
190 abslfile = self.wjoin(lfile) |
191 if ((ctx1[standin].data().strip() != |
191 if ((lfutil.readasstandin(ctx1[standin]) != |
192 lfutil.hashfile(abslfile)) or |
192 lfutil.hashfile(abslfile)) or |
193 (checkexec and |
193 (checkexec and |
194 ('x' in ctx1.flags(standin)) != |
194 ('x' in ctx1.flags(standin)) != |
195 bool(lfutil.getexecutable(abslfile)))): |
195 bool(lfutil.getexecutable(abslfile)))): |
196 modified.append(lfile) |
196 modified.append(lfile) |