[Pkg-owncloud-commits] [owncloud-client] 238/484: Merge remote-tracking branch 'upstream/master'

[Sandro Knauß]

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 1ab44655e059630a08fd2356865b85db685b0370
Merge: 8f5658b 43800e3
Author: Niels van Adrichem <n.l.m.vanadrichem at tudelft.nl>
Date:   Tue Nov 3 11:58:45 2015 +0100

    Merge remote-tracking branch 'upstream/master'
    
    Conflicts:
    	src/cmd/cmd.cpp

 ChangeLog                                     |  64 ++---
 csync/src/csync_update.c                      |   8 +-
 shell_integration/nautilus/syncstate.py       |  90 ++++---
 src/cmd/cmd.cpp                               |  28 +-
 src/gui/CMakeLists.txt                        |   1 +
 src/gui/accountsettings.cpp                   |  10 +-
 src/gui/application.cpp                       |   1 +
 src/gui/folder.cpp                            |   6 +-
 src/gui/folder.h                              |   2 +-
 src/gui/folderstatusmodel.cpp                 |  35 ++-
 src/gui/ocsjob.cpp                            |  10 +-
 src/gui/ocsjob.h                              |  11 +-
 src/gui/ocssharejob.cpp                       |  21 +-
 src/gui/ocssharejob.h                         |  48 ++--
 src/gui/quotainfo.cpp                         |   5 +-
 src/gui/share.cpp                             | 265 +++++++++++++++++++
 src/gui/share.h                               | 248 ++++++++++++++++++
 src/gui/sharedialog.cpp                       | 364 ++++++++------------------
 src/gui/sharedialog.h                         |  25 +-
 src/libsync/capabilities.cpp                  |  25 +-
 src/libsync/capabilities.h                    |  10 +-
 src/libsync/configfile.cpp                    |   6 +-
 src/libsync/discoveryphase.cpp                |  24 +-
 src/libsync/discoveryphase.h                  |  12 +-
 src/libsync/owncloudpropagator.cpp            |  12 +-
 src/libsync/ownsql.cpp                        |   7 +
 src/libsync/ownsql.h                          |   3 +
 src/libsync/propagatedownload.cpp             |  28 +-
 src/libsync/propagatedownload.h               |   2 +-
 src/libsync/propagateupload.cpp               |  78 ++++--
 src/libsync/propagateupload.h                 |   2 +-
 src/libsync/propagatorjobs.h                  |   1 -
 src/libsync/syncengine.cpp                    |  26 +-
 src/libsync/syncengine.h                      |   8 +-
 src/libsync/syncfileitem.h                    |  13 +-
 src/libsync/syncjournaldb.cpp                 | 189 ++++++++++++-
 src/libsync/syncjournaldb.h                   |  15 ++
 src/libsync/syncjournalfilerecord.cpp         |  23 +-
 src/libsync/syncjournalfilerecord.h           |   2 +
 src/libsync/transmissionchecksumvalidator.cpp | 170 ++++++------
 src/libsync/transmissionchecksumvalidator.h   |  88 ++++---
 test/testsyncjournaldb.h                      |  47 ++++
 test/testtranschecksumvalidator.h             |  60 ++---
 translations/client_fr.ts                     |   4 +-
 translations/client_ja.ts                     |  70 ++---
 translations/client_zh_TW.ts                  | 321 ++++++++++++-----------
 46 files changed, 1653 insertions(+), 835 deletions(-)

diff --cc src/cmd/cmd.cpp
index c75335e,85e07a3..e9ecd82
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@@ -56,10 -56,9 +56,11 @@@ struct CmdOptions 
      bool useNetrc;
      bool interactive;
      bool ignoreHiddenFiles;
 +    bool nonShib;
      QString exclude;
      QString unsyncedfolders;
 +    QString davPath;
+     int restartTimes;
  };
  
  // we can't use csync_set_userdata because the SyncEngine sets it already.
@@@ -157,8 -156,7 +158,9 @@@ void help(
      std::cout << "  --password, -p [pass]  Use [pass] as password" << std::endl;
      std::cout << "  -n                     Use netrc (5) for login" << std::endl;
      std::cout << "  --non-interactive      Do not block execution with interaction" << std::endl;
-     std::cout << "  --nonshib, -ns         Use Non Shibboleth WebDAV authentication" << std::endl;
-     std::cout << "  --davpath, -dp [path]  Custom themed dav path, overrides --nonshib" << std::endl;
++    std::cout << "  --nonshib              Use Non Shibboleth WebDAV authentication" << std::endl;
++    std::cout << "  --davpath [path]       Custom themed dav path, overrides --nonshib" << std::endl;
+     std::cout << "  --max-sync-retries [n] Retries maximum n times (default to 3)" << std::endl;
      std::cout << "  -h                     Sync hidden files,do not ignore them" << std::endl;
      std::cout << "  --version, -v          Display version and exit" << std::endl;
      std::cout << "" << std::endl;
@@@ -226,10 -224,8 +228,12 @@@ void parseOptions( const QStringList& a
                  options->exclude = it.next();
          } else if( option == "--unsyncedfolders" && !it.peekNext().startsWith("-") ) {
              options->unsyncedfolders = it.next();
-         } else if( option == "--nonshib" || option == "-ns") {
++        } else if( option == "--nonshib" ) {
 +            options->nonShib = true;
-         } else if( (option == "--davpath" || option == "-dp") && !it.peekNext().startsWith("-") ) {
++        } else if( option == "--davpath" && !it.peekNext().startsWith("-") ) {
 +            options->davPath = it.next();
+         } else if( option == "--max-sync-retries" && !it.peekNext().startsWith("-") ) {
+             options->restartTimes = it.next().toInt();
          } else {
              help();
          }
@@@ -276,7 -272,7 +280,8 @@@ int main(int argc, char **argv) 
      options.useNetrc = false;
      options.interactive = true;
      options.ignoreHiddenFiles = true;
 +    options.nonShib = false;
+     options.restartTimes = 3;
      ClientProxy clientProxy;
  
      parseOptions( app.arguments(), &options );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git