Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2846:35af2e56f15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestflags: eliminate remaining users of direct dict access
author Matt Mackall <mpm@selenic.com>
date Wed, 19 Jul 2006 19:11:50 -0500
parents e196aa1df169
children e78cad1f6b1f
comparison
equal deleted inserted replaced
2845:d0159c5f18bf 2846:35af2e56f15a
1790 elif f in umap or f in added: 1790 elif f in umap or f in added:
1791 # this unknown file is the same as the checkout 1791 # this unknown file is the same as the checkout
1792 # we need to reset the dirstate if the file was added 1792 # we need to reset the dirstate if the file was added
1793 get[f] = m2[f] 1793 get[f] = m2[f]
1794 1794
1795 if not s and mfw[f] != mf2[f]: 1795 if not s and mfw.execf(f) != mf2.execf(f):
1796 if force: 1796 if force:
1797 self.ui.debug(_(" updating permissions for %s\n") % f) 1797 self.ui.debug(_(" updating permissions for %s\n") % f)
1798 util.set_exec(self.wjoin(f), mf2.execf(f)) 1798 util.set_exec(self.wjoin(f), mf2.execf(f))
1799 else: 1799 else:
1800 a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f) 1800 a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f)