Repository navigation

fix: prevent concurrent jrnl processes from silently clobbering each other's changes - #2097

Draft

alichtman wants to merge 27 commits into

mainfrom

fix/journal-concurrency-lock

Draft

fix: prevent concurrent jrnl processes from silently clobbering each other's changes#2097
alichtman wants to merge 27 commits into
mainfrom
fix/journal-concurrency-lock

Commits on Jul 16, 2026
- fix: prevent concurrent jrnl processes from silently clobbering each other's changes
  alichtman
  committed
  83c3631
Commits on Jul 22, 2026
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  8fa4a93
- Update dependency tox to v4.57.0
  
  renovate[bot]
  authored and
  alichtman
  committed
  bc4796c
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  30454c5
- refactor: base64-encode the v3 encryption JSON header
  alichtman
  committed
  036775b
- fix: don't overwrite the default config when using --config-file
  alichtman
  committed
  1a0b538
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  1db55aa
- fix: add v prefix to version in --diagnostic output
  alichtman
  committed
  84abe43
- Update actions/setup-python action to v7
  
  renovate[bot]
  authored and
  alichtman
  committed
  1c3fcda
- Update dependency ruff to v0.15.22
  
  renovate[bot]
  authored and
  alichtman
  committed
  95e3e02
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  0e69ddc
- Minor fixes to docstrings of functions
  
  MuditJ
  authored and
  alichtman
  committed
  0f27de3
- Add line break to appease linter 88-char line length max
  
  micahellison
  authored and
  alichtman
  committed
  768d7ce
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  734bd9c
- docs: update develop branch references to main
  alichtman
  committed
  1d65cdc
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  585f7f1
- add alichtman to maintainers list in pyproject.toml
  alichtman
  committed
  7e501dd
- fix pyproject formatting
  alichtman
  committed
  83a880c
- fix: don't crash on invalid UTF-8 from stdin when writing an entry
  alichtman
  committed
  febf562
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  65ee139
- fix: guarantee editor tempfile cleanup on failure
  alichtman
  committed
  4ee7d33
- feat: add debug logging to editor.py
  alichtman
  committed
  80aa7de
- feat: log the editor command when opening it in append mode
  alichtman
  committed
  5c814e2
- refactor: extract editor var in _write_in_editor
  alichtman
  committed
  999984a
- Update changelog [ci skip]
  
  jrnl-bot
  authored and
  alichtman
  committed
  8874dd4
- fix: prevent concurrent jrnl processes from silently clobbering each other's changes
  alichtman
  committed
  0262a91
- fix: fail fast on a locked journal instead of waiting 2s by default
  alichtman
  committed
  eb206f2

Commits

Commits on Jul 16, 2026

Commits on Jul 22, 2026