Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 15041:3afe5edda4e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use repo.ui directly instead local variable The non-standard 'u = repo.ui' shorthand was only used two times and there were many other full references to repo.ui.
author Martin Geisler <mg@aragost.com>
date Wed, 17 Aug 2011 14:11:46 +0200
parents 28e98a8b173d
children b0a88bda3381
comparison
equal deleted inserted replaced
15039:c981f4a9ea74 15041:3afe5edda4e3
271 ms.reset(wctx.p1().node()) 271 ms.reset(wctx.p1().node())
272 moves = [] 272 moves = []
273 action.sort(key=actionkey) 273 action.sort(key=actionkey)
274 274
275 # prescan for merges 275 # prescan for merges
276 u = repo.ui
277 for a in action: 276 for a in action:
278 f, m = a[:2] 277 f, m = a[:2]
279 if m == 'm': # merge 278 if m == 'm': # merge
280 f2, fd, flags, move = a[2:] 279 f2, fd, flags, move = a[2:]
281 if f == '.hgsubstate': # merged internally 280 if f == '.hgsubstate': # merged internally
306 os.unlink(repo.wjoin(f)) 305 os.unlink(repo.wjoin(f))
307 306
308 numupdates = len(action) 307 numupdates = len(action)
309 for i, a in enumerate(action): 308 for i, a in enumerate(action):
310 f, m = a[:2] 309 f, m = a[:2]
311 u.progress(_('updating'), i + 1, item=f, total=numupdates, 310 repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
312 unit=_('files')) 311 unit=_('files'))
313 if f and f[0] == "/": 312 if f and f[0] == "/":
314 continue 313 continue
315 if m == "r": # remove 314 if m == "r": # remove
316 repo.ui.note(_("removing %s\n") % f) 315 repo.ui.note(_("removing %s\n") % f)
317 audit(f) 316 audit(f)
375 elif m == "e": # exec 374 elif m == "e": # exec
376 flags = a[2] 375 flags = a[2]
377 repo.wopener.audit(f) 376 repo.wopener.audit(f)
378 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) 377 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
379 ms.commit() 378 ms.commit()
380 u.progress(_('updating'), None, total=numupdates, unit=_('files')) 379 repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files'))
381 380
382 return updated, merged, removed, unresolved 381 return updated, merged, removed, unresolved
383 382
384 def recordupdates(repo, action, branchmerge): 383 def recordupdates(repo, action, branchmerge):
385 "record merge actions to the dirstate" 384 "record merge actions to the dirstate"