Show More
@@ -238,8 +238,6 b' class filectx(object):' | |||
|
238 | 238 | def filerev(self): return self._filerev |
|
239 | 239 | def filenode(self): return self._filenode |
|
240 | 240 | def flags(self): return self._changectx.flags(self._path) |
|
241 | def isexec(self): return 'x' in self.flags() | |
|
242 | def islink(self): return 'l' in self.flags() | |
|
243 | 241 | def filelog(self): return self._filelog |
|
244 | 242 | |
|
245 | 243 | def rev(self): |
@@ -132,7 +132,7 b' def filemerge(repo, mynode, orig, fcd, f' | |||
|
132 | 132 | ui = repo.ui |
|
133 | 133 | fd = fcd.path() |
|
134 | 134 | binary = isbin(fcd) or isbin(fco) or isbin(fca) |
|
135 |
symlink = fcd. |
|
|
135 | symlink = 'l' in fcd.flags() + fco.flags() | |
|
136 | 136 | tool, toolpath = _picktool(repo, ui, fd, binary, symlink) |
|
137 | 137 | ui.debug(_("picked tool '%s' for %s (binary %s symlink %s)\n") % |
|
138 | 138 | (tool, fd, binary, symlink)) |
@@ -180,9 +180,9 b' def filemerge(repo, mynode, orig, fcd, f' | |||
|
180 | 180 | env = dict(HG_FILE=fd, |
|
181 | 181 | HG_MY_NODE=short(mynode), |
|
182 | 182 | HG_OTHER_NODE=str(fco.changectx()), |
|
183 |
HG_MY_ISLINK=fcd. |
|
|
184 |
HG_OTHER_ISLINK=fco. |
|
|
185 |
HG_BASE_ISLINK=fca. |
|
|
183 | HG_MY_ISLINK='l' in fcd.flags(), | |
|
184 | HG_OTHER_ISLINK='l' in fco.flags(), | |
|
185 | HG_BASE_ISLINK='l' in fca.flags()) | |
|
186 | 186 | |
|
187 | 187 | if tool == "internal:merge": |
|
188 | 188 | r = simplemerge.simplemerge(a, b, c, label=['local', 'other']) |
General Comments 0
You need to be logged in to leave comments.
Login now