From 857c01d075dcddee20e7b4d2fa2157101751df37 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Tue, 26 Nov 2019 21:29:24 +0000
Subject: [PATCH] lengthen bars unless nested/threaded

Partially fixes #2487
---
 dvc/progress.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dvc/progress.py b/dvc/progress.py
index 65288acef..6e340303c 100644
--- a/dvc/progress.py
+++ b/dvc/progress.py
@@ -20,7 +20,7 @@ class Tqdm(tqdm):
     """
 
     BAR_FMT_DEFAULT = (
-        "{percentage:3.0f}%|{bar:10}|"
+        "{percentage:3.0f}%|{bar}|"
         "{desc:{ncols_desc}.{ncols_desc}}{n_fmt}/{total_fmt}"
         " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]"
     )
@@ -84,6 +84,11 @@ class Tqdm(tqdm):
         if bar_format is None:
             if self.__len__():
                 self.bar_format = self.BAR_FMT_DEFAULT
+                # nested bars should have fixed bar widths to align nicely
+                if self.pos:
+                    self.bar_format = self.bar_format.replace(
+                        "{bar}", "{bar:10}"
+                    )
             else:
                 self.bar_format = self.BAR_FMT_NOTOTAL
         else: