These commits are when the Protocol Buffers files have changed: (only the last 100 relevant commits are shown)
| Commit: | 0dda823 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
simple-stores: move the simple backend and op stores into their own crate The new `jj-simple-stores` crate contains `SimpleBackend`, `SimpleOpStore`, and `SimpleOpHeadsStore`. It depends only on `jj-core` and `jj-local-util`, and owns the `.proto` files. The code keeps its module names, so e.g. `SimpleBackend` is now in `jj_simple_stores::simple_backend` and the file moves are plain renames. `jj-lib` re-exports the modules as before (e.g. `jj_lib::simple_backend`) so callers don't need to change. The migration of Git-tracking tags in `SimpleOpStore` is kept behind a `git` feature, which `jj-lib`'s `git` feature enables. Assisted-by: Claude Fable 5.1
| Commit: | 74194f1 | |
|---|---|---|
| Author: | Scott Sudharsan | |
| Committer: | Scott Sudharsan | |
local_working_copy: remember order of materialized conflict terms
| Commit: | e879909 | |
|---|---|---|
| Author: | Scott Sudharsan | |
| Committer: | Scott Sudharsan | |
local_working_copy: remember order of materialized conflict terms
| Commit: | f8360b8 | |
|---|---|---|
| Author: | Scott Sudharsan | |
| Committer: | Scott Sudharsan | |
local_working_copy: remember order of materialized conflict terms
| Commit: | 63990dc | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
default-index: move the default index into its own crate The new `jj-default-index` crate depends only on `jj-core` and `jj-local-util`, and owns its `.proto` file. The submodules move to the crate root, since the `default_index/` directory only existed to keep them out of `lib/src/`. `jj-lib` re-exports the crate as `jj_lib::default_index`. The test-only revset count estimation is kept behind a `testing` feature, which `jj-lib`'s `testing` feature enables. Closes #9805 Assisted-by: Claude Fable 5.1
| Commit: | e6a695a | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
git-backend: move `GitBackend` into its own crate The new `jj-git-backend` crate depends only on `jj-core`, `jj-local-util`, and gix, and owns its `.proto` file. It also contains `SecretBackend` (behind a `testing` feature) since that's a thin wrapper around `GitBackend`. Both modules keep their names (`jj_git_backend::git_backend` and `jj_git_backend::secret_backend`), so the files are moved unchanged. `jj-lib` re-exports them as `jj_lib::git_backend` and `jj_lib::secret_backend`. Assisted-by: Claude Fable 5.1
| Commit: | f13230d | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
git-backend: move `GitBackend` into its own crate The new `jj-git-backend` crate depends only on `jj-core`, `jj-local-util`, and gix, and owns its `.proto` file. It also contains `SecretBackend` (behind a `testing` feature) since that's a thin wrapper around `GitBackend`. `jj-lib` re-exports the crate as `jj_lib::git_backend`, and `jj_lib::secret_backend` is re-exported unchanged. Assisted-by: Claude Fable 5.1
| Commit: | 3a5e54e | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | c8ea247 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | ec705fd | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | cf8127c | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | e6325ab | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | 30ff358 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: jj independent workspaces prototype
| Commit: | f7af89a | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: jj independent workspaces prototype
| Commit: | 17eace9 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
lib: store WorkspaceType and generate WorkspaceId for independent workspaces This is a step towards independent workspaces. This commit introduces the concept of WorkspaceId, which is a random reverse-hex string generated when an independent workspace is added. In reality we should generate the WorkspaceId when any workspace is added, but if we do that today lost of tests need updates (because the JJRng used to generate ChangeIds is also used to generate WorkspaceIds). In a follow up we can generate WorkspaceId for all workspaces.
| Commit: | 0a733b6 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WorkspaceStore: store the WorkspaceType
| Commit: | d0538ee | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: represent sparse patterns as a fileset expression Sparse patterns have so far been a list of path prefixes, which makes it impossible to exclude paths or to use globs (#1896, #7815). This patch changes the `WorkingCopy` API and `TreeState` to use a `FilesetExpression` instead. The CLI still only creates unions of path prefixes, so there's no user-visible change yet. The local working copy stores the resolved expression tree in the proto rather than the fileset text. The tree has no function names or cwd-relative paths, so changes to the fileset language don't require keeping support for old syntax around. Sparse patterns in the legacy `prefixes` field are still read. `DiffWorkingCopies` now keeps the list of checked-out files itself, since it can no longer be read back from the sparse patterns. Assisted-by: Claude Opus 5.5
| Commit: | 8999903 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: represent sparse patterns as a fileset expression Sparse patterns have so far been a list of path prefixes, which makes it impossible to exclude paths or to use globs (#1896, #7815). This patch changes the `WorkingCopy` API and `TreeState` to use a `FilesetExpression` instead. The CLI still only creates unions of path prefixes, so there's no user-visible change yet. The local working copy stores the resolved expression tree in the proto rather than the fileset text. The tree has no function names or cwd-relative paths, so changes to the fileset language don't require keeping support for old syntax around. Sparse patterns in the legacy `prefixes` field are still read. `DiffWorkingCopies` now keeps the list of checked-out files itself, since it can no longer be read back from the sparse patterns. Assisted-by: Claude Opus 5.5
| Commit: | 409198b | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 5c7fd04 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | e40e66e | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 5c335cd | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 0a26721 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 16ce401 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | ada60f1 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | b4c845f | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | bf07510 | |
|---|---|---|
| Author: | Matt Stark | |
| Committer: | Matt Stark | |
config: Implement managed config design doc This follows decisions made in docs/design/managed-config.md.
| Commit: | f98742f | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 903e290 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 824756d | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 8226c59 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 80374e9 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 3ed7500 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | ec5f38a | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 6fd02e1 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 3a7df7a | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 839e9ad | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces prototype
| Commit: | 74f57e9 | |
|---|---|---|
| Author: | David Rieber | |
| Committer: | David Rieber | |
WIP: jj independent workspaces
| Commit: | f3115e3 | |
|---|---|---|
| Author: | Caleb White | |
| Committer: | Caleb White | |
git: track HEAD per worktree Store Git HEAD targets in the view keyed by worktree name instead of keeping a single repository-wide target. This prepares colocated repositories for linked Git worktrees, where each jj workspace can have its own HEAD.
| Commit: | b2bbfa7 | |
|---|---|---|
| Author: | Caleb White | |
| Committer: | Caleb White | |
git: track HEAD per worktree Store Git HEAD targets in the view keyed by worktree name instead of keeping a single repository-wide target. This prepares colocated repositories for linked Git worktrees, where each jj workspace can have its own HEAD.
| Commit: | 9d1d779 | |
|---|---|---|
| Author: | Caleb White | |
| Committer: | Caleb White | |
git: track HEAD per worktree Store Git HEAD targets in the view keyed by worktree name instead of keeping a single repository-wide target. This prepares colocated repositories for linked Git worktrees, where each jj workspace can have its own HEAD.
| Commit: | c8c08f4 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
backend: add metadata field to Commit for arbitrary extra data The new field allows servers and custom clients to attach arbitrary metadata to commits. Since it is intended mainly for shipping data from servers to clients, it is not preserved on rewrite. It is intended to impact the commit ID, however; two commits with different metadata but otherwise identical should have different IDs. We have also discussed metadata that is preserved on rewrite (could be useful e.g. for recording a bug number), as well as metadata/annotations that are attached to commits but don't influence their identity (could be useful e.g. for linking to CI results). This patch only introduces the non-sticky kind because that's the simplest kind to support. The simple backend and the test backend support reading and writing it. The Git backend errors out for now when asked to write a commit with metadata; we may later support it by writing custom commit headers (e.g. "jj:metadata:<key>: <value>"). Note that this changes commit ids in the simple backend and the test backend because the new field is included in the content hash.
| Commit: | f9d1438 | |
|---|---|---|
| Author: | Sami Jawhar | |
| Committer: | Sami Jawhar | |
op_store: add per-workspace git_head tracking
| Commit: | e2e0c70 | |
|---|---|---|
| Author: | Sami Jawhar | |
| Committer: | Sami Jawhar | |
op_store: add per-workspace git_head tracking
| Commit: | 2474e28 | |
|---|---|---|
| Author: | Sami Jawhar | |
| Committer: | Sami Jawhar | |
op_store: add per-workspace git_head tracking
| Commit: | c3eb5fb | |
|---|---|---|
| Author: | Remo Senekowitsch | |
| Committer: | Remo Senekowitsch | |
git: move remote head to view object Previously, the revset-alias trunk was set to the HEAD of some remote. (Usually the first one - on clone or init.) This was done by writing to a repo-specific config file. This prevented the default trunk alias from behaving better in the presence of multiple remotes. Users were also unable to customize the trunk alias on a global level, since it was always overwritten at the repo level. Fix this by moving the information of a remote's HEAD to the view object. The new `remote_heads()` revset function can be used to extract this information. The default trunk alias is changed to consider all bookmarks matching the HEAD of any remote or some common conventions as "independent" trunks. This ensures that even if there are multiple remotes with diverging and differently-named default bookmarks, all revisions reachable from them are still considered immutable by default. This also fixes the issue where Jujutsu unnecessarily writes to XDG_CONFIG_HOME. This is often annoying and sometimes impossible.
| Commit: | 4d64868 | |
|---|---|---|
| Author: | Matt Stark | |
| Committer: | Matt Stark | |
config: Implement managed config design doc This follows decisions made in docs/design/managed-config.md.
| Commit: | c38d69e | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
templater: deprecate `Operation.tags()` in favor of `.attributes()` As we have discussed in at least https://github.com/jj-vcs/jj/pull/8148, the name `.tags()` is not a good name because it can be assumed to be related to the usual kind of VCS tags.
| Commit: | 8cad6ca | |
|---|---|---|
| Author: | Matt Stark | |
| Committer: | Matt Stark | |
config: Implement managed config design doc This follows decisions made in docs/design/managed-config.md.
| Commit: | 6ef9b28 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
op_store: record workspace where operation was run There are two reasons for this: * It helps understanding why divergence happened to see which workspace an operation was run from. For example, perhaps an agent is running in another workspace and it's not obvious from the operation log which commands it ran without seeing the workspace name. * We may want to check that e.g. `jj undo` is run from the same workspace as the operation it's undoing. We may want to print a warning otherwise, or maybe we want to skip over operations create from other workspaces. I'm not sure what's best but having the workspace recorded at least enables such features.
| Commit: | 69d808f | |
|---|---|---|
| Author: | Pavan Kumar Sunkara | |
| Committer: | Pavan K Sunkara | |
workspaces: Allow retrieving the path of another workspace This allows `jj workspace root` command to take an optional workspace arg to print the root directory of that workspace, while defaulting to the current workspace. We allow this by creating a new `workspace_store` which has a separate entry for each workspace containing its name and root directory. This store is created during initiation of the repo and is maintained whenever `add`, `forget` & `rename` workspace subcommands are executed. CAUTION: Moving a workspace path will not sync the path stored in the workspace store. CAUTION: Specifying `jj workspace root` with a workspace created before this will result in an error.
| Commit: | fcf1da9 | |
|---|---|---|
| Author: | Matt Stark | |
| Committer: | Matt | |
config: Implement secure-config design doc. See docs/design/secure-config.md for many more details. Fixes #3303 Fixes #1595
| Commit: | 6ca08d9 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 0d3d525 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | f04b616 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | f2b85d5 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 5f719fd | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 7ce8bcd | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 98e4ca7 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 12b709e | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | ab88c12 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 8069b0e | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 5458d47 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | be9b6bb | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 66b17e3 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | a688c22 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 55234cc | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | 625a280 | |
|---|---|---|
| Author: | Scott Taylor | |
| Committer: | Scott Taylor | |
protos: add conflict labels to working copy and simple backend
| Commit: | baf5f13 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: rename tags field to local_tags I'm going to rename "tag" in the view API to "local_tag". Since the underlying data structures are split to View and RemoteView, it's not important to add "local_" prefix. However, I think this change is good for consistency.
The documentation is generated from this commit.
| Commit: | 120d492 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
git, op_store: migrate and import "refs/tags/*" as @git remote tags The migration logic is basically the same as 717d0d3d6d "git: on deserialize/import/export, copy refs/heads/* to remote named git." Now git::import_refs() processes bookmarks and tags in the same way. git::export_refs() is unchanged because we don't have any commands that would move local tags internally.
| Commit: | a89680d | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: add remote tags storage and basic accessors Git-tracking tags will be stored there. I don't have a concrete plan for proper remote tags support, but I think tags fetched/pushed internally can be recorded as remote tags.
| Commit: | aac6363 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: reorganize proto reflecting new RemoteView structure I'm thinking of adding remote tags table to support tag mutation commands, so I think it's time to update the storage format. RefTarget is serialized to a list of alternate terms because we don't need to support legacy formats here.
| Commit: | 7cefde1 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
git, op_store: migrate and import "refs/tags/*" as @git remote tags The migration logic is basically the same as 717d0d3d6d "git: on deserialize/import/export, copy refs/heads/* to remote named git." Now git::import_refs() processes bookmarks and tags in the same way. git::export_refs() is unchanged because we don't have any commands that would move local tags internally.
| Commit: | 5bb6002 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: add remote tags storage and basic accessors Git-tracking tags will be stored there. I don't have a concrete plan for proper remote tags support, but I think tags fetched/pushed internally can be recorded as remote tags.
| Commit: | 8561330 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: reorganize proto reflecting new RemoteView structure I'm thinking of adding remote tags table to support tag mutation commands, so I think it's time to update the storage format. RefTarget is serialized to a list of alternate terms because we don't need to support legacy formats here.
| Commit: | 9a5e2ae | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: remove stale TODO about renamed remote and view state We aren't going to fix this problem by inserting another indirection, at least to the view layer.
| Commit: | be298aa | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: remove stale TODO about renamed remote and view state We aren't going to fix this problem by inserting another indirection, at least to the view layer.
| Commit: | 29e2294 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
git, op_store: migrate and import "refs/tags/*" as @git remote tags The migration logic is basically the same as 717d0d3d6d "git: on deserialize/import/export, copy refs/heads/* to remote named git." Now git::import_refs() processes bookmarks and tags in the same way. git::export_refs() is unchanged because we don't have any commands that would move local tags internally.
| Commit: | 732e6a0 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: add remote tags storage and basic accessors Git-tracking tags will be stored there. I don't have a concrete plan for proper remote tags support, but I think tags fetched/pushed internally can be recorded as remote tags.
| Commit: | c568935 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: reorganize proto reflecting new RemoteView structure I'm thinking of adding remote tags table to support tag mutation commands, so I think it's time to update the storage format. RefTarget is serialized to a list of alternate terms because we don't need to support legacy formats here.
| Commit: | e236180 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: flag legacy git_refs.commit_id field as deprecated
| Commit: | 9c9e043 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
op_store: flag legacy git_refs.commit_id field as deprecated
| Commit: | 5f7f431 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: drop support for legacy trees Legacy trees (those with conflicts recorded at the path level) have not been created since 0.11 (Nov 2023). We're about to deprecate them now. This patch removes support for them in the working copy. If anyone still has a commit checked out at a legacy tree, we will now interpret that as a modern tree, meaning that any conflicts will appear as regular files with JSON contents in the previous snapshot, so if we re-snapshot the working copy (and e.g. the mtime has changed), these files will become resolved with the conflicts markers still in them. I think it's quite unlikely that anyone has working copies this old so I didn't mention it in the changelog.
| Commit: | d091344 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
simple_store: drop support for legacy trees Users should not be using the simple backend for anything serious, and they definitely should not have any repos from back when we used legacy trees.
| Commit: | da6c4b6 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
backend: remove unused TreeValue::Conflict and read/write methods We no longer use the `TreeValue::Conflict` constructor or the `Backend::read_conflict()` and `Backend::write_conflict()` methods.
| Commit: | c100165 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
backend: remove unused TreeValue::Conflict and read/write methods We no longer use the `TreeValue::Conflict` constructor or the `Backend::read_conflict()` and `Backend::write_conflict()` methods.
| Commit: | 197ce3f | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: drop support for legacy trees Legacy trees (those with conflicts recorded at the path level) have not been created since 0.11 (Nov 2023). We're about to deprecate them now. This patch removes support for them in the working copy. If anyone still has a commit checked out at a legacy tree, we will now interpret that as a modern tree, meaning that any conflicts will appear as regular files with JSON contents in the previous snapshot, so if we re-snapshot the working copy (and e.g. the mtime has changed), these files will become resolved with the conflicts markers still in them. I think it's quite unlikely that anyone has working copies this old so I didn't mention it in the changelog.
| Commit: | f5935fb | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
simple_store: drop support for legacy trees Users should not be using the simple backend for anything serious, and they definitely should not have any repos from back when we used legacy trees.
| Commit: | 52c5793 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
working_copy: calculate and store content hash of materialized conflicts This will help detect unchanged conflict files.
| Commit: | c6e4711 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: mark unused `conflict_id` proto field reserved The field has been unused since it was deprecated in 97b81a0f (~2 years ago). It should have been marked reserved instead of deprecated already then.
| Commit: | 7b7dd19 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
working_copy: calculate and store content hash of materialized conflicts This will help detect unchanged conflict files.
| Commit: | e13a864 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
protos: rename `working_copy` to `local_working_copy` The `working_copy` proto is specific to `LocalWorkingCopy`, so I think it should match that name.
| Commit: | 05a7496 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
protos: rename `op_store` to `simple_op_store` Similar to the previous commit, `op_store` is specific to `SimpleOpStore`, so its name should match that.
| Commit: | 691157a | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
working_copy: mark unused `conflict_id` proto field reserved The field has been unused since it was deprecated in 97b81a0f (~2 years ago). It should have been marked reserved instead of deprecated already then.
| Commit: | 132d74a | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
index: read/write changed-path index segments
| Commit: | 3902d88 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
index: migrate operation link file to protobuf I'm going to add changed-path index, and the operation link file will store a list of segment files and a starting commit position. Suppose the link file is small, we wouldn't need our own serialization format. This patch adds new directory for proto-based operation link files. We could reuse the existing directory, but that would make debugging a bit harder.
| Commit: | ec90123 | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
index: read/write changed-path index segments
| Commit: | 312351c | |
|---|---|---|
| Author: | Yuya Nishihara | |
| Committer: | Yuya Nishihara | |
index: migrate operation link file to protobuf I'm going to add changed-path index, and the operation link file will store a list of segment files and a starting commit position. Suppose the link file is small, we wouldn't need our own serialization format. This patch adds new directory for proto-based operation link files. We could reuse the existing directory, but that would make debugging a bit harder.
| Commit: | a363e6b | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
backend: add CopyId to TreeValue::File This patch adds a `TreeValue::File::copy_id` field. The copy ids are always empty for now. I preserved the copy id where it was easy to do so, plus in a few non-trivial cases. In other places, however, I made the code use a new copy id. I added a `CopyId::placeholder()` function for creating a new copy id where we need one. We should eventually fix all callers to either preserve an existing copy or to generate a new one.
| Commit: | 7410875 | |
|---|---|---|
| Author: | Martin von Zweigbergk | |
| Committer: | Martin von Zweigbergk | |
backend: add CopyId to TreeValue::File This patch adds a `TreeValue::File::copy_id` field. The copy ids are always empty for now. I preserved the copy id where it was easy to do so, plus in a few non-trivial cases. In other places, however, I made the code use a new copy id. I added a `CopyId::placeholder()` function for creating a new copy id where we need one. We should eventually fix all callers to either preserve an existing copy or to generate a new one.