Method write_marker

atomic-core/src/output/repo/writer.rs:298–325

Write a conflict marker line. The format is: `MARKER ID [HASH]` followed by a newline.

(&mut self, marker: &str, id: u32, hash: Option<&Hash>)

    ///
    /// The format is: `MARKER ID [HASH]` followed by a newline.
    fn write_marker(&mut self, marker: &str, id: u32, hash: Option<&Hash>) -> std::io::Result<()> {
        self.ensure_line_start()?;

        // Write marker and ID
        write!(self.writer, "{} {}", marker, id)?;
        self.bytes_written += marker.len() as u64 + 1 + count_digits(id) as u64;

        // Write hash if provided
        if let Some(h) = hash {
            let hash_str = h.to_base32();
            // Only include first 8 chars of hash for readability
            let short_hash = if hash_str.len() > 8 {
                &hash_str[..8]
            } else {
                &hash_str
            };
            write!(self.writer, " [{}]", short_hash)?;
            self.bytes_written += 3 + short_hash.len() as u64; // " [" + hash + "]"
        }

        // Write newline
        self.writer.write_all(b"\n")?;
        self.bytes_written += 1;
        self.line += 1;
        self.at_line_start = true;

        Ok(())
    }

    /// Record a conflict with the given type.
    fn record_conflict(&mut self, conflict_type: FileConflictType, id: u32, hash: Option<&Hash>) {