Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Correctly record missing stages in index for merge conflicts #1907

Merged
merged 6 commits into from
Jan 7, 2025
Merged

fix: Correctly record missing stages in index for merge conflicts #1907

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae1a4c6
fix: Correctly record missing stages in index for merge conflicts
pawamoy Dec 26, 2024
b38e733
style: autoformat with pre-commit
autofix-ci[bot] Dec 26, 2024
660944b
style: Format
pawamoy Dec 26, 2024
f442564
fixup! fix: Correctly record missing stages in index for merge conflicts
pawamoy Dec 26, 2024
d016ded
Update copier/main.py
pawamoy Dec 30, 2024
b87bdf9
Update copier/main.py
pawamoy Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions copier/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,8 @@ def _apply_update(self) -> None: # noqa: C901
(apply_cmd << diff)(retcode=None)
if self.conflict == "inline":
conflicted = []
old_path = Path(old_copy)
new_path = Path(new_copy)
status = git("status", "--porcelain").strip().splitlines()
for line in status:
# Filter merge rejections (part 1/2)
Expand All @@ -1104,8 +1106,8 @@ def _apply_update(self) -> None: # noqa: C901
"-L",
"after updating",
fname,
Path(old_copy) / fname,
Path(new_copy) / fname,
old_path / fname,
new_path / fname,
retcode=None,
)
# Remove rejection witness
Expand All @@ -1120,11 +1122,13 @@ def _apply_update(self) -> None: # noqa: C901
for line in conflicts_candidate
):
conflicted.append(fname)
# Forcefully mark files with conflict markers as unmerged,
# see SO post: https://stackoverflow.com/questions/77391627/
# We ran `git merge-file` outside of a regular merge operation,
# which means no merge conflict is recorded in the index.
# Only the usual stage 0 is recorded, with the hash of the current version.
# We therefore update the index with the missing stages:
# 1 = current (before updating), 2 = base (last update), 3 = other (after updating).
# See this SO post: https://stackoverflow.com/questions/79309642/.
pawamoy marked this conversation as resolved.
Show resolved Hide resolved
# and Git docs: https://git-scm.com/docs/git-update-index#_using_index_info.
# For each file with conflict markers, we update the index to add
# higher order versions of their paths, without entries for resolved contents.
if conflicted:
input_lines = []
for line in (
Expand All @@ -1133,9 +1137,25 @@ def _apply_update(self) -> None: # noqa: C901
perms_sha_mode, path = line.split("\t")
perms, sha, _ = perms_sha_mode.split()
input_lines.append(f"0 {'0' * 40}\t{path}")
input_lines.extend(
f"{perms} {sha} {mode}\t{path}" for mode in (1, 2, 3)
)
input_lines.append(f"{perms} {sha} 1\t{path}")
with suppress(ProcessExecutionError):
# The following command will fail
# if the file did not exist in the previous version.
old_sha = git(
"hash-object",
"-w",
old_path / normalize_git_path(path),
).strip()
input_lines.append(f"{perms} {old_sha} 2\t{path}")
with suppress(ProcessExecutionError):
# The following command will fail
# if the file was deleted in the latest version.
new_sha = git(
"hash-object",
"-w",
new_path / normalize_git_path(path),
).strip()
input_lines.append(f"{perms} {new_sha} 3\t{path}")
(
git["update-index", "--index-info"]
<< "\n".join(input_lines)
Expand Down
Loading