Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2848:e78cad1f6b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge manifest refactor work
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 15:03:46 -0500
parents 2a0c599f7bb0 35af2e56f15a
children 046a8b03ea59
comparison
equal deleted inserted replaced
2830:49988d9f0758 2848:e78cad1f6b1f
488 mfm = mf1.copy() 488 mfm = mf1.copy()
489 linkrev = self.changelog.count() 489 linkrev = self.changelog.count()
490 for f in files: 490 for f in files:
491 try: 491 try:
492 t = self.wread(f) 492 t = self.wread(f)
493 tm = util.is_exec(self.wjoin(f), mfm.get(f, False)) 493 mfm.set(f, util.is_exec(self.wjoin(f), mfm.execf(f)))
494 r = self.file(f) 494 r = self.file(f)
495 mfm[f] = tm
496 495
497 (entry, fp1, fp2) = self.checkfilemerge(f, t, r, m1, m2) 496 (entry, fp1, fp2) = self.checkfilemerge(f, t, r, m1, m2)
498 if entry: 497 if entry:
499 mm[f] = entry 498 mm[f] = entry
500 continue 499 continue
569 linkrev = self.changelog.count() 568 linkrev = self.changelog.count()
570 commit.sort() 569 commit.sort()
571 for f in commit: 570 for f in commit:
572 self.ui.note(f + "\n") 571 self.ui.note(f + "\n")
573 try: 572 try:
574 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False)) 573 mf1.set(f, util.is_exec(self.wjoin(f), mf1.execf(f)))
575 t = self.wread(f) 574 t = self.wread(f)
576 except IOError: 575 except IOError:
577 self.ui.warn(_("trouble committing %s!\n") % f) 576 self.ui.warn(_("trouble committing %s!\n") % f)
578 raise 577 raise
579 578
824 if self.dirstate.state(f) not in "r": 823 if self.dirstate.state(f) not in "r":
825 self.ui.warn("%s not removed!\n" % f) 824 self.ui.warn("%s not removed!\n" % f)
826 else: 825 else:
827 t = self.file(f).read(m[f]) 826 t = self.file(f).read(m[f])
828 self.wwrite(f, t) 827 self.wwrite(f, t)
829 util.set_exec(self.wjoin(f), mf[f]) 828 util.set_exec(self.wjoin(f), mf.execf(f))
830 self.dirstate.update([f], "n") 829 self.dirstate.update([f], "n")
831 830
832 def copy(self, source, dest, wlock=None): 831 def copy(self, source, dest, wlock=None):
833 p = self.wjoin(dest) 832 p = self.wjoin(dest)
834 if not os.path.exists(p): 833 if not os.path.exists(p):