Skip to content

Rename mark to staged and staged to differ#391

Merged
wesbillman merged 3 commits into
mainfrom
rename-mark-to-staged-differ
Mar 16, 2026
Merged

Rename mark to staged and staged to differ#391
wesbillman merged 3 commits into
mainfrom
rename-mark-to-staged-differ

Conversation

@wesbillman
Copy link
Copy Markdown
Collaborator

Summary

  • rename the current apps/staged app to apps/differ and update its package, Tauri, and doc identity
  • rename the current apps/mark app to apps/staged and update root commands, installers, launcher script, and branding
  • migrate the main app's storage and legacy path handling so the new staged identity still picks up prior mark-era data

Testing

  • just app staged ci
  • just app differ ci
  • git push -u origin rename-mark-to-staged-differ

@wesbillman wesbillman requested review from baxen and matt2e as code owners March 16, 2026 18:03
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f10ce2e78e

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

/// Base data directory: `~/.staged/`
pub fn data_dir() -> Option<PathBuf> {
dirs::home_dir().map(|d| d.join(".mark"))
dirs::home_dir().map(|d| d.join(".staged"))
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Avoid colliding Staged data dir with legacy standalone prefs

Pointing the main app data root to ~/.staged reuses the exact location the old standalone Staged app already used for preferences.json; when that file exists, migrate_legacy_preferences_file exits early, so Mark-era preferences from ~/.mark/preferences.json are not migrated for users who had both apps installed. In that upgrade path, users silently lose their prior main-app settings after the rename, so the migration should handle pre-existing standalone prefs instead of treating them as authoritative.

Useful? React with 👍 / 👎.

@wesbillman wesbillman merged commit 6652f93 into main Mar 16, 2026
7 checks passed
@wesbillman wesbillman deleted the rename-mark-to-staged-differ branch March 16, 2026 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant