##// END OF EJS Templates
keyword: use `update_file_p1` instead of `normallookup`...
marmoute -
r48536:b9086ec4 default
parent child Browse files
Show More
@@ -358,7 +358,7 b' class kwtemplater(object):'
358 if kwcmd:
358 if kwcmd:
359 self.repo.dirstate.set_clean(f)
359 self.repo.dirstate.set_clean(f)
360 elif self.postcommit:
360 elif self.postcommit:
361 self.repo.dirstate.normallookup(f)
361 self.repo.dirstate.update_file_p1(f, p1_tracked=True)
362
362
363 def shrink(self, fname, text):
363 def shrink(self, fname, text):
364 '''Returns text with all keyword substitutions removed.'''
364 '''Returns text with all keyword substitutions removed.'''
@@ -691,7 +691,7 b' def kw_amend(orig, ui, repo, old, extra,'
691 kwt = getattr(repo, '_keywordkwt', None)
691 kwt = getattr(repo, '_keywordkwt', None)
692 if kwt is None:
692 if kwt is None:
693 return orig(ui, repo, old, extra, pats, opts)
693 return orig(ui, repo, old, extra, pats, opts)
694 with repo.wlock():
694 with repo.wlock(), repo.dirstate.parentchange():
695 kwt.postcommit = True
695 kwt.postcommit = True
696 newid = orig(ui, repo, old, extra, pats, opts)
696 newid = orig(ui, repo, old, extra, pats, opts)
697 if newid != old.node():
697 if newid != old.node():
@@ -757,8 +757,9 b' def kw_dorecord(orig, ui, repo, commitfu'
757 if ctx != recctx:
757 if ctx != recctx:
758 modified, added = _preselect(wstatus, recctx.files())
758 modified, added = _preselect(wstatus, recctx.files())
759 kwt.restrict = False
759 kwt.restrict = False
760 kwt.overwrite(recctx, modified, False, True)
760 with repo.dirstate.parentchange():
761 kwt.overwrite(recctx, added, False, True, True)
761 kwt.overwrite(recctx, modified, False, True)
762 kwt.overwrite(recctx, added, False, True, True)
762 kwt.restrict = True
763 kwt.restrict = True
763 return ret
764 return ret
764
765
General Comments 0
You need to be logged in to leave comments. Login now