Merge upstream v1.0.15 #63

Merged
jcoffey-dev merged 2 commits from import/upstream-v1.0.15 into main 2026-11-09 06:54:21 +00:00
Owner

Fixes #62.

Upstream v1.0.15 is merged in, imported with scripts/upstream-import.py v1.0.15 (snapshot d9fcd46). It has three changes:

  • IMAP --mime-keywords: adds the phrases of each message's Keywords: header as keywords, which is how Exchange shows its categories over IMAP. It's opt-in.
    • Phrases are lowercased ASCII with _ for spaces.
    • Characters JMAP forbids are dropped.
    • A phrase can't start with $, so a header can't set $seen or another system keyword.
    • At most 64 per message, each up to 255 characters.
    • Letters outside ASCII are dropped ("Prüfung" becomes pr_fung). That's upstream's choice, and it's in the changelog.
  • Maildir: folder names in modified UTF-7 are now decoded in full, and folder selection and role guessing use the decoded name.
  • EWS: with Basic or delegated OAuth, --mailbox naming another mailbox now addresses that mailbox. Before, it imported the signed-in user's own.

Scan: the 519 added lines have no hidden characters and no text aimed at automated tools. The only non-ASCII text is French and Japanese folder names in tests.

Conflicts

  • Cargo.lock: main's.
  • src/exchange_ews/xml.rs: both sides added a test in the same place; both kept.
  • src/sync/import_maildir/tree.rs: main already decoded each folder's last segment for display (display_leaf, from export-files). Upstream's change does that and more, so I took upstream's and kept main's copyright line and test cases, now pointed at upstream's decode_segment.
  • tests/integration_export_imap.rs (main's own test) needed the new mime_keywords: false.

Checks: cargo test --locked gives 1617 passed, 0 failed, 71 ignored (the live tests). fmt is clean. The live Dovecot, Cyrus and Exchange tests weren't run.

Once this lands, push upstream (d9fcd46) to origin and close #62. The release is a separate version PR.

Fixes #62. Upstream v1.0.15 is merged in, imported with `scripts/upstream-import.py v1.0.15` (snapshot d9fcd46). It has three changes: - **IMAP `--mime-keywords`:** adds the phrases of each message's `Keywords:` header as keywords, which is how Exchange shows its categories over IMAP. It's opt-in. - Phrases are lowercased ASCII with `_` for spaces. - Characters JMAP forbids are dropped. - A phrase can't start with `$`, so a header can't set `$seen` or another system keyword. - At most 64 per message, each up to 255 characters. - Letters outside ASCII are dropped ("Prüfung" becomes `pr_fung`). That's upstream's choice, and it's in the changelog. - **Maildir:** folder names in modified UTF-7 are now decoded in full, and folder selection and role guessing use the decoded name. - **EWS:** with Basic or delegated OAuth, `--mailbox` naming another mailbox now addresses that mailbox. Before, it imported the signed-in user's own. **Scan:** the 519 added lines have no hidden characters and no text aimed at automated tools. The only non-ASCII text is French and Japanese folder names in tests. **Conflicts** - `Cargo.lock`: main's. - `src/exchange_ews/xml.rs`: both sides added a test in the same place; both kept. - `src/sync/import_maildir/tree.rs`: main already decoded each folder's last segment for display (`display_leaf`, from export-files). Upstream's change does that and more, so I took upstream's and kept main's copyright line and test cases, now pointed at upstream's `decode_segment`. - `tests/integration_export_imap.rs` (main's own test) needed the new `mime_keywords: false`. **Checks:** `cargo test --locked` gives 1617 passed, 0 failed, 71 ignored (the live tests). fmt is clean. The live Dovecot, Cyrus and Exchange tests weren't run. Once this lands, push `upstream` (d9fcd46) to origin and close #62. The release is a separate version PR.
jcoffey-dev added 2 commits 2026-11-09 06:41:58 +00:00
Upstream commit 4b9caba8502bb027f77084cb6b55b6687382350d, renamed by scripts/upstream-import.py.
Merge upstream v1.0.15
ci / test (pull_request) Skipped
github/ci (branch) GitHub Actions
ci / github (pull_request) Successful in 4m49s
ci / announce (pull_request) Skipped
2f408c55ed
jcoffey-dev merged commit 4087b6c0f8 into main 2026-11-09 06:54:21 +00:00
jcoffey-dev deleted branch import/upstream-v1.0.15 2026-11-09 06:54:21 +00:00
Sign in to join this conversation.