Show More
@@ -1232,11 +1232,15 b' class localrepository(object):' | |||||
1232 | """ |
|
1232 | """ | |
1233 |
|
1233 | |||
1234 | fname = fctx.path() |
|
1234 | fname = fctx.path() | |
1235 | text = fctx.data() |
|
|||
1236 | flog = self.file(fname) |
|
|||
1237 | fparent1 = manifest1.get(fname, nullid) |
|
1235 | fparent1 = manifest1.get(fname, nullid) | |
1238 | fparent2 = manifest2.get(fname, nullid) |
|
1236 | fparent2 = manifest2.get(fname, nullid) | |
|
1237 | if isinstance(fctx, context.filectx): | |||
|
1238 | node = fctx.filenode() | |||
|
1239 | if node in [fparent1, fparent2]: | |||
|
1240 | self.ui.debug('reusing %s filelog entry\n' % fname) | |||
|
1241 | return node | |||
1239 |
|
1242 | |||
|
1243 | flog = self.file(fname) | |||
1240 | meta = {} |
|
1244 | meta = {} | |
1241 | copy = fctx.renamed() |
|
1245 | copy = fctx.renamed() | |
1242 | if copy and copy[0] != fname: |
|
1246 | if copy and copy[0] != fname: | |
@@ -1298,6 +1302,7 b' class localrepository(object):' | |||||
1298 | fparent2 = nullid |
|
1302 | fparent2 = nullid | |
1299 |
|
1303 | |||
1300 | # is the file changed? |
|
1304 | # is the file changed? | |
|
1305 | text = fctx.data() | |||
1301 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
|
1306 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: | |
1302 | changelist.append(fname) |
|
1307 | changelist.append(fname) | |
1303 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
1308 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
General Comments 0
You need to be logged in to leave comments.
Login now