Commits

Commit:
26abd4a4dbcaa5d4993aa122348011c32cee77b6
From:
Stefan Sperling <stsp@stsp.name>
Date:
typo
diff | patch | tree
Commit:
296304f3026bc0c9cd1969929e3df3b4aebcc2cf
From:
Stefan Sperling <stsp@stsp.name>
Date:
document how profiling works
diff | patch | tree
Commit:
7a6dddaefd504a582aa1d600185cdd18cb338e4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to profile gotweb; tracey had the same diff
diff | patch | tree
Commit:
245c7240766e65f25db986d5d28da9a9b92826e6
From:
Stefan Sperling <stsp@stsp.name>
Date:
unveil gmon.out if gotweb is being profiled ok tracey
diff | patch | tree
Commit:
9ec58fff16b1c2fc1d33d9955b42cadaa9e26f29
From:
Stefan Sperling <stsp@stsp.name>
Date:
use socketpair(2) instead of pipe(2) for bi-directional communication On Linux, pipes returned from pipe(2) only work in one direction. This broke 'got clone' over ssh in the -portable version because got-fetch-pack assumes it can use its fetchfd for both reading and writing. I wrote a complicated diff to use two pipe(2) calls instead of one, but millert suggested a simpler solution: Use socketpair(2) instead of pipe(2). ok millert jrick tracey
diff | patch | tree
Commit:
8e09a16893e9f1d76a82e99d79fbceaabb6f4bd0
From:
Tracey Emery <tracey@traceyemery.net>
Date:
fix hang in commit regress test. ok stsp
diff | patch | tree
Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.
diff | patch | tree
Commit:
1d0f405485b02cc4480ea188879e4122e0ea32bd
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for close(2) error in got_repo_close() and propagate errors up ok tracey
diff | patch | tree
Commit:
991ff1aa4f423a1faea1bae0e85a913a88038309
From:
Tracey Emery <tracey@traceyemery.net>
Date:
close all opened repo->gitdir_fd's and set open_repo static. ok naddy (with static change)
diff | patch | tree
Commit:
0d15f6dcf929ae42606d3ca046621aee79e45890
From:
Stefan Sperling <stsp@stsp.name>
Date:
in addblk(), only read data into buffer1 if we will compare it to buffer2 suggested by and ok naddy@
diff | patch | tree
Commit:
68bdcdc2f5d3c37d918f85368c2537a8aa7d90eb
From:
Stefan Sperling <stsp@stsp.name>
Date:
addblk() may seek in its input file; reposition the file pointer afterwards
diff | patch | tree
Commit:
a893025fd207950945eed1482170223a2d3b9ce3
From:
Stefan Sperling <stsp@stsp.name>
Date:
addblk: iterate over the correct number of entries after growing the array ok naddy
diff | patch | tree
Commit:
e89540a95a268f47ef2d1b24c41fbb72a1f0bdc9
From:
Stefan Sperling <stsp@stsp.name>
Date:
addblk: be more careful about expanding the blocks array when we outgrow it fixes + ok naddy
diff | patch | tree
Commit:
51a494da48acb57ed84501a6d10f39ed624c711e
From:
Stefan Sperling <stsp@stsp.name>
Date:
check a block's hash as well as its length before expensive comparisons suggested by + ok naddy, and Ori agrees
diff | patch | tree
Commit:
282f42e5d1095015379b49280429e558b3bbc4fe
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove stray debug print which was accidentally committed
diff | patch | tree
Commit:
0c9eeee21134b27edd7528f489391f9ded46ffb1
From:
Stefan Sperling <stsp@stsp.name>
Date:
avoid uninitialized error being returned from got_repo_get_packfile_info()
diff | patch | tree
Commit:
3b9e6fcfb6688f928cfe62fee08d34d6c8d85992
From:
Stefan Sperling <stsp@stsp.name>
Date:
simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack' tweak + ok naddy
diff | patch | tree
Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.
diff | patch | tree
Commit:
1af628f4bfa50c224b392a774e72a213c97f6009
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
diff | patch | tree
Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e
From:
Stefan Sperling <stsp@stsp.name>
Date:
decouple merge_file() parameters for 2nd derived version and merge target file
diff | patch | tree
Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
From:
Stefan Sperling <stsp@stsp.name>
Date:
in merge_file(), remove allocation of a base_path which is unused
diff | patch | tree
Commit:
07bb0f933a402d7387f7dd360060c55cdd1b56c0
From:
Stefan Sperling <stsp@stsp.name>
Date:
move merge_file()'s f_deriv parameter next to the f_orig parameter
diff | patch | tree
Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4
From:
Stefan Sperling <stsp@stsp.name>
Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
diff | patch | tree
Commit:
67a666476ff7ffc6e95f7d9b994a8f7b01cb86e5
From:
Stefan Sperling <stsp@stsp.name>
Date:
refactor merge_file() such that it no longer requires a blob object parameter
diff | patch | tree
Commit:
3cd22b214454d9973c61426c8a4bd7cf2f8de6ae
From:
Stefan Sperling <stsp@stsp.name>
Date:
add an xfail test for a cherrypick bug where unrelated changes get merged The test case I am using here is a bit large but I could not yet find a way to make it smaller. If someone knows a smaller test case, please let me know. naddy caught a small bug in the new test code I had written, thanks!
diff | patch | tree