History

Commits on ig/commit-debug to lib/src3255+

transaction: keep whole operation objects, not just IDs, of parents (#111)Martin von Zweigbergk committed 4 years ago4d64687
repo: when merging in removed head, rebase descendants (#111)Martin von Zweigbergk committed 4 years ago04ad9a3
repo: clarify that some repo functions load the repo at head (#111)Martin von Zweigbergk committed 4 years agoec84de7
repo: make resolution of concurrent operations a separate step (#111)Martin von Zweigbergk committed 4 years agoa38dd9d
transaction: check that we haven't forgotten to rebase descendants (#111)Martin von Zweigbergk committed 4 years agoe384f97
cli: move optimization for no-op rebases into `MutableRepo` (#111)Martin von Zweigbergk committed 4 years agoeb333dc
repo: move resolving of concurrent operations to repo level (#111)Martin von Zweigbergk committed 4 years ago11525bf
op_heads_store: remove `Result` that never fails (#111)Martin von Zweigbergk committed 4 years ago364f801
op_heads_store: move lock and updating of heads on disk to new type (#111)Martin von Zweigbergk committed 4 years ago40aa974
view: move merging of views up to repo level (#111)Martin von Zweigbergk committed 4 years ago39838a7
repo: don't abandon empty commit if it has descendantsMartin von Zweigbergk committed 4 years agoa663a5d
config: move reading of config from lib crate to CLI crateMartin von Zweigbergk committed 4 years ago1d3f909
cargo: upgrade the `config` crate from 0.11.0 to 0.12.0Martin von Zweigbergk committed 4 years ago3f24411
working_copy: let caller pass in base Git ignores (#65, #87)Martin von Zweigbergk committed 4 years agod56ae79
gitignore: move function for chaining .gitignore to central place (#65, #87)Martin von Zweigbergk committed 4 years ago51da2a2
gitignores: remove error type that's never instantiatedMartin von Zweigbergk committed 4 years agoe7a7cb8
diff: add helpers for finding index for non-base sideMartin von Zweigbergk committed 4 years ago6fabf89
tests: set user and email in e2e testsMartin von Zweigbergk committed 4 years agoa9eebe7
settings: read and parse timestamp from config only onceMartin von Zweigbergk committed 4 years ago9702684
settings: allow setting author/commit timestamp via configMartin von Zweigbergk committed 4 years ago18861c6
commit_builder: move `signature()` to `UserSettings`Martin von Zweigbergk committed 4 years agoe0115d2
diff: switch from BTreeMap to sorted Vec for unchanged rangesMartin von Zweigbergk committed 4 years agofc1731a
diff: also sort base ranges by end pointMartin von Zweigbergk committed 4 years ago934564b
cli: on `jj init --git-repo=.`, use relative path to `.git/`Martin von Zweigbergk committed 4 years ago42252a2
tests: pass timestamps via env vars for reproducible hashesMartin von Zweigbergk committed 4 years ago0c6d895
cleanup: run rustfmtMartin von Zweigbergk committed 4 years ago648cfd6
lib/settings: try to load from platform config_dirCole Mickens committed 4 years agofbe8eb4
build: suppress `unstable_name_collisions` warnings on stableWaleed Khan committed 4 years ago76974a9
build: conditionally use `map_first_last` feature if availableWaleed Khan committed 4 years ago9202aae
build: use `assert_matches` crateWaleed Khan committed 4 years agodd3272f
build: add shims for nightly feature `map_first_last`Waleed Khan committed 4 years ago261cd1a
cli: don't panic on invalid configMartin von Zweigbergk committed 4 years ago108b785
repo: remove code for upgrading old repos to have `.jj/store/git/`Martin von Zweigbergk committed 4 years ago7c24711
working_copy: take `Tree`, not `CommitId`, as argument to `check_out()`Martin von Zweigbergk committed 4 years ago03e6b8c
working_copy: take a tree object instead of ID in `TreeState::check_out()`Martin von Zweigbergk committed 4 years ago315e5e8