=== modified file 'bzrlib/osutils.py' --- bzrlib/osutils.py +++ bzrlib/osutils.py @@ -617,4 +617,12 @@ try: return int(os.environ['COLUMNS']) except (IndexError, KeyError, ValueError): - return 80 + pass + try: + # this only works on posix + import fcntl, termios, struct + height, width = struct.unpack('hh', fcntl.ioctl(sys.stdout, termios.TIOCGWINSZ, " ")) + return width + except ImportError: + pass + return 80 === modified file 'bzrlib/transport/__init__.py' --- bzrlib/transport/__init__.py +++ bzrlib/transport/__init__.py @@ -332,7 +332,7 @@ def copy_entry(path): other.put(path, self.get(path), mode=mode) - return self._iterate_over(relpaths, copy_entry, pb, 'copy_to', expand=False) + return self._iterate_over(relpaths, copy_entry, pb, 'copy', expand=False) def copy_tree(self, from_relpath, to_relpath): """Copy a subtree from one relpath to another.