Martin von Zweigbergk afc59a210a index: make tests more focused, and add tests of octopus merge

2021-02-26 10:33:32 -08:00

..

commit_builder.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

commit.rs

git: extract function for pushing commit to remote branch, and test it

2020-12-28 00:53:41 -08:00

conflicts.rs

conflicts: add another helper for writing materialized conflict to store

2020-12-26 00:35:45 -08:00

dag_walk.rs

index: keep up to date within transaction

2021-02-14 00:58:11 -08:00

evolution.rs

rewrite: make merge_commit_trees() use index for finding common ancestors

2021-02-23 20:49:18 -08:00

files.rs

merge: rewrite code for 3-way merge of files to handle not just trivial cases

2021-01-22 11:41:50 -08:00

git_store.rs

git: add a ref to each commit we create

2021-02-13 08:16:18 -08:00

git.rs

transaction: add accessors for view and evolution directly on transaction

2021-02-13 13:43:48 -08:00

index.rs

index: make tests more focused, and add tests of octopus merge

2021-02-26 10:33:32 -08:00

lib.rs

index: add support for finding common ancestors

2021-02-23 17:29:23 -08:00

local_store.rs

git: return a new repo instance from the store instead of the store's instance

2020-12-28 23:38:20 -08:00

lock.rs

lock: use exponential backoff

2020-12-25 15:08:49 -08:00

matchers.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

op_store.rs

view: add tracking of "public" heads (copying Mercurial's phase concept)

2021-01-16 11:48:35 -08:00

operation.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

protos.rs

protobuf: generate code at build-time

2020-12-24 01:05:17 -08:00

repo_path.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

repo.rs

transaction: write incremental index on commit

2021-02-15 11:03:41 -08:00

rewrite.rs

rewrite: make merge_commit_trees() use index for finding common ancestors

2021-02-23 20:49:18 -08:00

settings.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

simple_op_store.rs

view: add tracking of "public" heads (copying Mercurial's phase concept)

2021-01-16 11:48:35 -08:00

store_wrapper.rs

git: return a new repo instance from the store instead of the store's instance

2020-12-28 23:38:20 -08:00

store.rs

git: return a new repo instance from the store instead of the store's instance

2020-12-28 23:38:20 -08:00

testutils.rs

init: add support for creating new repo backed by bare git repo in .jj/git/

2020-12-28 00:54:03 -08:00

transaction.rs

transaction: write incremental index on commit

2021-02-15 11:03:41 -08:00

tree_builder.rs

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

2020-12-12 00:23:38 -08:00

tree.rs

trees: make entries() function be the recursive one, since it's more common

2020-12-20 00:26:06 -08:00

trees.rs

commands: add an interactive mode for jj restore

2020-12-26 01:16:19 -08:00

view.rs

view: replace View trait by enum with Readonly and Mutable variants

2021-02-13 08:31:41 -08:00

working_copy.rs

working_copy: preserve executable bit on Windows

2021-02-07 00:50:21 -08:00