ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Commit graph

  • 0137acd0a8 cargo: release 0.1.1 Martin von Zweigbergk 2021-01-03 22:55:16 -0800
  • 3e048cd121 commands: change "about" line to match the parenthesis in Cargo.toml Martin von Zweigbergk 2021-01-03 22:53:25 -0800
  • 762a367174 commands: set application version based on Cargo.toml Martin von Zweigbergk 2021-01-03 22:50:39 -0800
  • 19adac7c50 cargo: set binary name to jj, not new crate name jujube Martin von Zweigbergk 2021-01-03 10:37:47 -0800
  • b40a40990b cargo: add version to jujube-lib dependency Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • bb4b028b2b cargo: fill in crates.io metadata Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • abc9dc1733 cargo: rename crates to names available on crates.io Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • f88e8b6086 evolve: update working copy at end (if applicable) Martin von Zweigbergk 2021-01-02 20:15:21 -0800
  • ba4d2c8a24 commands: respect $EDITOR from environment Martin von Zweigbergk 2021-01-02 19:38:41 -0800
  • d7b9bd55e8 git: remove unnecessary taking of reference (reported by clippy) Martin von Zweigbergk 2021-01-02 19:27:51 -0800
  • e2d6252766 git: on push, check that remote branch was actually updated Martin von Zweigbergk 2021-01-02 10:08:23 -0800
  • 7542c484a8 git: pass ssh credentials from ssh-agent on push Martin von Zweigbergk 2021-01-02 00:24:10 -0800
  • 14fe58e76a git: use thiserror for errors Martin von Zweigbergk 2021-01-01 12:53:07 -0800
  • 5b8e10394d transaction: add a message to check for unclosed transaction Martin von Zweigbergk 2021-01-01 11:07:24 -0800
  • 77bb8b600b git: add a jj git clone command to make it easier to get started Martin von Zweigbergk 2021-01-01 10:59:46 -0800
  • e14db781b0 git: add subcommand for fetching from remote Martin von Zweigbergk 2020-12-31 09:56:20 -0800
  • 7e65a3d589 git: restructure test a bit to make the functions more reusable Martin von Zweigbergk 2020-12-31 22:34:24 -0800
  • d741abf5a2 git: make arguments of jj git push named flags instead of positional Martin von Zweigbergk 2020-12-31 23:25:57 -0800
  • 634a04e234 git: return error instead of panicking on unexpected libgit2 error Martin von Zweigbergk 2020-12-31 09:44:58 -0800
  • aea1ea3707 commands: print help if no sub[sub]command given Martin von Zweigbergk 2020-12-30 00:15:02 -0800
  • 3a67952215 git: add command for refreshing heads based on git refs Martin von Zweigbergk 2020-12-30 00:05:19 -0800
  • ff3b20c537 git: import git refs as anonymous heads when creating Git-backed repo Martin von Zweigbergk 2020-12-29 23:19:39 -0800
  • 4235ea975d tests: clarify a test slightly by moving assertion of out helper Martin von Zweigbergk 2020-12-29 23:37:09 -0800
  • 8377000fd9 git: add a function for updating heads from git refs Martin von Zweigbergk 2020-12-28 23:31:48 -0800
  • 905a5c97d6 transaction: make sure set of heads has only heads Martin von Zweigbergk 2020-12-29 20:00:28 -0800
  • 0d85850017 git: return a new repo instance from the store instead of the store's instance Martin von Zweigbergk 2020-12-28 23:38:20 -0800
  • a8a9f7dedd init: add support for creating new repo backed by bare git repo in .jj/git/ Martin von Zweigbergk 2020-12-28 00:26:37 -0800
  • e82197d981 git: extract function for pushing commit to remote branch, and test it Martin von Zweigbergk 2020-12-27 17:41:20 -0800
  • 55a7621c45 commands: fix a formatting error Martin von Zweigbergk 2020-12-27 17:07:13 -0800
  • d481001271 commands: add a jj git push command Martin von Zweigbergk 2020-12-26 18:24:29 -0800
  • 09e474a05a commands: split up definition of Clap App to help rustfmt Martin von Zweigbergk 2020-12-26 18:59:06 -0800
  • 06401fc30d Fix typo Erjan Kalybek 2020-12-25 09:53:58 +0100
  • 67d496a668 commands: add a command for splitting a commit in two Martin von Zweigbergk 2020-12-26 11:14:44 -0800
  • c04aa43232 commands: make edit_description() take just the initial description Martin von Zweigbergk 2020-12-26 11:44:33 -0800
  • a39b44f5cc commands: add command for editing contents of a commit Martin von Zweigbergk 2020-12-26 11:01:23 -0800
  • 3280d75ff4 diff_edit: mark "before" directory readonly to clarify to user Martin von Zweigbergk 2020-12-26 10:34:58 -0800
  • b6192a7ed5 diff_edit: add missing copyright header Martin von Zweigbergk 2020-12-26 11:47:13 -0800
  • b820eddde3 commands: add an interactive mode for jj restore Martin von Zweigbergk 2020-12-25 19:13:01 -0800
  • fa44ef8d1b conflicts: add another helper for writing materialized conflict to store Martin von Zweigbergk 2020-12-25 23:55:18 -0800
  • 9ade41078a working_copy: remove a working_copy_path argument I missed earlier Martin von Zweigbergk 2020-12-26 00:19:21 -0800
  • 4ce2aed17f lock: use exponential backoff Martin von Zweigbergk 2020-12-25 15:08:49 -0800
  • 9138de6ff2 git_store: prevent conflict data from being GC'd Martin von Zweigbergk 2020-12-25 00:20:56 -0800
  • 3613fe3f59 git_store: avoid confusing delegation from write_conflict() to write_file() Martin von Zweigbergk 2020-12-24 23:28:00 -0800
  • 8cca56ee77 git_store: extract function for retrying note-writing Martin von Zweigbergk 2020-12-24 23:21:06 -0800
  • ddf8416d92 git_store: use exponential backoff when retrying note-writing Martin von Zweigbergk 2020-12-24 22:56:05 -0800
  • 210405b21a cargo: update dependencies Martin von Zweigbergk 2020-12-23 20:55:12 -0800
  • 9c8f13608f cargo: update blake2 Martin von Zweigbergk 2020-12-24 01:15:38 -0800
  • c7ee24727a protobuf: generate code at build-time Martin von Zweigbergk 2020-12-23 23:12:18 -0800
  • 4619942a57 evolution: add support for updating state incrementally Martin von Zweigbergk 2020-12-21 13:27:16 -0800
  • ea7a6b9ce1 evolution: keep track of non-obsolete commits per change id Martin von Zweigbergk 2020-12-23 17:21:26 -0800
  • 6807407814 evolution: fix it so pruned commits can be divergent Martin von Zweigbergk 2020-12-23 17:46:01 -0800
  • cc9008c6bb evolution: create State struct in place Martin von Zweigbergk 2020-12-23 09:58:13 -0800
  • 66ba74cf5a evolution: use updated state when resolving descendants of orphans Martin von Zweigbergk 2020-12-23 16:00:10 -0800
  • 0219dbb359 transaction: make evolution_mut() return a mutable reference Martin von Zweigbergk 2020-12-23 01:06:05 -0800
  • 110c083e78 evolution: don't wrap State in Mutex<Option<>> Martin von Zweigbergk 2020-12-22 23:21:02 -0800
  • fce5ec21f6 evolution: make MutableEvolution own its state Martin von Zweigbergk 2020-12-22 23:11:22 -0800
  • 648ec34a4c evolution: move shared implementation onto the State struct Martin von Zweigbergk 2020-12-21 15:38:26 -0800
  • 88e7f4a30c tests: start using the maplit crate Martin von Zweigbergk 2020-12-23 09:39:09 -0800
  • c41251eaff working_copy: fix test to show that already tracked files are not ignored Martin von Zweigbergk 2020-12-22 10:03:42 -0800
  • 3b326a942c working_copy: add support for .gitignore files Martin von Zweigbergk 2020-12-18 22:50:01 -0800
  • 9ad225b3b5 trees: make entries() function be the recursive one, since it's more common Martin von Zweigbergk 2020-12-20 00:26:06 -0800
  • 8ec100713d tree: for walking tree, replace function with callback by iterator Martin von Zweigbergk 2020-12-20 00:07:51 -0800
  • 4734eb6493 working_copy: let WorkingCopy and TreeState have the working copy path Martin von Zweigbergk 2020-12-18 23:50:10 -0800
  • 14e7df995a index: move static functions from Index to IndexFile and delete it Martin von Zweigbergk 2020-12-17 23:03:07 -0800
  • 00fb670c9c index: make Index::load() return Arc<IndexFile> instead of Index Martin von Zweigbergk 2020-12-17 22:59:39 -0800
  • af1760b02e index: load index file eagerly in Index::load() now that Repo::index() is lazy Martin von Zweigbergk 2020-12-17 22:57:41 -0800
  • 2d9aa08334 readme: fix two more little typos Martin von Zweigbergk 2020-12-18 15:46:49 -0800
  • 9f4c3bab5e readme: drop repeated "a merge commit" Martin von Zweigbergk 2020-12-18 14:35:12 -0800
  • 6721b576b7 releasing: add copyright header also to generated files Martin von Zweigbergk 2020-12-15 18:36:23 -0800
  • 4f045561e6 replace placeholder README.md with real content Martin von Zweigbergk 2020-12-12 00:12:04 -0800
  • 6f182fbea4 add .gitignore Martin von Zweigbergk 2020-12-12 00:08:12 -0800
  • 6b1427cb46 import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo Martin von Zweigbergk 2020-12-12 00:00:42 -0800
  • 1fa53a13b0 releasing: add missing trailing newlines to .github/ files Martin von Zweigbergk 2020-12-11 23:44:55 -0800
  • 25caaa0081 Boilerplate for new Google open source project Martin von Zweigbergk 2020-12-11 23:37:25 -0800