Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6877:1d38f3605b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: set_flags shouldn't know about repo flag formats
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Aug 2008 21:55:06 -0500
parents 2d9328a2f81f
children 11229144aa01
comparison
equal deleted inserted replaced
6875:0d714a48ab53 6877:1d38f3605b20
235 else: 235 else:
236 if r is None: 236 if r is None:
237 updated += 1 237 updated += 1
238 else: 238 else:
239 merged += 1 239 merged += 1
240 util.set_flags(repo.wjoin(fd), flags) 240 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
241 if f != fd and move and util.lexists(repo.wjoin(f)): 241 if f != fd and move and util.lexists(repo.wjoin(f)):
242 repo.ui.debug(_("removing %s\n") % f) 242 repo.ui.debug(_("removing %s\n") % f)
243 os.unlink(repo.wjoin(f)) 243 os.unlink(repo.wjoin(f))
244 elif m == "g": # get 244 elif m == "g": # get
245 flags = a[2] 245 flags = a[2]
264 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) 264 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f)
265 for nf in fl: 265 for nf in fl:
266 repo.ui.warn(" %s\n" % nf) 266 repo.ui.warn(" %s\n" % nf)
267 elif m == "e": # exec 267 elif m == "e": # exec
268 flags = a[2] 268 flags = a[2]
269 util.set_flags(repo.wjoin(f), flags) 269 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
270 270
271 return updated, merged, removed, unresolved 271 return updated, merged, removed, unresolved
272 272
273 def recordupdates(repo, action, branchmerge): 273 def recordupdates(repo, action, branchmerge):
274 "record merge actions to the dirstate" 274 "record merge actions to the dirstate"