tests: alias ui as uimod in test-revlog-ancestry/test-ui-verbosity

tests/test-revlog-ancestry.py

@@ -1,88 +1,88 b''
 from __future__ import absolute_import, print_function
 import os
 from mercurial import (
     hg,
     merge,
-    ui,
+    ui as uimod,
 )
 
-u = ui.ui()
+u = uimod.ui()
 
 repo = hg.repository(u, 'test1', create=1)
 os.chdir('test1')
 
 def commit(text, time):
     repo.commit(text=text, date="%d 0" % time)
 
 def addcommit(name, time):
     f = open(name, 'w')
     f.write('%s\n' % name)
     f.close()
     repo[None].add([name])
     commit(name, time)
 
 def update(rev):
     merge.update(repo, rev, False, True)
 
 def merge_(rev):
     merge.update(repo, rev, True, False)
 
 if __name__ == '__main__':
     addcommit("A", 0)
     addcommit("B", 1)
 
     update(0)
     addcommit("C", 2)
 
     merge_(1)
     commit("D", 3)
 
     update(2)
     addcommit("E", 4)
     addcommit("F", 5)
 
     update(3)
     addcommit("G", 6)
 
     merge_(5)
     commit("H", 7)
 
     update(5)
     addcommit("I", 8)
 
     # Ancestors
     print('Ancestors of 5')
     for r in repo.changelog.ancestors([5]):
         print(r, end=' ')
 
     print('\nAncestors of 6 and 5')
     for r in repo.changelog.ancestors([6, 5]):
         print(r, end=' ')
 
     print('\nAncestors of 5 and 4')
     for r in repo.changelog.ancestors([5, 4]):
         print(r, end=' ')
 
     print('\nAncestors of 7, stop at 6')
     for r in repo.changelog.ancestors([7], 6):
         print(r, end=' ')
 
     print('\nAncestors of 7, including revs')
     for r in repo.changelog.ancestors([7], inclusive=True):
         print(r, end=' ')
 
     print('\nAncestors of 7, 5 and 3, including revs')
     for r in repo.changelog.ancestors([7, 5, 3], inclusive=True):
         print(r, end=' ')
 
     # Descendants
     print('\n\nDescendants of 5')
     for r in repo.changelog.descendants([5]):
         print(r, end=' ')
 
     print('\nDescendants of 5 and 3')
     for r in repo.changelog.descendants([5, 3]):
         print(r, end=' ')
 
     print('\nDescendants of 5 and 4')
     print(*repo.changelog.descendants([5, 4]), sep=' ')

tests/test-ui-verbosity.py

@@ -1,49 +1,51 b''
 from __future__ import absolute_import, print_function
 
 import os
-from mercurial import ui
+from mercurial import (
+    ui as uimod,
+)
 
 hgrc = os.environ['HGRCPATH']
 f = open(hgrc)
 basehgrc = f.read()
 f.close()
 
 print('      hgrc settings    command line options      final result   ')
 print('    quiet verbo debug   quiet verbo debug      quiet verbo debug')
 
 for i in xrange(64):
     hgrc_quiet   = bool(i & 1<<0)
     hgrc_verbose = bool(i & 1<<1)
     hgrc_debug   = bool(i & 1<<2)
     cmd_quiet    = bool(i & 1<<3)
     cmd_verbose  = bool(i & 1<<4)
     cmd_debug    = bool(i & 1<<5)
 
     f = open(hgrc, 'w')
     f.write(basehgrc)
     f.write('\n[ui]\n')
     if hgrc_quiet:
         f.write('quiet = True\n')
     if hgrc_verbose:
         f.write('verbose = True\n')
     if hgrc_debug:
         f.write('debug = True\n')
     f.close()
 
-    u = ui.ui()
+    u = uimod.ui()
     if cmd_quiet or cmd_debug or cmd_verbose:
         u.setconfig('ui', 'quiet', str(bool(cmd_quiet)))
         u.setconfig('ui', 'verbose', str(bool(cmd_verbose)))
         u.setconfig('ui', 'debug', str(bool(cmd_debug)))
 
     check = ''
     if u.debugflag:
         if not u.verbose or u.quiet:
             check = ' *'
     elif u.verbose and u.quiet:
         check = ' +'
 
     print(('%2d  %5s %5s %5s   %5s %5s %5s  ->  %5s %5s %5s%s'
            % (i, hgrc_quiet, hgrc_verbose, hgrc_debug,
               cmd_quiet, cmd_verbose, cmd_debug,
               u.quiet, u.verbose, u.debugflag, check)))