accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-17 02:25:16 +00:00
Code Issues Releases Activity

Merge pull request #1130 from CaseSolvedUK/shallow_pull

Browse Source 
feat: Keep repos shallow if --reset and shallow_clone are specified in bench update --pull
This commit is contained in:
gavin 2021-04-23 10:28:47 +05:30 committed by GitHub
commit 4b31ac078b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bench/app.py
View File

@ -110,7 +110,8 @@ def get_app(git_url, branch=None, bench_path='.', skip_assets=False, verbose=Fal
shallow_clone = '--depth 1' if check_git_for_shallow_clone() else '' shallow_clone = '--depth 1' if check_git_for_shallow_clone() else ''
branch = '--branch {branch}'.format(branch=branch) if branch else '' branch = '--branch {branch}'.format(branch=branch) if branch else ''
else: else:
repo_name = git_url.split(os.sep)[-1] git_url = os.path.abspath(git_url)
_, repo_name = os.path.split(git_url)
shallow_clone = '' shallow_clone = ''
branch = '--branch {branch}'.format(branch=branch) if branch else '' branch = '--branch {branch}'.format(branch=branch) if branch else ''
@ -233,7 +234,7 @@ def pull_apps(apps=None, bench_path='.', reset=False):
rebase = '--rebase' if get_config(bench_path).get('rebase_on_pull') else '' rebase = '--rebase' if get_config(bench_path).get('rebase_on_pull') else ''
apps = apps or get_apps(bench_path=bench_path) apps = apps or get_apps(bench_path=bench_path)
# chech for local changes # check for local changes
if not reset: if not reset:
for app in apps: for app in apps:
excluded_apps = get_excluded_apps() excluded_apps = get_excluded_apps()
@ -242,7 +243,7 @@ def pull_apps(apps=None, bench_path='.', reset=False):
continue continue
app_dir = get_repo_dir(app, bench_path=bench_path) app_dir = get_repo_dir(app, bench_path=bench_path)
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', shell=True, cwd=app_dir)
out = out.decode('utf-8') out = out.decode('utf-8')
if not re.search(r'nothing to commit, working (directory|tree) clean', out): if not re.search(r'nothing to commit, working (directory|tree) clean', out):
print(''' print('''
@ -271,32 +272,35 @@ Here are your choices:
add_to_excluded_apps_txt(app, bench_path=bench_path) add_to_excluded_apps_txt(app, bench_path=bench_path)
print("Skipping pull for app {}, since remote doesn't exist, and adding it to excluded apps".format(app)) print("Skipping pull for app {}, since remote doesn't exist, and adding it to excluded apps".format(app))
continue continue
branch = get_current_branch(app, bench_path=bench_path)
logger.log('pulling {0}'.format(app)) logger.log('pulling {0}'.format(app))
if reset: if reset:
exec_cmd("git fetch --all", cwd=app_dir) reset_cmd = "git reset --hard {remote}/{branch}".format(remote=remote, branch=branch)
exec_cmd("git reset --hard {remote}/{branch}".format( if get_config(bench_path).get('shallow_clone'):
remote=remote, branch=get_current_branch(app,bench_path=bench_path)), cwd=app_dir) exec_cmd("git fetch --depth=1 --no-tags {remote} {branch}".format(remote=remote, branch=branch),
cwd=app_dir)
exec_cmd(reset_cmd, cwd=app_dir)
exec_cmd("git reflog expire --all", cwd=app_dir)
exec_cmd("git gc --prune=all", cwd=app_dir)
else:
exec_cmd("git fetch --all", cwd=app_dir)
exec_cmd(reset_cmd, cwd=app_dir)
else: else:
exec_cmd("git pull {rebase} {remote} {branch}".format(rebase=rebase, exec_cmd("git pull {rebase} {remote} {branch}".format(rebase=rebase,
remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir) remote=remote, branch=branch), cwd=app_dir)
exec_cmd('find . -name "*.pyc" -delete', cwd=app_dir) exec_cmd('find . -name "*.pyc" -delete', cwd=app_dir)
def is_version_upgrade(app='frappe', bench_path='.', branch=None): def is_version_upgrade(app='frappe', bench_path='.', branch=None):
try:
fetch_upstream(app, bench_path=bench_path)
except CommandFailedError:
raise InvalidRemoteException("No remote named upstream for {0}".format(app))
upstream_version = get_upstream_version(app=app, branch=branch, bench_path=bench_path) upstream_version = get_upstream_version(app=app, branch=branch, bench_path=bench_path)
if not upstream_version: if not upstream_version:
raise InvalidBranchException("Specified branch of app {0} is not in upstream".format(app)) raise InvalidBranchException('Specified branch of app {0} is not in upstream remote'.format(app))
local_version = get_major_version(get_current_version(app, bench_path=bench_path)) local_version = get_major_version(get_current_version(app, bench_path=bench_path))
upstream_version = get_major_version(upstream_version) upstream_version = get_major_version(upstream_version)
if upstream_version - local_version > 0: if upstream_version > local_version:
return (True, local_version, upstream_version) return (True, local_version, upstream_version)
return (False, local_version, upstream_version) return (False, local_version, upstream_version)
@ -329,10 +333,6 @@ def use_rq(bench_path):
celery_app = os.path.join(bench_path, 'apps', 'frappe', 'frappe', 'celery_app.py') celery_app = os.path.join(bench_path, 'apps', 'frappe', 'frappe', 'celery_app.py')
return not os.path.exists(celery_app) return not os.path.exists(celery_app)
def fetch_upstream(app, bench_path='.'):
repo_dir = get_repo_dir(app, bench_path=bench_path)
return subprocess.call(["git", "fetch", "upstream"], cwd=repo_dir)
def get_current_version(app, bench_path='.'): def get_current_version(app, bench_path='.'):
current_version = None current_version = None
repo_dir = get_repo_dir(app, bench_path=bench_path) repo_dir = get_repo_dir(app, bench_path=bench_path)
@ -364,8 +364,15 @@ def get_upstream_version(app, branch=None, bench_path='.'):
repo_dir = get_repo_dir(app, bench_path=bench_path) repo_dir = get_repo_dir(app, bench_path=bench_path)
if not branch: if not branch:
branch = get_current_branch(app, bench_path=bench_path) branch = get_current_branch(app, bench_path=bench_path)
try: try:
contents = subprocess.check_output(['git', 'show', 'upstream/{branch}:{app}/__init__.py'.format(branch=branch, app=app)], cwd=repo_dir, stderr=subprocess.STDOUT) subprocess.call('git fetch --depth=1 --no-tags upstream {branch}'.format(branch=branch), shell=True, cwd=repo_dir)
except CommandFailedError:
raise InvalidRemoteException('Failed to fetch from remote named upstream for {0}'.format(app))
try:
contents = subprocess.check_output('git show upstream/{branch}:{app}/__init__.py'.format(branch=branch, app=app),
shell=True, cwd=repo_dir, stderr=subprocess.STDOUT)
contents = contents.decode('utf-8') contents = contents.decode('utf-8')
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if b"Invalid object" in e.output: if b"Invalid object" in e.output: