Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 6743:86e8187b721a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:46:34 -0500
parents 65f1b97484be
children d3691d31fc9c
comparison
equal deleted inserted replaced
6742:2d54e7c1e69d 6743:86e8187b721a
144 _("[lo]"), _("l")) != _("l"): 144 _("[lo]"), _("l")) != _("l"):
145 tool = "internal:other" 145 tool = "internal:other"
146 if tool == "internal:local": 146 if tool == "internal:local":
147 return 0 147 return 0
148 if tool == "internal:other": 148 if tool == "internal:other":
149 repo.wwrite(fd, fco.data(), fco.fileflags()) 149 repo.wwrite(fd, fco.data(), fco.flags())
150 return 0 150 return 0
151 if tool == "internal:fail": 151 if tool == "internal:fail":
152 return 1 152 return 1
153 153
154 # do the actual merge 154 # do the actual merge