Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 6744:d3691d31fc9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: remove islink and isexec methods
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:52:16 -0500
parents 86e8187b721a
children f67d1468ac50
comparison
equal deleted inserted replaced
6743:86e8187b721a 6744:d3691d31fc9c
130 return None 130 return None
131 131
132 ui = repo.ui 132 ui = repo.ui
133 fd = fcd.path() 133 fd = fcd.path()
134 binary = isbin(fcd) or isbin(fco) or isbin(fca) 134 binary = isbin(fcd) or isbin(fco) or isbin(fca)
135 symlink = fcd.islink() or fco.islink() 135 symlink = 'l' in fcd.flags() + fco.flags()
136 tool, toolpath = _picktool(repo, ui, fd, binary, symlink) 136 tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
137 ui.debug(_("picked tool '%s' for %s (binary %s symlink %s)\n") % 137 ui.debug(_("picked tool '%s' for %s (binary %s symlink %s)\n") %
138 (tool, fd, binary, symlink)) 138 (tool, fd, binary, symlink))
139 139
140 if not tool: 140 if not tool:
178 util.copyfile(back, a) # restore from backup and try again 178 util.copyfile(back, a) # restore from backup and try again
179 179
180 env = dict(HG_FILE=fd, 180 env = dict(HG_FILE=fd,
181 HG_MY_NODE=short(mynode), 181 HG_MY_NODE=short(mynode),
182 HG_OTHER_NODE=str(fco.changectx()), 182 HG_OTHER_NODE=str(fco.changectx()),
183 HG_MY_ISLINK=fcd.islink(), 183 HG_MY_ISLINK='l' in fcd.flags(),
184 HG_OTHER_ISLINK=fco.islink(), 184 HG_OTHER_ISLINK='l' in fco.flags(),
185 HG_BASE_ISLINK=fca.islink()) 185 HG_BASE_ISLINK='l' in fca.flags())
186 186
187 if tool == "internal:merge": 187 if tool == "internal:merge":
188 r = simplemerge.simplemerge(a, b, c, label=['local', 'other']) 188 r = simplemerge.simplemerge(a, b, c, label=['local', 'other'])
189 else: 189 else:
190 args = _toolstr(ui, tool, "args", '$local $base $other') 190 args = _toolstr(ui, tool, "args", '$local $base $other')