Kinda kinda working
This commit is contained in:
parent
78e2674711
commit
e906bfa4b1
30
tyop.py
30
tyop.py
|
@ -37,6 +37,9 @@ class Migration:
|
||||||
self._exit(code=0, output=False)
|
self._exit(code=0, output=False)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
self.log.info("=" * 79)
|
||||||
|
self.log.info("RUNNING MIGRATIONS + CHECKS (ONLY GIT LOCAL CHANGES)")
|
||||||
|
self.log.info("=" * 79)
|
||||||
self._run()
|
self._run()
|
||||||
except Exception as exception:
|
except Exception as exception:
|
||||||
self._exit(msg=f"Failed to run migration, saw: {exception}")
|
self._exit(msg=f"Failed to run migration, saw: {exception}")
|
||||||
|
@ -138,17 +141,26 @@ class Migration:
|
||||||
|
|
||||||
def _commit(self):
|
def _commit(self):
|
||||||
for path in self.paths:
|
for path in self.paths:
|
||||||
self.log.debug(f"Running commit logic inside {path}")
|
command = "git --no-pager diff"
|
||||||
self._shell("git --no-pager diff", check=False, cwd=path)
|
output = self._shell(command, cwd=path)
|
||||||
|
if not output:
|
||||||
|
self.log.debug(f"No changes detected in {path}, continuing...")
|
||||||
|
continue
|
||||||
|
|
||||||
|
self.log.info("=" * 79)
|
||||||
|
self.log.info(f"{path}")
|
||||||
|
self.log.info("=" * 79)
|
||||||
|
|
||||||
|
self._shell(command, check=False, cwd=path)
|
||||||
|
|
||||||
if self._confirm() == "s":
|
if self._confirm() == "s":
|
||||||
|
self._shell("git checkout .", check=False, cwd=path)
|
||||||
self.log.debug(f"Skipping {path} as requested...")
|
self.log.debug(f"Skipping {path} as requested...")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not self.commit_msg:
|
if not self.commit_msg:
|
||||||
self.commit_msg = self._message()
|
self.commit_msg = self._message()
|
||||||
|
|
||||||
self._shell("git pull", check=False, cwd=path)
|
|
||||||
self._shell("git add .", check=False, cwd=path)
|
self._shell("git add .", check=False, cwd=path)
|
||||||
self._shell(f"git commit -m '{self.commit_msg}'", check=False, cwd=path)
|
self._shell(f"git commit -m '{self.commit_msg}'", check=False, cwd=path)
|
||||||
self._shell("git push", check=False, cwd=path)
|
self._shell("git push", check=False, cwd=path)
|
||||||
|
@ -177,7 +189,7 @@ class Migration:
|
||||||
|
|
||||||
return self._confirm(match=match)
|
return self._confirm(match=match)
|
||||||
|
|
||||||
def _clean(self, match=None, branch=False):
|
def _clean(self, match=None, branch=False, pull=False):
|
||||||
if match:
|
if match:
|
||||||
_paths = [Path(match).parent]
|
_paths = [Path(match).parent]
|
||||||
else:
|
else:
|
||||||
|
@ -188,6 +200,9 @@ class Migration:
|
||||||
|
|
||||||
self._shell("git checkout .", check=False, cwd=_path)
|
self._shell("git checkout .", check=False, cwd=_path)
|
||||||
|
|
||||||
|
if pull:
|
||||||
|
self._shell("git pull --rebase", check=False, cwd=_path)
|
||||||
|
|
||||||
if branch:
|
if branch:
|
||||||
self.log.debug("Checking out the default branch...")
|
self.log.debug("Checking out the default branch...")
|
||||||
self._shell(
|
self._shell(
|
||||||
|
@ -204,7 +219,7 @@ class Migration:
|
||||||
idx = 0
|
idx = 0
|
||||||
|
|
||||||
for match in self.matches:
|
for match in self.matches:
|
||||||
self._clean(match=match, branch=True)
|
self._clean(match=match, branch=True, pull=True)
|
||||||
|
|
||||||
with open(match, "r") as handle:
|
with open(match, "r") as handle:
|
||||||
self.log.debug(f"Processing {match}...")
|
self.log.debug(f"Processing {match}...")
|
||||||
|
@ -230,7 +245,7 @@ class Migration:
|
||||||
else:
|
else:
|
||||||
handle.write(migrated)
|
handle.write(migrated)
|
||||||
|
|
||||||
if idx <= self.DIFF_LIMIT:
|
if idx < self.DIFF_LIMIT:
|
||||||
if self._diff(match, idx=idx, check=True):
|
if self._diff(match, idx=idx, check=True):
|
||||||
idx += 1
|
idx += 1
|
||||||
|
|
||||||
|
@ -239,6 +254,9 @@ class Migration:
|
||||||
self.log.debug("Finished migrating files...")
|
self.log.debug("Finished migrating files...")
|
||||||
self.log.debug("Commencing change commit run...")
|
self.log.debug("Commencing change commit run...")
|
||||||
|
|
||||||
|
self.log.info("=" * 79)
|
||||||
|
self.log.info("COMMIT AND PUSH (CHANGES APPLIED)")
|
||||||
|
self.log.info("=" * 79)
|
||||||
self._commit()
|
self._commit()
|
||||||
|
|
||||||
self.log.debug("Finished committing changes...")
|
self.log.debug("Finished committing changes...")
|
||||||
|
|
Reference in New Issue