equal
deleted
inserted
replaced
1125 |
1125 |
1126 fname = fctx.path() |
1126 fname = fctx.path() |
1127 text = fctx.data() |
1127 text = fctx.data() |
1128 flog = self.file(fname) |
1128 flog = self.file(fname) |
1129 fparent1 = manifest1.get(fname, nullid) |
1129 fparent1 = manifest1.get(fname, nullid) |
1130 fparent2 = fparent2o = manifest2.get(fname, nullid) |
1130 fparent2 = manifest2.get(fname, nullid) |
1131 |
1131 |
1132 meta = {} |
1132 meta = {} |
1133 copy = fctx.renamed() |
1133 copy = fctx.renamed() |
1134 if copy and copy[0] != fname: |
1134 if copy and copy[0] != fname: |
1135 # Mark the new revision of this file as a copy of another |
1135 # Mark the new revision of this file as a copy of another |
1191 |
1191 |
1192 # is the file changed? |
1192 # is the file changed? |
1193 if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
1193 if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
1194 changelist.append(fname) |
1194 changelist.append(fname) |
1195 return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
1195 return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
1196 |
|
1197 # are just the flags changed during merge? |
1196 # are just the flags changed during merge? |
1198 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
1197 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): |
1199 changelist.append(fname) |
1198 changelist.append(fname) |
1200 |
1199 |
1201 return fparent1 |
1200 return fparent1 |
1202 |
1201 |
1203 @unfilteredmethod |
1202 @unfilteredmethod |