|
11495e04
|
2019-07-12T20:12:06
|
|
tweak 'got rebase' conflict error message
|
|
|
1ee397ad
|
2019-07-12T19:06:56
|
|
allow error return from got_worktree_checkout_cb()
|
|
|
4ba9c4f6
|
2019-07-11T22:43:29
|
|
fix wrong sandbox name used by a rebase test
|
|
|
787c8eb6
|
2019-07-11T22:40:44
|
|
fix extra whitespace in rebased log messages
Trim leading and trailing whitespace from log messages when creating
commits. Fixes a rebase issue but should be a good idea in general.
|
|
|
64c6d990
|
2019-07-11T16:37:36
|
|
prevent rebase in a work tree with an incompatible path prefix
|
|
|
7d5807f4
|
2019-07-11T14:57:24
|
|
disallow 'got update' and 'got commit' while rebase is in progress
|
|
|
dcf44d04
|
2019-07-11T14:45:25
|
|
revert accidental change; run all rebase tests again
|
|
|
ff0d2220
|
2019-07-11T13:59:20
|
|
handle no-op changes during 'got rebase -c'
|
|
|
818c7501
|
2019-07-10T18:23:39
|
|
initial 'got rebase' implementation
|
|
|
2b496619
|
2019-07-10T22:41:08
|
|
fix bug exposed by test_commit_added_and_modified_in_same_dir
|
|
|
4866d084
|
2019-07-10T22:17:20
|
|
add an xfail test for a bug in 'got commit'
|
|
|
1ab61ced
|
2019-07-10T16:33:43
|
|
use absolute path for reference in got/worktree namespace
|
|
|
461aee03
|
2019-06-29T23:26:06
|
|
fix test sandbox name
|
|
|
a484d721
|
2019-06-10T12:10:37
|
|
don't report base-bump-only updates as 'already up to date'
|
|
|
1a36436d
|
2019-06-10T11:58:32
|
|
relax out-of-dateness check for 'got commit'
|
|
|
a5e55564
|
2019-06-10T11:33:29
|
|
fix sandbox name used by test_update_bumps_base_commit_id
|
|
|
e20a8b6f
|
2019-06-04T16:35:01
|
|
allow multiple file path arguments for 'got revert'
|
|
|
5cc8c93b
|
2019-06-02T21:37:50
|
|
hook up backout.sh test
|
|
|
a7648d7a
|
2019-06-02T21:35:20
|
|
consistently use leading upper-case for messages indicating success
|
|
|
17ed4618
|
2019-06-02T21:24:17
|
|
allow removing multiple paths at once for 'got rm'
|
|
|
5ef14e63
|
2019-06-02T20:50:34
|
|
add 'got backout' command
|
|
|
03415a1a
|
2019-06-02T20:31:34
|
|
allow 'got cherrypick' with a root commit (adds all files in commit)
|
|
|
2b92fad7
|
2019-06-02T17:52:19
|
|
test and fix expected file status after 'got cherrypick'
|
|
|
234035bc
|
2019-06-01T13:35:47
|
|
add 'got cherrypick' command
|
|
|
aaa13589
|
2019-06-01T15:25:13
|
|
generalize got_diff_tree() by adding a diff output callback
|
|
|
5e54fb30
|
2019-05-31T14:57:57
|
|
test and fix 'got revert' with a path in a sub-directory
Relax input path requirements of got_object_id_by_path() to
make things easier to callers. Allows the revert code to pass
a path from the file index in lieu of a repository path.
|
|
|
a1fb16d8
|
2019-05-24T14:51:46
|
|
make moved branch head references easier to deal with
|
|
|
f363d663
|
2019-05-23T10:25:19
|
|
add a test for 'got commit' with a conflicted file
|
|
|
cc43886e
|
2019-05-22T15:28:17
|
|
improve wording of an error message
|
|
|
d969fa15
|
2019-05-22T15:20:10
|
|
inform the user when switching branches
|
|
|
c932eeeb
|
2019-05-22T10:25:50
|
|
make 'got update' bump the base commit ID of unchanged files
This change makes it actually possible to get around commit-time
out-of-dateness by running 'got update'.
The test added with this commit shows that our out-of-dateness
check is currently too simplistic; an update is required between
any two commit operations! It would be better to allow commits to
proceed until a situation arises where file content must be merged.
|
|
|
e4d984c2
|
2019-05-22T10:02:45
|
|
expand test coverage: partial update with parent dir as argument
|
|
|
a3df2849
|
2019-05-20T16:02:16
|
|
fix bug reproduced by xfail test 'test_commit_added_subdirs'
|
|
|
45d344f6
|
2019-05-14T14:31:54
|
|
make 'got checkout' verify that specified branch and commit match
|
|
|
a367ff0f
|
2019-05-14T14:23:00
|
|
make 'got update' verify that provided commit and branch match
|
|
|
024e9686
|
2019-05-14T13:22:16
|
|
add branch support to 'got update'
|
|
|
8d301dd9
|
2019-05-14T11:35:15
|
|
use cmp -s, instead of cmp, in all command line tests
|
|
|
3eada727
|
2019-05-14T11:33:09
|
|
cosmetic tweak to xfail test output
|
|
|
8ba6ba2d
|
2019-05-14T11:31:57
|
|
add new test test_commit_added_subdirs (xfail)
|
|
|
3941b73a
|
2019-05-14T11:30:38
|
|
allow cmdline tests to report test result 'xfail' (expected failure)
|
|
|
638f9024
|
2019-05-13T12:40:57
|
|
rename got_error_prefix_errno() to got_error_from_errno()
|
|
|
d5bea539
|
2019-05-13T10:56:28
|
|
fix linear ancestry verification check for 'got update'
|
|
|
2f17228e
|
2019-05-11T21:18:39
|
|
lock branch reference file during 'got commit' to prevent a race
|
|
|
1dd54920
|
2019-05-11T18:50:57
|
|
open the file index just once when adding multiple files
|
|
|
2b01eb6c
|
2019-05-11T18:49:40
|
|
verify expected output in test_add_multiple and actually run this test
|
|
2af4a041
|
2019-05-11T16:21:20
|
|
got_error_set_errno: take a char arg to pass to got_error_prefix_errno
$> got rm a
got: : No such file or directory
becomes
$> got rm a
got: /path/to/a: No such file or directory
|
|
|
723c305c
|
2019-05-11T15:53:37
|
|
got: support adding multiple files at a time
make adding files already in the file-index not a fatal error
|
|
|
230a42bd
|
2019-05-11T13:04:38
|
|
got_error_from_errno -> got_error_prefix_errno
also add got_error_prefix_errno2 and got_error_prefix_errno3 which
should hopefully all be merged into a single function with variadic
args (but can't alloc mem)
|
|
|
324d37e7
|
2019-05-11T09:14:30
|
|
make got path APIs available to library consumers
|
|
|
7b67836a
|
2019-05-10T18:45:27
|
|
run tests with MALLOC_OPTIONS=S
|
|
|
83a7ae6d
|
2019-05-10T18:38:59
|
|
revert previous
|
|
|
3ffe981f
|
2019-05-10T18:38:23
|
|
fix tree_entry_dup error path
|
|
|
c3754a5b
|
2019-05-10T17:30:26
|
|
make GOT_AUTHOR available to all cmdline tests
|
|
|
819f385b
|
2019-05-10T11:16:09
|
|
ensure that commits use intended base blobs for changes
|
|
|
5bbcb68b
|
2019-05-09T15:47:46
|
|
add another commit test
|
|
|
bc70eb79
|
2019-05-09T15:45:21
|
|
fix bug in concurrent commit check and add another commit test
|
|
|
a0275e40
|
2019-05-09T14:59:16
|
|
hook up commit regress tests
|
|
|
35bd8fed
|
2019-05-09T14:57:06
|
|
require GOT_AUTHOR environment variable
|
|
|
135819da
|
2019-05-09T13:47:18
|
|
don't create unrelated files in basic commit test
|
|
|
baa7dcfa
|
2019-05-08T20:00:37
|
|
don't visit added subtrees reundantly
|
|
|
afa376bf
|
2019-05-08T19:18:45
|
|
report commit item status
|
|
|
036813ee
|
2019-05-08T12:17:01
|
|
more progress on commits: write trees recursively
|
|
|
9b6578d8
|
2019-05-08T11:58:16
|
|
make regress build again
|
|
|
c4296144
|
2019-05-07T10:17:36
|
|
WIP commit implementation
|
|
|
c4cdcb68
|
2019-04-03T16:17:53
|
|
add support for partial updates, which affect specific paths only
|
|
|
a129376b
|
2019-03-29T00:04:52
|
|
add initial implementation of 'got revert'
|
|
|
66b11bf5
|
2019-03-27T12:58:26
|
|
add a test for wt rm vs repo rm
|
|
|
fc6346c4
|
2019-03-27T12:51:30
|
|
don't leave file as unversioned in case of wt edit vs repo rm
|
|
|
13d9040b
|
2019-03-27T12:33:41
|
|
test and improve behaviour for wt edit vs repo rm conflict
|
|
|
085d5bcf
|
2019-03-27T12:03:38
|
|
use a better naming scheme for tree conflict tests
|
|
|
708d8e67
|
2019-03-27T12:00:59
|
|
fix behaviour when update deletes an edited file
|
|
|
95adcdca
|
2019-03-27T09:47:18
|
|
add some diff tests
|
|
|
7154f6ce
|
2019-03-27T09:22:15
|
|
make 'got status' detect and indicate merge conflict markers
|
|
|
3165301c
|
2019-03-27T08:23:30
|
|
test conflict resolution in test_update_conflict_add_vs_add
|
|
|
1430b4e0
|
2019-03-27T08:18:28
|
|
treat 'add vs add' on update as a text conflict for now
|
|
|
a7c182ac
|
2019-03-27T07:55:04
|
|
missing error return in test_double_add
|
|
|
71a29355
|
2019-03-27T07:48:54
|
|
fix behaviour when 'got rm' is used twice
|
|
|
5c99ca9f
|
2019-03-27T07:41:37
|
|
fix behaviour when 'got add' is used twice
|
|
|
2ec1f75b
|
2019-03-26T10:35:33
|
|
add a basic implementation of 'got rm'
|
|
|
6dbf1e9e
|
2019-03-26T09:05:25
|
|
ironically I forgot to add 'add' regression tests in previous commmit
|
|
|
d00136be
|
2019-03-26T09:03:53
|
|
implement a basic 'got add' command
|
|
|
a6a41c00
|
2019-03-18T17:19:19
|
|
actually add log.sh tests to 'make regress'
|
|
|
b70703ad
|
2019-03-18T17:16:10
|
|
fix bugs in got_repo_map_path() and add more related tests
|
|
|
e7301579
|
2019-03-18T16:54:15
|
|
fix 'got log PATH' in a bare git repository; broken by previous
|
|
|
cbd1af7a
|
2019-03-18T16:41:10
|
|
make 'got log PATH' work consistently from inside a work tree
|
|
|
517bab73
|
2019-03-11T19:06:13
|
|
deduplicate code for constructing a worktree's base ref name
|
|
|
0cd1c46a
|
2019-03-11T18:07:33
|
|
create references to base commits of got worktrees
|
|
|
9e672c74
|
2019-03-11T14:56:04
|
|
implement got_ref_write()
|
|
|
c442a90d
|
2019-03-10T15:55:28
|
|
read UUID back from work tree meta data
|
|
|
ec22038e
|
2019-03-10T15:45:57
|
|
add a UUID to work tree meta data
|
|
|
3cbbd752
|
2019-02-19T12:55:43
|
|
fix get_file_status() for files larger than blob read buffer size
|
|
|
fb43ecf1
|
2019-02-11T11:59:09
|
|
check for errors from fclose()
|
|
|
2c201a36
|
2019-02-10T16:41:44
|
|
make 'got status' ignore symlinks, for now
|
|
|
18831e78
|
2019-02-10T16:32:21
|
|
fix another path ordering bug during status/update crawl
|
|
|
1545c615
|
2019-02-10T13:23:52
|
|
show commit id after update even if all files were missing
|
|
|
a378724f
|
2019-02-10T13:20:43
|
|
make 'got update' restore missing files
|
|
|
e60e7f5b
|
2019-02-10T13:03:27
|
|
properly deal with "$?" in cmdline tests; fixes spurious test "ok"
|
|
|
02c07007
|
2019-02-10T12:46:14
|
|
don't update cached timestamps of already modified files
|
|
|
ba8a0d4d
|
2019-02-10T12:30:06
|
|
clear executable bit when updating files if necessary
|
|
|
2ef81b9b
|
2019-02-10T12:10:40
|
|
skip make obj in cmdline test directory
|