accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

fix message

Browse Source
This commit is contained in:
Rushabh Mehta 2017-04-03 13:11:51 +05:30
parent 4f37c6cf03
commit 893b55991b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bench/app.py
View File

@ -139,13 +139,17 @@ def pull_all_apps(bench_path='.', reset=False):
if os.path.exists(os.path.join(app_dir, '.git')): if os.path.exists(os.path.join(app_dir, '.git')):
out = subprocess.check_output(["git", "status"], cwd=app_dir) out = subprocess.check_output(["git", "status"], cwd=app_dir)
if not 'nothing to commit, working directory clean' in out: if not 'nothing to commit, working directory clean' in out:
print '''You have local changes in app "{0}" that are not committed. print '''
Please commit or stash these changes before using bench update.
If you commit, you may encounter conflicts, so you have two choices: Cannot proceed with update: You have local changes in app "{0}" that are not committed.
Here are your choices:
1. Merge the {0} app manually with "git pull" / "git pull --rebase" and fix conflicts. 1. Merge the {0} app manually with "git pull" / "git pull --rebase" and fix conflicts.
1. If your changes were temporary and not important, you can stash them with "git stash" or discard them completely with "git reset --hard" 1. Temporarily remove your changes with "git stash" or discard them completely
2. If your changes are helpful for the community, send in a pull request so that your changes become a part of the core.''' with "git reset --hard"
2. If your changes are helpful for others, send in a pull request via GitHub and
wait for them to be merged in the core.'''.format(app)
sys.exit(1) sys.exit(1)
for app in get_apps(bench_path=bench_path): for app in get_apps(bench_path=bench_path):