hgext/largefiles/lfcommands.py
changeset 41397 0bd56c291359
parent 41061 98681293c890
child 41400 4a409c19831f
equal deleted inserted replaced
41396:3461814417f3 41397:0bd56c291359
   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.parents()[0].manifest()
   291         mp1 = ctx.p1().manifest()
   292         mp2 = ctx.parents()[1].manifest()
   292         mp2 = ctx.p2().manifest()
   293         files |= (set(mp1) | set(mp2)) - set(mc)
   293         files |= (set(mp1) | set(mp2)) - set(mc)
   294         for f in mc:
   294         for f in mc:
   295             if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
   295             if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
   296                 files.add(f)
   296                 files.add(f)
   297     return files
   297     return files