Klaas Freitag
4f47aba1e2
Allow user aborting in chunked uploads
2013-05-16 17:37:30 +02:00
Olivier Goffart
6735b82326
Fix leak
2013-05-14 15:30:56 +02:00
Klaas Freitag
1a648a612e
Merge remote-tracking branch 'ogoffart/rename_folders_merged' into dav
2013-05-13 16:28:31 +02:00
Olivier Goffart
8f3e260ede
fix typo
...
This broke the new propagator
2013-05-10 13:13:02 +02:00
Daniel Molkentin
a75376e6a7
Rename csync_abort -> async_request_abort. Add csync_resume.
2013-05-08 17:33:50 +02:00
Daniel Molkentin
ee5aaf76c5
Introduce csync_abort()
...
If called, it will set a bool in the context,
which will be respected by all expensive visitors.
2013-05-08 16:57:12 +02:00
Olivier Goffart
3c87cd71d7
Merge branch 'rename_folders' into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.c
src/csync.h
src/csync_propagate.c
src/csync_propagate.h
src/csync_statedb.c
src/csync_statedb.h
src/csync_util.c
src/std/c_path.h
2013-05-07 15:24:12 +02:00
Klaas Freitag
c61035f767
Put the lock file into the sync dir.
2013-05-04 16:10:11 +02:00
Olivier Goffart
10443fc1e3
in walk tree, we can now change the md5
...
Also also in commit always assume that the propagate is done. it might
have been done by someone else
2013-05-03 19:23:26 +02:00
Olivier Goffart
cf23799e78
Only mark a folder as modified if files within it are modified.
2013-05-03 19:21:21 +02:00
Olivier Goffart
0b648dc669
Do not fetch folder id after propagation.
...
Delay that for the next sync.
2013-05-03 19:21:21 +02:00
Klaas Freitag
ab17e2aa8b
Revert "Don't include csync_version.h from csync.h"
...
This reverts commit 5cda5d523c
.
2013-04-26 10:45:14 +02:00
Klaas Freitag
5cda5d523c
Don't include csync_version.h from csync.h
2013-04-26 10:37:45 +02:00
Klaas Freitag
374d9b0a8c
Merge from feature branch csync_commit.
2013-04-22 15:39:43 +02:00
Klaas Freitag
4bdabb7f46
Added a module commit function.
2013-04-22 13:51:44 +02:00
Klaas Freitag
64927899af
Use pointer to stat struct for id_list.
2013-04-22 10:22:20 +02:00
Klaas Freitag
a496bb0e13
Fix memleak with id_list - WIP
2013-04-20 13:06:59 +03:00
Klaas Freitag
275c18df82
Added csync_commit to be able to reuse the csync context.
2013-04-20 12:11:16 +03:00
Klaas Freitag
0d238ae1fe
Allow to set progress- and log-callback any time.
2013-04-20 12:10:45 +03:00
Klaas Freitag
66d8f8b0db
Added csync_commit to be able to reuse the csync context.
2013-04-20 11:51:27 +03:00
Klaas Freitag
0c5cdc2105
Allow to set progress- and log-callback any time.
2013-04-20 11:50:13 +03:00
Klaas Freitag
84f425a326
Remove WIN32 preprocessor directive from csync.c.
2013-04-20 11:38:25 +03:00
Klaas Freitag
84febf4b77
Merge branch 'dav_0.70.5' into dav
2013-04-15 15:37:17 +02:00
Klaas Freitag
1585cab673
Compare to explicit NULL for clearer code.
2013-04-08 09:11:25 +02:00
Klaas Freitag
5de0173804
Fix for Coverity CID #996824
2013-04-05 15:08:28 +02:00
Klaas Freitag
5d5ee328b0
Fix for Coverity CID #996825
2013-04-05 15:05:44 +02:00
Klaas Freitag
34668e42b3
Merge branch 'dav_0.70.5' into dav - WIP
...
Conflicts:
CMakeLists.txt
CPackConfig.cmake
src/csync.h
src/csync_update.c
tests/ownCloud/t1.pl
2013-04-02 14:44:01 +02:00
Olivier Goffart
6659ee6d76
store the error string for files in the tree
2013-03-28 13:54:01 +01:00
Klaas Freitag
6aec7f4211
Push context to module to make logging of the module work.
2013-03-26 10:05:15 +01:00
Olivier Goffart
b4ec9f887c
Do not fetch folder id after propagation.
...
Delay that for the next sync.
(cherry picked from commit 1eb534dd53
)
2013-03-11 20:38:17 +01:00
Olivier Goffart
b99677f985
Only mark a folder as modified if files within it are modified.
2013-03-11 20:38:17 +01:00
Olivier Goffart
6a5ad6e81e
Revert "Do not fetch folder id after propagation."
...
This reverts commit 1eb534dd53
.
Because folder re-appears in some cases
(IL issue #143 )
2013-03-08 17:47:39 +01:00
Olivier Goffart
1eb534dd53
Do not fetch folder id after propagation.
...
Delay that for the next sync.
2013-03-05 20:33:18 +01:00
Olivier Goffart
53ad4a910f
Progress database:
...
Remember about errors, and don't retry if there is more than 3 errors
Conflicts:
src/csync_propagate.c
2013-03-02 15:01:40 +01:00
Olivier Goffart
259b6050bf
Progress database:
...
Remember about errors, and don't retry if there is more than 3 errors
2013-03-01 12:31:20 +01:00
Olivier Goffart
b6a37064e9
Allow to configure the timeout in the config
2013-02-13 18:25:28 +01:00
Olivier Goffart
d88c58deae
WIP: rename folders
2013-02-06 18:40:02 +01:00
Olivier Goffart
bdd331ee08
Allow to configure the timeout in the config
2013-02-06 18:38:46 +01:00
Olivier Goffart
5b8917672c
Only do the correctId after both the remote and the local have been processed
...
It is important if there are operations such as delete, which operate on
the remote tree, and thet may also invalidate the id we got on the
localtree (for example, the parent directory of a removed file)
2013-01-10 11:32:27 +01:00
Olivier Goffart
b23d15eb11
csync_tree_walk: let the visitor change the instruction
2013-01-10 11:32:20 +01:00
Klaas Freitag
c2844b0545
Added csync_get_error_string function to provide backend errors.
2012-12-20 20:47:10 +01:00
Klaas Freitag
70e89720d5
Some code cleanups, removed not needed stuff.
2012-12-20 17:10:03 +01:00
Klaas Freitag
bbf4e07579
Proper errno to csync error conversion, more errno fixes in oC module.
2012-12-17 17:22:24 +01:00
Klaas Freitag
ecf09c4077
Added error_string handling with modules
2012-12-14 16:49:03 +01:00
Olivier Goffart
5bc95e1667
Fix memory leak
2012-12-14 11:19:14 +01:00
Olivier Goffart
8e3331ad1d
Suppress a warning
...
The csync_set_module_property shows a warning if init is not finished
2012-12-10 16:15:26 +01:00
Olivier Goffart
7759eb4b6d
Say which function it is in the error messages
2012-12-10 16:15:26 +01:00
Olivier Goffart
410eadf2f5
print a warning when calling set_module_property at the wrong time
2012-12-08 11:06:28 +01:00
Daniel Molkentin
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Olivier Goffart
0eb1855345
Revert "Only refresh the folder id for remote replica"
...
This reverts commit ce94beb068
.
This broke because the tree are not merged yet.
If a file was added on the remote, it is not yet in the remote tree, and
still we need to query the ETag
2012-12-06 16:36:13 +01:00