[Pkg-owncloud-commits] [owncloud-client] 119/332: Merge remote-tracking branch 'origin/1.6' into il
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 02704cdf74e8502884907e1fb14da1348016e59c
Merge: 71a901a a7d251f
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Mon Jun 23 12:48:34 2014 +0200
Merge remote-tracking branch 'origin/1.6' into il
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
ChangeLog | 21 ++++++++++++++++++++
cmake/modules/NSIS.template.in | 4 ++--
csync/src/csync.c | 5 -----
csync/src/csync_exclude.c | 4 ++++
csync/src/csync_owncloud.c | 2 +-
csync/src/csync_owncloud_recursive_propfind.c | 7 +++----
csync/src/csync_reconcile.c | 4 ++--
csync/src/csync_statedb.c | 2 ++
csync/src/csync_update.c | 3 +++
csync/src/csync_util.c | 12 ++++++------
csync/src/httpbf/src/httpbf.c | 4 ++--
csync/src/std/c_time.c | 3 ++-
csync/src/vio/csync_vio_local.c | 1 +
src/3rdparty/fancylineedit/fancylineedit.cpp | 2 +-
src/creds/shibboleth/shibbolethwebview.cpp | 19 ------------------
src/creds/shibboleth/shibbolethwebview.h | 1 -
src/creds/shibbolethcredentials.cpp | 28 +++++++++++++++++++++++++++
src/creds/shibbolethcredentials.h | 3 +++
src/mirall/accountsettings.cpp | 28 +++++----------------------
src/mirall/accountsettings.h | 1 -
src/mirall/folder.h | 1 -
src/mirall/folderstatusmodel.h | 3 ---
src/mirall/folderwizard.cpp | 5 ++++-
src/mirall/owncloudgui.cpp | 5 ++---
src/mirall/owncloudtheme.cpp | 3 ++-
src/mirall/propagator_legacy.cpp | 5 +++++
src/mirall/propagator_legacy.h | 3 ++-
src/mirall/propagator_qnam.cpp | 3 +--
src/mirall/settingsdialogmac.cpp | 12 ++++++++++++
src/mirall/syncengine.cpp | 22 ++++++++++++---------
src/mirall/syncengine.h | 3 ++-
src/mirall/syncfileitem.h | 5 +++--
src/mirall/syncjournaldb.cpp | 2 +-
src/mirall/syncjournaldb.h | 4 ++--
src/mirall/theme.cpp | 8 ++++++++
src/mirall/theme.h | 2 +-
src/owncloudcmd/owncloudcmd.cpp | 1 -
src/wizard/owncloudsetuppage.cpp | 2 ++
src/wizard/owncloudsetuppage.h | 1 -
src/wizard/owncloudwizard.cpp | 1 +
40 files changed, 147 insertions(+), 98 deletions(-)
diff --cc csync/src/csync.c
index 072b076,73bff40..5c4cab8
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@@ -240,31 -277,28 +240,26 @@@ int csync_update(CSYNC *ctx)
c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
csync_memstat_check();
- if (rc < 0) {
- ctx->status_code = CSYNC_STATUS_TREE_ERROR;
- return -1;
- }
-
/* update detection for remote replica */
- if( ! ctx->options.local_only_mode ) {
- csync_gettime(&start);
- ctx->current = REMOTE_REPLICA;
- ctx->replica = ctx->remote.type;
+ csync_gettime(&start);
+ ctx->current = REMOTE_REPLICA;
+ ctx->replica = ctx->remote.type;
- rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
- if (rc < 0) {
- if(ctx->status_code == CSYNC_STATUS_OK)
- ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
- return -1;
- }
+ rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
+ if (rc < 0) {
+ if(ctx->status_code == CSYNC_STATUS_OK)
+ ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
+ return -1;
+ }
+ csync_gettime(&finish);
- csync_gettime(&finish);
+ CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
+ "Update detection for remote replica took %.2f seconds "
+ "walking %zu files.",
+ c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
+ csync_memstat_check();
- CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
- "Update detection for remote replica took %.2f seconds "
- "walking %zu files.",
- c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
- csync_memstat_check();
- }
ctx->status |= CSYNC_STATUS_UPDATE;
return 0;
diff --cc csync/src/csync_owncloud.c
index 3bad442,8aabc16..1e24828
--- a/csync/src/csync_owncloud.c
+++ b/csync/src/csync_owncloud.c
@@@ -565,9 -694,9 +565,9 @@@ static struct listdir_context *fetch_re
DEBUG_WEBDAV("ERROR: Request failed: status %d (%s)", req_status->code,
req_status->reason_phrase);
ret = NE_CONNECT;
- set_error_message(req_status->reason_phrase);
+ set_error_message(ctx, req_status->reason_phrase);
}
- DEBUG_WEBDAV("Simple propfind result code %d.", req_status->code);
+ DEBUG_WEBDAV("Simple propfind result code %d.", req_status ? req_status->code : -1);
} else {
if( ret == NE_ERROR && req_status->code == 404) {
errno = ENOENT;
diff --cc csync/src/csync_owncloud_recursive_propfind.c
index fb0dbdb,f7319d5..d4af3ce
--- a/csync/src/csync_owncloud_recursive_propfind.c
+++ b/csync/src/csync_owncloud_recursive_propfind.c
@@@ -178,9 -240,11 +175,11 @@@ static void propfind_results_recursive_
}
}
+ resource_free(newres);
+ newres = NULL;
}
-void fetch_resource_list_recursive(const char *uri, const char *curi)
+void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi)
{
int ret = 0;
ne_propfind_handler *hdl = NULL;
diff --cc src/mirall/syncengine.cpp
index 6a792a8,fdb6b5c..562081a
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@@ -54,13 -55,17 +54,16 @@@ void csyncLogCatcher(int /*verbosity*/
bool SyncEngine::_syncRunning = false;
SyncEngine::SyncEngine(CSYNC *ctx, const QString& localPath, const QString& remoteURL, const QString& remotePath, Mirall::SyncJournalDb* journal)
- : _uploadLimit(0), _downloadLimit(0)
+ : _csync_ctx(ctx)
+ , _needsUpdate(false)
+ , _localPath(localPath)
+ , _remoteUrl(remoteURL)
+ , _remotePath(remotePath)
+ , _journal(journal)
+ , _hasFiles(false)
- , _downloadLimit(0)
+ , _uploadLimit(0)
-
++ , _downloadLimit(0)
{
- _localPath = localPath;
- _remotePath = remotePath;
- _remoteUrl = remoteURL;
- _csync_ctx = ctx;
- _journal = journal;
qRegisterMetaType<SyncFileItem>("SyncFileItem");
qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
qRegisterMetaType<Progress::Info>("Progress::Info");
@@@ -264,18 -268,9 +267,18 @@@ int SyncEngine::treewalkFile( TREE_WALK
item._instruction = file->instruction;
item._direction = SyncFileItem::None;
item._fileId = file->file_id;
+ if (file->directDownloadUrl) {
+ item._directDownloadUrl = QString::fromUtf8( file->directDownloadUrl );
+ }
+ if (file->directDownloadCookies) {
+ item._directDownloadCookies = QString::fromUtf8( file->directDownloadCookies );
+ }
+ if (file->remotePerm) {
+ item._remotePerm = QByteArray(file->remotePerm);
+ }
// record the seen files to be able to clean the journal later
- _seenFiles[item._file] = QString();
+ _seenFiles.insert(item._file);
switch(file->error_status) {
case CSYNC_STATUS_OK:
diff --cc src/mirall/syncfileitem.h
index 2dc882a,b4b6e1e..30d3c27
--- a/src/mirall/syncfileitem.h
+++ b/src/mirall/syncfileitem.h
@@@ -49,9 -49,10 +49,10 @@@ public
FileIgnored ///< The file is in the ignored list
};
- SyncFileItem() : _type(UnknownType), _direction(None), _instruction(CSYNC_INSTRUCTION_NONE),
- _size(0), _should_update_etag(false), _blacklistedInDb(false),
+ SyncFileItem() : _type(UnknownType), _direction(None), _isDirectory(false),
+ _instruction(CSYNC_INSTRUCTION_NONE), _modtime(0),
+ _size(0), _inode(0), _should_update_etag(false), _blacklistedInDb(false),
- _status(NoStatus), _httpErrorCode(0), _requestDuration(0) {}
+ _status(NoStatus), _httpErrorCode(0), _requestDuration(0), _isRestoration(false) {}
friend bool operator==(const SyncFileItem& item1, const SyncFileItem& item2) {
return item1._file == item2._file;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list