Commit Graph
5403 Commits
Author SHA1 Message Date
Olivier Goffart c8e274110a Don't abort in merge_tree if the file don't exist
Scenario:
We have  A/B/C/file.txt
mv A/B/{C,C2}
start sync, and before sync ends
mv A A2
then as sync start and we try to merge, since it is no longer possible
to stat A/B/ which has been updated as C was moved, then the database
would not be synced
then start sync again and A/B/C2/file.txt is seen as new, and is
duplicated

By saving the database anyhow we work around that problem
2013-01-10 11:32:41 +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
Olivier Goffart 9998c7cde1 Do not fetch the id in _csync_sync_dir
But rather at then end
2013-01-10 11:28:01 +01:00
Olivier Goffart 0cf1061248 Reduce the number of stat when creating new directory.
Do not do a stat before, it is unlikely that it succeed, and if it does
indeed show there is a file with the same name, the following mkdir ill
fail properly

(The only difference will be that EEXIST will be returned instead of
ENOTDIR
2013-01-10 11:27:52 +01:00
Olivier Goffart 9261f66fd8 Do not fetch the id of new directory in _csync_new_dir
Delay the id update to after when we do all the directory. When we
create ne directory it is likely that there will be something inside.
2013-01-10 11:21:12 +01:00
Olivier Goffart 00ee9f4960 leak fix 2013-01-10 11:18:54 +01:00
Jenkins for ownCloud 6af1a52305 [tx-robot] updated from transifex 2013-01-10 00:06:57 +01:00
Klaas Freitag 703002bafa Set path to neon-config file in cmake toolchain file. 2013-01-09 15:08:25 +01:00
Klaas Freitag 96eb138410 Make big file support working for win32. 2013-01-09 15:06:03 +01:00
Klaas Freitag 3d4ba6c29b Write config files after all directories were traversed. 2013-01-09 15:04:17 +01:00
Klaas Freitag ba21a9b3a2 Check if neon was built with LFS support. 2013-01-09 15:03:20 +01:00
Klaas Freitag 5e4c0acc6b Use wide char variable to remove directory. 2013-01-09 15:02:07 +01:00
Jenkins for ownCloud 8104e4bde9 [tx-robot] updated from transifex 2013-01-08 00:33:20 +01:00
Jenkins for ownCloud 763dbfc397 [tx-robot] updated from transifex 2013-01-04 13:26:11 +01:00
Sebastian Meßmer e0645b4b63 Allow setting the configuration directory on command line 2013-01-02 19:08:14 +01:00
Jenkins for ownCloud f714759ec7 [tx-robot] updated from transifex 2013-01-02 00:06:16 +01:00
Jenkins for ownCloud 8168e9cca1 [tx-robot] updated from transifex 2012-12-31 00:06:30 +01:00
Jenkins for ownCloud be470b71ea [tx-robot] updated from transifex 2012-12-30 00:06:49 +01:00
Jenkins for ownCloud 216f39e9bc [tx-robot] updated from transifex 2012-12-29 00:09:42 +01:00
Jenkins for ownCloud 486c4481d8 [tx-robot] updated from transifex 2012-12-28 00:21:26 +01:00
Jenkins for ownCloud 6a154c139f [tx-robot] updated from transifex 2012-12-27 00:06:31 +01:00
Jenkins for ownCloud d559ac513e [tx-robot] updated from transifex 2012-12-26 00:13:40 +01:00
Jenkins for ownCloud c2c89c6c6b [tx-robot] updated from transifex 2012-12-25 00:12:20 +01:00
Jenkins for ownCloud af76c77b18 [tx-robot] updated from transifex 2012-12-24 00:13:14 +01:00
Jenkins for ownCloud c4be5107df [tx-robot] updated from transifex 2012-12-23 00:11:23 +01:00
Jenkins for ownCloud c13218d647 [tx-robot] updated from transifex 2012-12-22 00:28:19 +01:00
Daniel Molkentin 4ce55a44ba Klaas > Danimo, I am rather unpolite...
Also, fix whitespace errors
2012-12-21 01:16:54 +01:00
Jenkins for ownCloud 905891683b [tx-robot] updated from transifex 2012-12-21 00:13:21 +01:00
Klaas Freitag f4019f5a5a Show backend error messages to user. 2012-12-20 20:51:43 +01:00
Klaas Freitag c2844b0545 Added csync_get_error_string function to provide backend errors. 2012-12-20 20:47:10 +01:00
Daniel Molkentin b7aec51ed8 Bump to 1.2.0beta1 2012-12-20 20:43:41 +01:00
Daniel Molkentin e6b9c16d04 Update About dialog 2012-12-20 20:35:21 +01:00
Daniel Molkentin 488943aaa0 Correct inheritance in status dialog 2012-12-20 17:36:10 +01:00
Klaas Freitag 70e89720d5 Some code cleanups, removed not needed stuff. 2012-12-20 17:10:03 +01:00
Klaas Freitag c3f6153f94 Fixed QString -> const char* conversions to handle UTF8 correctly. 2012-12-20 16:49:29 +01:00
Klaas Freitag 87aa3d7c60 More detailed error handling. 2012-12-20 16:49:29 +01:00
Klaas Freitag 144a2832b9 Loop over all certificates to match the approved one. 2012-12-20 16:49:29 +01:00
Daniel Molkentin 26c01cefa7 New icons for ownCloud client
--monoicons shows platform-specific monochrome icons
for now until we have a proper settings dialog.
2012-12-20 16:41:54 +01:00
Jenkins for ownCloud 91b58bdb3f [tx-robot] updated from transifex 2012-12-20 00:14:32 +01:00
Klaas Freitag d6287fb5e3 fix win32 build, ifdefed non existing errnos. 2012-12-19 20:20:26 +01:00
Klaas Freitag a880949836 Display all SSL certificates from the chain to the user to approve. 2012-12-19 18:06:36 +01:00
Klaas Freitag 3343601179 Remove temp files if GET fails, fixes owncloud/mirall#194 2012-12-19 12:41:16 +01:00
Klaas Freitag e5b95540e7 drop not longer needed case statement. 2012-12-19 12:31:56 +01:00
Jenkins for ownCloud b97d9a4fa9 [tx-robot] updated from transifex 2012-12-19 00:05:10 +01:00
Andreas Schneider c795010988 log: Use a thread local variable for logging callback. 2012-12-18 14:25:35 +01:00
Andreas Schneider 490d3016e6 priv: Remove log_verbosity variable. 2012-12-18 14:16:50 +01:00
Klaas Freitag fe048f69cd Set version to upcoming version 0.70.0 2012-12-18 13:50:56 +01:00
Jenkins for ownCloud 83a1663750 [tx-robot] updated from transifex 2012-12-18 00:17:17 +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