Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: roll_dep.py

Issue 1507623003: Clarify error messages in roll_dep.py (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: roll_dep.py
diff --git a/roll_dep.py b/roll_dep.py
index 6cae24f388f66ea271b4d0d783fb12966161bd6c..e40f55d4fa25a9865a97c5fada634ec375575f73 100755
--- a/roll_dep.py
+++ b/roll_dep.py
@@ -78,11 +78,11 @@ def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
'containing DEPS file.')
if not ignore_dirty_tree and not is_pristine(root):
- raise Error('Ensure %s is clean first.' % root)
+ raise Error('Ensure %s is clean first (no non-merged commits).' % root)
full_dir = os.path.normpath(os.path.join(os.path.dirname(root), deps_dir))
if not os.path.isdir(full_dir):
- raise Error('Directory not found: %s' % deps_dir)
+ raise Error('Directory not found: %s (%s)' % (deps_dir, full_dir))
head = check_output(['git', 'rev-parse', 'HEAD'], cwd=full_dir).strip()
if not head in deps_content:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698