p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #24870 -- Refactored out get_relative_path() hook in makemigrations.

This commit is contained in:
David Wobrock 2022-06-14 20:12:07 +02:00 committed by Mariusz Felisiak
parent 2a2bde52f3
commit 3893fcdd94
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/core/management/commands/makemigrations.py
View File

@ -254,12 +254,7 @@ class Command(BaseCommand):
if self.verbosity >= 1: if self.verbosity >= 1:
# Display a relative path if it's below the current working # Display a relative path if it's below the current working
# directory, or an absolute path otherwise. # directory, or an absolute path otherwise.
try: migration_string = self.get_relative_path(writer.path)
migration_string = os.path.relpath(writer.path)
except ValueError:
migration_string = writer.path
if migration_string.startswith(".."):
migration_string = writer.path
self.log(" %s\n" % self.style.MIGRATE_LABEL(migration_string)) self.log(" %s\n" % self.style.MIGRATE_LABEL(migration_string))
for operation in migration.operations: for operation in migration.operations:
self.log(" - %s" % operation.describe()) self.log(" - %s" % operation.describe())
@ -291,6 +286,16 @@ class Command(BaseCommand):
self.log(writer.as_string()) self.log(writer.as_string())
run_formatters(self.written_files) run_formatters(self.written_files)
@staticmethod
def get_relative_path(path):
try:
migration_string = os.path.relpath(path)
except ValueError:
migration_string = path
if migration_string.startswith(".."):
migration_string = path
return migration_string
def handle_merge(self, loader, conflicts): def handle_merge(self, loader, conflicts):
""" """
Handles merging together conflicted migrations interactively, Handles merging together conflicted migrations interactively,