 Jelmer Vernooij
|
d22c6926df
Update license merge_base module to the common Dulwich license.
|
4 anni fa |
|
Jelmer Vernooij
|
dcced7ec90
Move tests for merge base out into unittest classes.
|
4 anni fa |
|
kevinhendricks
|
9329be1c60
Add merge_base module.
|
4 anni fa |
|
Jelmer Vernooij
|
1d7b2dbde9
Add some tests for merge base and merge.
|
4 anni fa |
|
Jelmer Vernooij
|
ad368fb1c0
Add test for find_merge_base.
|
4 anni fa |
|
Jelmer Vernooij
|
3a62248b8d
Pass along file_merger argument.
|
4 anni fa |
|
Jelmer Vernooij
|
2741be5e64
Allow passing in a repository location to dulwich.porcelain.merge().
|
4 anni fa |
|
Jelmer Vernooij
|
3be7731f51
Import some fixes from Kevin's branch.
|
4 anni fa |
|
Jelmer Vernooij
|
751be68f0a
Don't pass in other twice. Thanks, Kevin.
|
4 anni fa |
|
Jelmer Vernooij
|
57e4899811
Add some more of the skeleton for merge.
|
4 anni fa |
|
Jelmer Vernooij
|
8c4801fcf9
Add basic function for finding merge base, currently a wrapper around C Git.
|
4 anni fa |
|
Jelmer Vernooij
|
4c0d78c494
Fix import.
|
4 anni fa |
|
Jelmer Vernooij
|
24986435b8
Move EmptyFileException to dulwich.objects.
|
4 anni fa |
|
Jelmer Vernooij
|
bb6b7bc009
Mention the specific file that is empty.
|
4 anni fa |
|
Jelmer Vernooij
|
59ba47f046
Merge commit '183a43059fe40949ef7674626ac2cd2f8eb0a635'
|
4 anni fa |
|
Jelmer Vernooij
|
c7cf7913b6
Update NEWS.
|
4 anni fa |
|
Manuel Jacob
|
bcb4459da4
Use utf-8 instead of file system encoding to convert path to str.
|
4 anni fa |
|
Jelmer Vernooij
|
183a43059f
Simplify the API a bit and fix backwards compatibility, add NEWS item.
|
4 anni fa |
|
Brecht Machiels
|
6fc954bb53
Fix pushing from a shallow clone
|
4 anni fa |
|
Brecht Machiels
|
adf17e155a
Extend test_send_pack_from_shallow_clone test case
|
4 anni fa |
|
Jelmer Vernooij
|
cc49e755d3
Fix test.
|
4 anni fa |
|
Jelmer Vernooij
|
35f6db4ed3
Ignore more special files.
|
4 anni fa |
|
Jelmer Vernooij
|
76912fa975
Don't break when encountering block devices.
|
4 anni fa |
|
Jelmer Vernooij
|
c88a7c5952
Mark test_send_pack_from_shallow_clone as known failing. See #705 anmd #757 for details.
|
4 anni fa |
|
Brecht Machiels
|
1e35b48734
Push from shallow clone test case (triggers #705)
|
4 anni fa |
|
Jelmer Vernooij
|
486755e76f
Start on 0.19.17.
|
4 anni fa |
|
Jelmer Vernooij
|
c6993451a7
Release 0.19.16
|
4 anni fa |
|
Jelmer Vernooij
|
03298e9f0f
Move diffstat module to dulwich.contrib, add NEWS item.
|
4 anni fa |
|
Jelmer Vernooij
|
fed1af2d2f
Fix flake8.
|
4 anni fa |
|
kevinhendricks
|
ff06a7fc73
add a simple diffstat implementation
|
4 anni fa |
