equal
deleted
inserted
replaced
443 > text = fctx.data() |
443 > text = fctx.data() |
444 > flog = self.file(fname) |
444 > flog = self.file(fname) |
445 > fparent1 = manifest1.get(fname, node.nullid) |
445 > fparent1 = manifest1.get(fname, node.nullid) |
446 > fparent2 = manifest2.get(fname, node.nullid) |
446 > fparent2 = manifest2.get(fname, node.nullid) |
447 > meta = {} |
447 > meta = {} |
448 > copy = fctx.renamed() |
448 > copy = fctx.copysource() |
449 > if copy and copy[0] != fname: |
449 > if copy and copy != fname: |
450 > raise error.Abort('copying is not supported') |
450 > raise error.Abort('copying is not supported') |
451 > if fparent2 != node.nullid: |
451 > if fparent2 != node.nullid: |
452 > changelist.append(fname) |
452 > changelist.append(fname) |
453 > return flog.add(text, meta, tr, linkrev, |
453 > return flog.add(text, meta, tr, linkrev, |
454 > fparent1, fparent2) |
454 > fparent1, fparent2) |