Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use repo.ui directly instead local variable
authorMartin Geisler <mg@aragost.com>
Wed, 17 Aug 2011 14:11:46 +0200
changeset 15041 3afe5edda4e3
parent 15039 c981f4a9ea74
child 15043 0bb0f807dfc3
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.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Thu Aug 11 22:40:43 2011 -0500
+++ b/mercurial/merge.py	Wed Aug 17 14:11:46 2011 +0200
@@ -273,7 +273,6 @@
     action.sort(key=actionkey)
 
     # prescan for merges
-    u = repo.ui
     for a in action:
         f, m = a[:2]
         if m == 'm': # merge
@@ -308,8 +307,8 @@
     numupdates = len(action)
     for i, a in enumerate(action):
         f, m = a[:2]
-        u.progress(_('updating'), i + 1, item=f, total=numupdates,
-                   unit=_('files'))
+        repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
+                         unit=_('files'))
         if f and f[0] == "/":
             continue
         if m == "r": # remove
@@ -377,7 +376,7 @@
             repo.wopener.audit(f)
             util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
     ms.commit()
-    u.progress(_('updating'), None, total=numupdates, unit=_('files'))
+    repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files'))
 
     return updated, merged, removed, unresolved
mercurial