From 4dda01f43e00a2412ee05595cb4d3ec559594f28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 19:37:11 +0000 Subject: systemBranch -> sys_brch; activeBranch -> act_brch; localBranch -> lcl_brch; remoteBranch -> rmt_brch --- src/backend/syncenv.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/backend/syncenv.py') diff --git a/src/backend/syncenv.py b/src/backend/syncenv.py index 09049ee..eef7fb1 100644 --- a/src/backend/syncenv.py +++ b/src/backend/syncenv.py @@ -7,49 +7,49 @@ import sisyphus.getfs def gentooRepo(): os.chdir(sisyphus.getfs.gentooRepoDir) - localBranch = subprocess.check_output( + lcl_brch = subprocess.check_output( ['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output( + rmt_brch = subprocess.check_output( ['git', 'rev-parse', '--symbolic-full-name', '@{u}']) g_exe1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + - localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + lcl_brch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) g_exe1.wait() - g_exe2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + g_exe2 = subprocess.Popen(['git', 'reset', '--hard'] + rmt_brch.decode( ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) g_exe2.wait() def redcoreRepo(): os.chdir(sisyphus.getfs.redcoreRepoDir) - localBranch = subprocess.check_output( + lcl_brch = subprocess.check_output( ['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output( + rmt_brch = subprocess.check_output( ['git', 'rev-parse', '--symbolic-full-name', '@{u}']) g_exe1 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + - localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + lcl_brch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) g_exe1.wait() - g_exe2 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + g_exe2 = subprocess.Popen(['git', 'reset', '--hard'] + rmt_brch.decode( ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) g_exe2.wait() def portageConfigRepo(): os.chdir(sisyphus.getfs.portageConfigDir) - localBranch = subprocess.check_output( + lcl_brch = subprocess.check_output( ['git', 'rev-parse', '--abbrev-ref', 'HEAD']) - remoteBranch = subprocess.check_output( + rmt_brch = subprocess.check_output( ['git', 'rev-parse', '--symbolic-full-name', '@{u}']) g_exe1 = subprocess.Popen(['git', 'stash'], stdout=subprocess.PIPE) g_exe1.wait() g_exe2 = subprocess.Popen(['git', 'fetch', '--depth=1', 'origin'] + - localBranch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) + lcl_brch.decode().strip().split() + ['--quiet'], stdout=subprocess.PIPE) g_exe2.wait() - g_exe3 = subprocess.Popen(['git', 'reset', '--hard'] + remoteBranch.decode( + g_exe3 = subprocess.Popen(['git', 'reset', '--hard'] + rmt_brch.decode( ).strip().replace('refs/remotes/', '').split() + ['--quiet'], stdout=subprocess.PIPE) g_exe3.wait() g_exe4 = subprocess.Popen( -- cgit v1.2.3