Code

History

Commits on ig/commit-debug3745+
  1. revset: forward RevsetExpression::parents()/children() to inner functionsYuya Nishihara committed 2 years ago059fc26
  2. merge_tools: simplify file conflicts before attempting to resolveBenjamin Tan committed 2 years ago7c9f28a
  3. test_resolve_command: accept filename in `check_resolve_produces_input_file`Benjamin Tan committed 2 years ago17c8daa
  4. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  5. test_local_working_copy: add test for snapshotting of edited materialized simplified conflictBenjamin Tan committed 2 years ago716ec37
  6. conflicts: materialize simplified file conflictsBenjamin Tan committed 2 years ago9be3372
  7. conflicts: handle parsing of simplified conflictsBenjamin Tan committed 2 years ago7106f6f
  8. merge: add `get_simplified_mapping` and `update_from_simplified` methodsBenjamin Tan committed 2 years ago0e47216
  9. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  10. revset, templater: implement arity-based alias overloadingYuya Nishihara committed 2 years agoa7bff04
  11. revset, templater: include parameter names in AliasIdYuya Nishihara committed 2 years agod38c9e8
  12. give descendants a range argKyle J Strand committed 2 years ago03a0921
  13. cli `fix`: change default from `-s @` to `-s 'reachable(@, mutable())'`Danny Hooper committed 2 years ago986630b
  14. cli `fix`: add `revsets.fix` config for default revset to be fixedDanny Hooper committed 2 years agofaf9a9d
  15. nix: update nix-direnv 2.3.0 -> 3.0.5Austin Seipp committed 2 years ago3acf985
  16. nix: zstd-compressed debug sections in devShellAustin Seipp committed 2 years ago1eac481
  17. nix: parallel `rustc` frontend in devShellAustin Seipp committed 2 years agoad34d10
  18. nix: use the latest `rust-nightly` toolchain instead of stableAustin Seipp committed 2 years ago749481e
  19. nix: run `nix flake update`Austin Seipp committed 2 years ago4878114
  20. github: bump the github-dependencies group with 2 updatesdependabot[bot] committed 2 years ago06a8bde
  21. In lib, make "testing" feature depend on "git"Jonathan Tan committed 2 years ago4cca845
  22. lib: make git support optional via crate featureMartin von Zweigbergk committed 2 years ago0fd1969
  23. repo/workspace: drop support for old repo formatsMartin von Zweigbergk committed 2 years agobfa0573
  24. revset: migrate syntactic tests to AST-basedYuya Nishihara committed 2 years ago556c729
  25. revset: backport parsing test helpers from templater and filesetYuya Nishihara committed 2 years ago5387014
  26. fileset, templater: in tests, make parse_normalized() unwrap resultYuya Nishihara committed 2 years ago53fa95d
  27. fileset: use parse_into_kind() to test parse errorsYuya Nishihara committed 2 years agoe7e06b6
  28. docs: update windows docs to mention minus, update minus docsIlya Grigoriev committed 2 years ago2d0b715
  29. cargo: bump the cargo-dependencies group with 3 updatesdependabot[bot] committed 2 years agoc71eb73
  30. fix: add support for fixing only some pathsMartin von Zweigbergk committed 2 years ago78cbb51
  31. Show paths of config files when configurations contain errorsSimon Wollwage committed 2 years ago3cd1fe4
  32. diff-editor: pass reference to store into `apply_diff_builtin()`Martin von Zweigbergk committed 2 years ago6a57fa9
  33. docs install_and_setup: move Arch Linux after From SourceIlya Grigoriev committed 2 years agob8d0cf3
  34. docs: disable `main` and `nightly` aliases for `prerelease` versionIlya Grigoriev committed 2 years ago5d57cf1
  35. merged_tree: make tree builder attempt to resolve conflictsMartin von Zweigbergk committed 2 years ago65a988e