termwidth: move to ui.ui from util

hgext/churn.py

@@ -149,7 +149,7 b' def churn(ui, repo, *pats, **opts):'
     maxcount = float(max(sum(v) for k, v in rate)) or 1.0
     maxname = max(len(k) for k, v in rate)
 
-    ttywidth = util.termwidth()
+    ttywidth = ui.termwidth()
     ui.debug("assuming %i character terminal\n" % ttywidth)
     width = ttywidth - maxname - 2 - 2 - 2
 

hgext/mq.py

@@ -1437,7 +1437,7 b' class queue(object):'
                 ph = patchheader(self.join(patchname), self.plainmode)
                 msg = ph.message and ph.message[0] or ''
                 if self.ui.formatted():
-                    width = util.termwidth() - len(pfx) - len(patchname) - 2
+                    width = self.ui.termwidth() - len(pfx) - len(patchname) - 2
                     if width > 0:
                         msg = util.ellipsis(msg, width)
                     else:

hgext/progress.py

@@ -156,7 +156,7 b' class progbar(object):'
         sys.stderr.flush()
 
     def width(self):
-        tw = util.termwidth()
+        tw = self.ui.termwidth()
         return min(int(self.ui.config('progress', 'width', default=tw)), tw)
 
     def progress(self, topic, pos, item='', unit='', total=None):

mercurial/cmdutil.py

@@ -706,7 +706,7 b' def diffordiffstat(ui, repo, diffopts, n'
         diffopts = diffopts.copy(context=0)
         width = 80
         if not ui.plain():
-            width = util.termwidth()
+            width = ui.termwidth()
         chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
                             prefix=prefix)
         for chunk, label in patch.diffstatui(util.iterlines(chunks),

mercurial/commands.py

@@ -1834,7 +1834,7 b' def help_(ui, name=None, with_version=Fa'
     Returns 0 if successful.
     """
     option_lists = []
-    textwidth = util.termwidth() - 2
+    textwidth = ui.termwidth() - 2
 
     def addglobalopts(aliases):
         if ui.verbose:

mercurial/posix.py

@@ -272,7 +272,7 b' def spawndetached(args):'
 def gethgcmd():
     return sys.argv[:1]
 
-def termwidth_():
+def termwidth():
     try:
         import termios, array, fcntl
         for dev in (sys.stderr, sys.stdout, sys.stdin):

mercurial/ui.py

@@ -402,6 +402,16 b' class ui(object):'
 
         return i
 
+    def termwidth(self):
+        '''how wide is the terminal in columns?
+        '''
+        if 'COLUMNS' in os.environ:
+            try:
+                return int(os.environ['COLUMNS'])
+            except ValueError:
+                pass
+        return util.termwidth()
+
     def formatted(self):
         '''should formatted output be used?
 

mercurial/util.py

@@ -1393,14 +1393,6 b' except NameError:'
                 return False
         return True
 
-def termwidth():
-    if 'COLUMNS' in os.environ:
-        try:
-            return int(os.environ['COLUMNS'])
-        except ValueError:
-            pass
-    return termwidth_()
-
 def interpolate(prefix, mapping, s, fn=None):
     """Return the result of interpolating items in the mapping into string s.
 

mercurial/win32.py

@@ -181,7 +181,7 b' def hidewindow():'
     pid =  win32process.GetCurrentProcessId()
     win32gui.EnumWindows(callback, pid)
 
-def termwidth_():
+def termwidth():
     try:
         # Query stderr to avoid problems with redirections
         screenbuf = win32console.GetStdHandle(win32console.STD_ERROR_HANDLE)

mercurial/windows.py

@@ -356,7 +356,7 b' def spawndetached(args):'
 def gethgcmd():
     return [sys.executable] + sys.argv[:1]
 
-def termwidth_():
+def termwidth():
     # cmd.exe does not handle CR like a unix console, the CR is
     # counted in the line length. On 80 columns consoles, if 80
     # characters are written, the following CR won't apply on the