From 81c846e27bf3a1fddf297c6f3604d510af33bf3e Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 22 Jul 2017 13:45:38 +0300
Subject: Add: clearer error message for unclean repo

---
 NEWS              |  1 +
 distixlib/repo.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9779565..e800bad 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ distix, a distributed ticketing system.
 Version 0.17+git, not yet released
 ----------------------------------
 
+* Error messages about an unclean repository are now a bit clearer.
 
 Version 0.17, released 2017-06-18
 ----------------------------------
diff --git a/distixlib/repo.py b/distixlib/repo.py
index 9a246e7..0f900ec 100644
--- a/distixlib/repo.py
+++ b/distixlib/repo.py
@@ -48,10 +48,20 @@ class Repository(object):
         return [filename]
 
     def require_clean_working_tree(self, stderr=sys.stderr):
+        states = {
+            '??': 'unknown',
+            'M': 'modified',
+        }
+
         git = distixlib.Git(self._dirname)
         dirt = git.find_dirt()
         if dirt:
-            stderr.write('\ndirt: %r\n' % dirt)
+            stderr.write('ERROR: unclean repository:\n')
+            for speck in dirt:
+                status = speck[:2].strip()
+                filename = speck[3:].strip()
+                stderr.write(
+                    '  {}: {}\n'.format(states.get(status, status), filename))
             sys.exit(1)
 
     def get_description(self):
-- 
cgit v1.2.1