Klaas Freitag
d65b9aa404
Fixed exclude test.
2013-09-03 15:15:14 +02:00
Klaas Freitag
8b224e2c0a
Don't warn about a finished sqlite3 query.
2013-09-03 11:47:19 +02:00
Klaas Freitag
ce554eb44a
Let csync exclude report the exclude reason.
2013-09-02 17:23:17 +02:00
Daniel Molkentin
bff9b3843f
0.83.0
2013-08-23 14:35:45 +02:00
Olivier Goffart
ef1a47a5a2
Save the database with the new propagator
2013-08-21 15:42:03 +02:00
Olivier Goffart
3a57eb1b54
Add the size in the TREE_WALK_FILE structur
2013-08-21 13:24:49 +02:00
Olivier Goffart
79c1514a2b
Chenge the headers to LGPL for the file that were added in the dav branch
...
The LGPL changes was not merged for the new files
2013-08-21 13:23:52 +02:00
Olivier Goffart
9527b9f4d2
Compile fix
...
That file was removed
2013-08-21 12:59:22 +02:00
Klaas Freitag
6d259f80e0
Remove file.
2013-08-19 17:01:33 +02:00
Klaas Freitag
0afbbeb8dc
Log the new module capabilities.
2013-08-19 17:01:21 +02:00
Klaas Freitag
4dbee1015f
Some minor compile fixes.
2013-08-19 17:00:56 +02:00
Olivier Goffart
835813a86f
Fix the tests after merge
2013-08-18 20:13:27 +02:00
Olivier Goffart
b4efcf1627
Compile the tests after merge
...
(Still not passing)
2013-08-18 19:11:36 +02:00
Olivier Goffart
56d5359f5b
Fix compilation after merge
...
Still untetested
2013-08-18 18:55:32 +02:00
Klaas Freitag
e0d121d370
More minor cleanups.
2013-08-18 18:18:05 +02:00
Klaas Freitag
a5de9994ec
Set a proper error message on in-between-changes.
2013-08-18 18:18:05 +02:00
Olivier Goffart
d098a12321
leak fix
2013-08-18 18:18:05 +02:00
Daniel Molkentin
6cda2f0c24
Do not report removable ignored files
2013-08-18 17:52:45 +02:00
Olivier Goffart
4e04a2ccb0
Addapt to new error codes
2013-08-18 17:29:23 +02:00
Markus Goetz
b923554935
Revert "DB: Don't use metadata_tmp table"
...
Let's not do this in the release branch
This reverts commit 79f72a1211
2013-08-18 17:13:19 +02:00
Markus Goetz
6474780d80
Revert "DB: More easy IO mode"
...
This reverts commit ea6caed5a3
2013-08-18 17:12:59 +02:00
Markus Goetz
79f72a1211
DB: Don't use metadata_tmp table
...
Not sure why this was ever needed
2013-08-18 17:05:04 +02:00
Olivier Goffart
ec8adf2bd7
Fix compilation of src/std after merge
2013-08-18 16:51:02 +02:00
Olivier Goffart
2afdc9d095
Adapt to new multybyte api after merge
...
(Search and replace)
2013-08-18 16:43:46 +02:00
Olivier Goffart
9f5388544a
Fix cmake after merge
...
iniparser dependency is gone.
2013-08-18 16:29:35 +02:00
Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Markus Goetz
ea6caed5a3
DB: More easy IO mode
...
We move the DB anyway at the end, no need to be so harsh
2013-08-18 16:10:30 +02:00
Olivier Goffart
868f8029a2
Close the database file in all cases.
...
If the database was empty, we forgot to close the file descriptor,
making it impssible to remove the database and replace it with the real
one
2013-08-16 12:23:26 +02:00
Olivier Goffart
14219a1ea5
Log error of sqlite3_close
2013-08-15 18:39:26 +02:00
Daniel Molkentin
1663c84db7
Return an error if rename fails on win32.
...
Amends 9ea39dbaa9
2013-08-15 18:06:27 +02:00
Klaas Freitag
9ea39dbaa9
win32: Retry renaming in case of access denied.
2013-08-15 17:40:30 +02:00
Klaas Freitag
d3ec897fee
Bump version to 0.82.0
2013-08-15 17:39:00 +02:00
Olivier Goffart
38a5ff42e0
show the errno in the debug when renaming the db fails
2013-08-15 13:51:57 +02:00
Klaas Freitag
274da3ad0b
std: Fix uninitialized rc that polutes return value.
2013-08-14 19:03:36 +02:00
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Klaas Freitag
74b7d441c8
Bump version to 0.81.0
2013-08-08 16:00:20 +02:00
Klaas Freitag
1df602be26
Updated changelog for 0.81.0
2013-08-08 15:51:30 +02:00
Daniel Molkentin
d75f807c01
Send OC-Total-Length
...
As per https://github.com/owncloud/core/issues/4343
2013-08-08 00:48:48 +02:00
Klaas Freitag
2d3272182b
Add correct cast to 64 bit type.
2013-08-07 16:58:46 +02:00
Daniel Molkentin
444946ae79
Fix update test
2013-08-07 16:58:29 +02:00
Daniel Molkentin
6a6bfd1c89
Use proper compiler switch
2013-08-07 16:58:09 +02:00
Klaas Freitag
26c0bbd0eb
open test db in test correctly.
2013-08-07 15:39:30 +02:00
Klaas Freitag
0191fa43e0
Fix tests after statedb_open had moved.
2013-08-07 12:43:32 +02:00
Klaas Freitag
76ee4cb3ba
Add symlinks to the file tree with instruction IGNORE
2013-08-07 12:14:29 +02:00
Klaas Freitag
7b22972630
Add excluded files to the tree with IGNORE instruction
2013-08-06 18:01:34 +02:00
Klaas Freitag
d88a5e1b11
Rename progress init function to reasonable name.
2013-08-06 15:42:02 +02:00
Klaas Freitag
d585742609
Log if the Etag in the journal is empty.
2013-08-06 12:12:53 +02:00
Klaas Freitag
d910a3af8b
Notify sync start and end always.
2013-08-06 12:12:52 +02:00
Olivier Goffart
6ad2920809
Load the statedb in csync_update rather than in csync_init.
...
This also allow to reduce duplicate code in csync_commit, and ease the
error reporting of csync_commit
csync_commit is supposed to be done after the previous sync, it is
better to open the statedb before the sync
2013-08-06 12:12:52 +02:00
Klaas Freitag
a42d942a35
Finalize progress before error handling.
2013-08-06 12:12:52 +02:00
