equal
deleted
inserted
replaced
286 # Generate list of changed files |
286 # Generate list of changed files |
287 def _getchangedfiles(ctx, parents): |
287 def _getchangedfiles(ctx, parents): |
288 files = set(ctx.files()) |
288 files = set(ctx.files()) |
289 if node.nullid not in parents: |
289 if node.nullid not in parents: |
290 mc = ctx.manifest() |
290 mc = ctx.manifest() |
291 mp1 = ctx.p1().manifest() |
291 for pctx in ctx.parents(): |
292 mp2 = ctx.p2().manifest() |
292 for fn in pctx.manifest().diff(mc): |
293 files |= (set(mp1) | set(mp2)) - set(mc) |
293 files.add(fn) |
294 for f in mc: |
|
295 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): |
|
296 files.add(f) |
|
297 return files |
294 return files |
298 |
295 |
299 # Convert src parents to dst parents |
296 # Convert src parents to dst parents |
300 def _convertparents(ctx, revmap): |
297 def _convertparents(ctx, revmap): |
301 parents = [] |
298 parents = [] |