GitLab

603b1b6a clippy: global constants are implicitly 'static
b0dd2860 test: prefer const rather than static globals
99544e42 clippy: use Self where possible
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !58

3e718950 MergeCommand: add a lifetime
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !51

This is required because otherwise the merge command can be extracted
and the workarea dropped leaving the command stranded without a working
directory.

74ca83b4 GitWorkArea: require a mutable reference to checkout files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !56

081d10b2 prepare: use the Copy impl of DateTime
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !48

00ec5058 cargo: update itertools
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !57

6b840f40 prepare: remove an unused mut
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !55

4eed957b prepare: fix more submodule name/path mixups
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !54

8a26dd5c prepare: submodule directories are as their name, not path
289bece4 Merge branch 'submodule-add-renamed' into submodule-custom-name
d3403269 submodule: add at the root commit with a custom name
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !53

* submodule-add-renamed:
  submodule: add at the root commit with a custom name

2881e100 changelog: add a changelog
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !52

bc725479 prepare: support creating update merges
6b4ec649 prepare: remove inaccurate commit
acc77919 test: ensure that the new tree is correct
c58d80ee test: remove unnecessary variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !50

45e6fa0e prepare: accept any IntoIterator for checking out paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !49

Basically, the same as a regular merge except that the `ours` strategy
is used.

5541360f MergeResult: fix a doc comment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !47

The comment was from before a proper structure was returned. Now that
`MergeCommand` exists, there are methods rather than direct environment
manipulations.

Our update to chrono 0.4 changes one of our existing public interfaces
and therefore requires a major version bump.

35e14129 chrono: update to 0.4
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !46

7ef55a94 cargo: update to itertools 0.6
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !45