equal
deleted
inserted
replaced
262 else: |
262 else: |
263 data = self.repo.wread(f) |
263 data = self.repo.wread(f) |
264 if util.binary(data): |
264 if util.binary(data): |
265 continue |
265 continue |
266 if expand: |
266 if expand: |
|
267 parents = ctx.parents() |
267 if lookup: |
268 if lookup: |
268 ctx = self.linkctx(f, mf[f]) |
269 ctx = self.linkctx(f, mf[f]) |
|
270 elif self.restrict and len(parents) > 1: |
|
271 # merge commit |
|
272 # in case of conflict f is in modified state during |
|
273 # merge, even if f does not differ from f in parent |
|
274 for p in parents: |
|
275 if f in p and not p[f].cmp(ctx[f]): |
|
276 ctx = p[f].changectx() |
|
277 break |
269 data, found = self.substitute(data, f, ctx, re_kw.subn) |
278 data, found = self.substitute(data, f, ctx, re_kw.subn) |
270 elif self.restrict: |
279 elif self.restrict: |
271 found = re_kw.search(data) |
280 found = re_kw.search(data) |
272 else: |
281 else: |
273 data, found = _shrinktext(data, re_kw.subn) |
282 data, found = _shrinktext(data, re_kw.subn) |