Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 10431:ba5e508b5e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: make calls to ui.progress()
author Augie Fackler <durin42@gmail.com>
date Sun, 07 Feb 2010 17:44:30 -0600
parents 08a0f04b56bd
children 0e64d814d7d0
comparison
equal deleted inserted replaced
10430:5cef810e588f 10431:ba5e508b5e92
253 moves = [] 253 moves = []
254 action.sort(key=actionkey) 254 action.sort(key=actionkey)
255 substate = wctx.substate # prime 255 substate = wctx.substate # prime
256 256
257 # prescan for merges 257 # prescan for merges
258 u = repo.ui
258 for a in action: 259 for a in action:
259 f, m = a[:2] 260 f, m = a[:2]
260 if m == 'm': # merge 261 if m == 'm': # merge
261 f2, fd, flags, move = a[2:] 262 f2, fd, flags, move = a[2:]
262 if f == '.hgsubstate': # merged internally 263 if f == '.hgsubstate': # merged internally
275 repo.ui.debug("removing %s\n" % f) 276 repo.ui.debug("removing %s\n" % f)
276 os.unlink(repo.wjoin(f)) 277 os.unlink(repo.wjoin(f))
277 278
278 audit_path = util.path_auditor(repo.root) 279 audit_path = util.path_auditor(repo.root)
279 280
280 for a in action: 281 numupdates = len(action)
282 for i, a in enumerate(action):
281 f, m = a[:2] 283 f, m = a[:2]
284 u.progress('update', i + 1, item=f, total=numupdates, unit='files')
282 if f and f[0] == "/": 285 if f and f[0] == "/":
283 continue 286 continue
284 if m == "r": # remove 287 if m == "r": # remove
285 repo.ui.note(_("removing %s\n") % f) 288 repo.ui.note(_("removing %s\n") % f)
286 audit_path(f) 289 audit_path(f)
336 for nf in fl: 339 for nf in fl:
337 repo.ui.warn(" %s\n" % nf) 340 repo.ui.warn(" %s\n" % nf)
338 elif m == "e": # exec 341 elif m == "e": # exec
339 flags = a[2] 342 flags = a[2]
340 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) 343 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
344 u.progress('update', None, total=numupdates, unit='files')
341 345
342 return updated, merged, removed, unresolved 346 return updated, merged, removed, unresolved
343 347
344 def recordupdates(repo, action, branchmerge): 348 def recordupdates(repo, action, branchmerge):
345 "record merge actions to the dirstate" 349 "record merge actions to the dirstate"