Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 29237:ee935a6e1ea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 25 May 2016 15:32:35 -0500
parents ad1ce3c7af72 dae38633eba8
children 0d83ad967bf8
comparison
equal deleted inserted replaced
29236:1b7d907ec18a 29237:ee935a6e1ea2
1386 fparent2 = manifest2.get(fname, nullid) 1386 fparent2 = manifest2.get(fname, nullid)
1387 if isinstance(fctx, context.filectx): 1387 if isinstance(fctx, context.filectx):
1388 node = fctx.filenode() 1388 node = fctx.filenode()
1389 if node in [fparent1, fparent2]: 1389 if node in [fparent1, fparent2]:
1390 self.ui.debug('reusing %s filelog entry\n' % fname) 1390 self.ui.debug('reusing %s filelog entry\n' % fname)
1391 if manifest1.flags(fname) != fctx.flags():
1392 changelist.append(fname)
1391 return node 1393 return node
1392 1394
1393 flog = self.file(fname) 1395 flog = self.file(fname)
1394 meta = {} 1396 meta = {}
1395 copy = fctx.renamed() 1397 copy = fctx.renamed()