Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3104:e6818b0b8154

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move set_exec to actions
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:59:59 -0500
parents 22336ad45cf2
children ef4e5d05bac4
comparison
equal deleted inserted replaced
3103:22336ad45cf2 3104:e6818b0b8154
161 161
162 # do we still need to look at mode bits? 162 # do we still need to look at mode bits?
163 if not queued and m1.execf(f) != m2.execf(f): 163 if not queued and m1.execf(f) != m2.execf(f):
164 if overwrite: 164 if overwrite:
165 repo.ui.debug(_(" updating permissions for %s\n") % f) 165 repo.ui.debug(_(" updating permissions for %s\n") % f)
166 util.set_exec(repo.wjoin(f), m2.execf(f)) 166 action.append((f, "e", m2.execf(f)))
167 else: 167 else:
168 if fmerge(f, m1, m2, ma) != m1.execf(f): 168 if fmerge(f, m1, m2, ma) != m1.execf(f):
169 repo.ui.debug(_(" updating permissions for %s\n") 169 repo.ui.debug(_(" updating permissions for %s\n")
170 % f) 170 % f)
171 util.set_exec(repo.wjoin(f), mode) 171 action.append((f, "e", m2.execf(f)))
172 del m2[f] 172 del m2[f]
173 elif f in ma: 173 elif f in ma:
174 if n != ma[f]: 174 if n != ma[f]:
175 r = _("d") 175 r = _("d")
176 if not overwrite: 176 if not overwrite:
261 repo.ui.note(_("getting %s\n") % f) 261 repo.ui.note(_("getting %s\n") % f)
262 t = repo.file(f).read(node) 262 t = repo.file(f).read(node)
263 repo.wwrite(f, t) 263 repo.wwrite(f, t)
264 util.set_exec(repo.wjoin(f), flag) 264 util.set_exec(repo.wjoin(f), flag)
265 updated += 1 265 updated += 1
266 elif m == "e": # exec
267 flag = a[2:]
268 util.set_exec(repo.wjoin(f), flag)
266 269
267 # update dirstate 270 # update dirstate
268 if not partial: 271 if not partial:
269 repo.dirstate.setparents(p1, p2) 272 repo.dirstate.setparents(p1, p2)
270 for a in action: 273 for a in action: