Merge lp:~ed.so/duplicity/remove_copyCom into lp:~duplicity-team/duplicity/0.8-series

[edso]

remove a small copy.com remainder in man page

[Kenneth Loafman (kenneth-loafman)]

Looks like you're trying to merge 0.7 into 0.8.

lp:duplicity is 0.8
lp:duplicity/0.7-series is 0.7

review: Needs Fixing

[edso (ed.so)]

On 11.03.2019 19:26, Kenneth Loafman wrote:
> Review: Needs Fixing
>
> Looks like you're trying to merge 0.7 into 0.8.
>
> lp:duplicity is 0.8
> lp:duplicity/0.7-series is 0.7
>

@Ken, maybe its easier you remove the paragraph in the man page by hand.
https://bazaar.launchpad.net/~ed.so/duplicity/remove_copyCom/revision/1373

had to setup bzr again just to push this minor change and obviously failed miserably.

..ede

[Kenneth Loafman (kenneth-loafman)]

Manually removed.

=== modified file 'CHANGELOG'
--- CHANGELOG	2019-02-25 16:30:59 +0000
+++ CHANGELOG	2019-03-04 12:09:45 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 New in v0.8.00 (2019/??/??)
 ---------------------------
 * Merged in lp:~aaron-whitehouse/duplicity/remove-python26
@@ -128,46 +129,183 @@
   - change util.uexc() back to bare uexc()
 * Fixed bug #1668750 - Don't mask backend errors
   - added exception prints to module import errors
+=======
+New in v0.7.19 (2019/??/??)
+-----------------------------
+* Fixed bug #1798206 and bug #1798504
+  - Made paramiko a global with import during __init__ so it would
+    not be loaded unless needed.
+* Merged in lp:~mterry/duplicity/pydrive-root-0.7
+  - Just a tiny fix to clean up the temporary file we create to find the root ID.
+    It's a little surprising for the user if they wind up with this file called
+    "i_am_in_root" that they don't know where it came from. Almost sounds like
+    they were hacked.
+
+
+New in v0.7.18.2 (2018/10/17)
+-----------------------------
+* Fixed bug #1788558 again
+  - If we get None for size skip check.
+
+
+New in v0.7.18.1 (2018/08/27)
+-----------------------------
+* Fixed bug #1788558
+  - Treat None as zero when printing log.
+* Revert fix for bug #1788599.
+  - Was causing problems with directory names
+
+
+New in v0.7.18 (2018/08/21)
+---------------------------
+* Fixed bug #1756550 Online html man page is showing a 0 byte file
+* Partial fix of bug #1734144 with patch from Joris van Eijden
+  - Note: this is really just a partial fix for now, since it only covers
+    the case where the local size does not yet match the remote size.  A
+    case where -1 is the returned length is not fixed.
+  - Number of retries is now same as globals.num_retries.
+  - Added standoff delay of 0.5 sec per attempt.
+* Fixed bug #1764432 with patch from Robke Geenen
+  - Just join the parts together.
+* Fixed bug #1717935 with suggestion from strainu
+  - Use urllib.quote_plus() to properly quote pathnames passed via URL
+* Fixed bug #1780617 Test fail when GnuPG >= 2.2.8
+  - Relevant change in GnuPG 2.2.8: https://dev.gnupg.org/T3981
+  - Added '--ignore-mdc-error' to all gpg calls made.
+* Fixed bug #1785520 with patch from Chris Hunt
+  - Fix for B2 version 1.3.4 just released
+* Fix a 2to3 error in ssh_paramiko_backend.py
+
+
+New in v0.7.17 (2018/02/26)
+---------------------------
+* Removed changes made in bug #1044715 Provide a file history feature
+  - Changes required too much memory to carry in the manifest
+  - The option --file-changed in collection-status is now invalid
+  - This will close bugs: #1730451, #896728, #1526557, #1550176
+  - Starting a full backup will be needed to fully utilize this fix
+* Fix update of Launchpad Translations.  Translations were not being picked
+  up on a daily basis and we got several months behind.
+
+
+New in v0.7.16 (2018/01/12)
+---------------------------
+* Fixed bug #1733057 AttributeError: 'GPGError' object has no attribute 'decode'
+  - Replaced call to util.ufn() with call to util.uexc().  Stupid typo!
+* More fixes for Unicode handling
+  - Default to 'utf-8' if sys.getfilesystemencoding() returns 'ascii' or None
+  - Fixed bug #1386373 with suggestion from Eugene Morozov
+* Patched in lp:~crosser/duplicity/fix-oauth-flow
+  - Fixed bug #1638236 "BackendException with oauth2client 4.0.0"
+* Patched in lp:~crosser/duplicity/dpbx-fix-file-listing
+  - Fixed bug #1639664 "Dropbox support needs to be updated for Dropbox SDK v7.1"
+* Patched in lp:~crosser/duplicity/fix-small-file-upload
+  - Fixed small file upload changes made in Dropbox SDK v7.1
+* Fix pylint error in webdavbackend.py
+
+
+New in v0.7.15 (2017/11/13)
+---------------------------
+* Fixed bug introduced in new megabackend.py where process_commandline()
+  takes a string not a list.  Now it takes both.
+* Updated web page for new megabackend requirements.
+* Patched in lp:~mterry/duplicity/more-decode-issues
+  - Here's some fixes for another couple UnicodeDecodeErrors.
+  - The duplicity/dup_time.py fixes when a user passes a utf8 date string (or a string with bogus
+    utf8 characters, but they have to really try to do that). This is bug 1334436.
+  - The bin/duplicity change from str(e) to util.uexc(e) fixes bug 1324188.
+  - The rest of the changes (util.exception_traceback and bin/duplicity changes to use it) are to
+    make the printing of exceptions prettier. Without this, if you see a French exception, you see
+    "accept\xe9es" instead of "acceptées".
+  - You can test all of these changes in one simple line:
+    $ LANGUAGE=fr duplicity remove-older-than $'accept\xffées'
+* Fix backend.py to allow string, list, and tuple types to support megabackend.py.
+* Fixed bug #1715650 with patch from Mattheww S
+  - Fix to make duplicity attempt a get first, then create, a container
+    in order to support container ACLs.
+* Fixed bug #1714663 "Volume signed by XXXXXXXXXXXXXXXX, not XXXXXXXX"
+  - Normalized comparison length to min length of compared keys before comparison
+  - Avoids comparing mix of short, long, or fingerprint size keys.
+* Merged in lp:~mterry/duplicity/rename-dep
+  - Make rename command a dependency for LP build
+* Fixed bug #1654756 with new b2backend.py module from Vincent Rouille
+  - Faster (big files are uploaded in chunks)
+  - Added upload progress reporting support
+* Fixed bug #1448094 with patch from Wolfgang Rohdewald
+  - Don't log incremental deletes for chains that have no incrementals
+* Fixed bug #1724144 "--gpg-options unused with some commands"
+  - Add --gpg-options to get version run command
+* Fixed bug #1720159 - Cannot allocate memory with large manifest file since 0.7.03
+  - filelist is not read if --file-changed option in collection-status not present
+  - This will keep memory usage lower in non collection-status operations
+* Fixed bug #1723890 with patch from Killian Lackhove
+  - Fixes error handling in pydrivebackend.py
+* Fixed bug #1730902 GPG Error Handling
+  - use util.ufn() not str() to handle encoding
+
+
+New in v0.7.14 (2017/08/31)
+---------------------------
+* Merged in lp:~dawgfoto/duplicity/skip_sync_collection_status
+  - collection-status should not sync metadata
+  - up-to-date local metadata is not needed as collection-status is
+    generated from remote file list
+  - syncing metadata might require to download several GBs
+* Fixed slowness in 'collection-status' by basing the status on the
+  remote system only.  The local cache is treated as empty.
+* Fixed encrypted remote manifest handling to merely put out a non-fatal
+  error message and continue if the private key is not available.
+* Patched in lp:~mterry/duplicity/giobackend-display-name
+  - giobackend: handle a wider variety of gio backends by making less assumptions;
+    in particular, this fixes the google-drive: backend
+* Fixed bug #1709047 with suggestion from Gary Hasson
+  - fixed so default was to use original filename
+* Fixed PEP8 errors in bin/duplicity
+* Merged in lp:~mterry/duplicity/gio_child_for_display_name_0.7
+  - gio: be slightly more correct and get child GFiles based on display name
+* Fixed bug #1711905 with suggestion from Schneider
+  - log.Warn was invoked with log.warn in webdavbackend.py
+* Merged in lp:~mterry/duplicity/gpg-tag-versions
+  - Support gpg versions numbers that have tags on them.
+  - This can happen if you build gpg from git trunk (e.g. 2.1.15-beta20). Or if you run
+    against the freedesktop flatpak runtime (e.g. 2.1.14-unknown).
+* Fixed bug #1394386 with new module megabackend.py from Tomas Vondra
+  - uses megatools from https://megatools.megous.com/ instead of mega.py library
+    which has been deprecated
+  - fixed copyright and PEP8 issues
+  - replaced subprocess.call() with self.subprocess_popen() to standardize
+* Fixed bug #1713640 with patch from Aleksandar Ivanisevic
+  - replace 2.7 syntax with 2.6 equivalent
+* Fixed bug #1538333 Assertion error in manifest.py: assert filecount == ...
+  - Made sure to never pass .part files as true manifest files
+  - Changed assert to log.Error to warn about truncated/corrupt filelist
+  - Added unit test to make sure detection works
+  - Note: while this condition is serious, it will not affect the basic backup and restore
+    functions.  Interactive options like --list-files-changed and --file-changed will not
+    work correctly for this backup set, so it is advised to run a full backup as soon as
+    possible after this error occurs.
+* Fixed bug #1638033 Remove leading slash on --file-to-restore
+  - code already used rstrip('/') so change to just strip('/')
+
+
+New in v0.7.13.1 (2017/06/18)
+-----------------------------
+* Fixed problem in dist/makedist when building on Mac where AppleDouble
+  files were being created in the tarball.  See:
+  https://superuser.com/questions/61185/why-do-i-get-files-like-foo-in-my-tarball-on-os-x
+
+
+New in v0.7.13 (2017/06/12)
+---------------------------
+>>>>>>> MERGE-SOURCE
 * Fixed bug #1680682 with patch supplied from Dave Allan
   - Only specify --pinentry-mode=loopback when --use-agent is not specified
 * Fixed man page that had 'cancel' instead of 'loopback' for pinentry mode
 * Fixed bug #1684312 with suggestion from Wade Rossman
   - Use shutil.copyfile instead of os.system('cp ...')
   - Should reduce overhead of os.system() memory usage.
-* Merged in lp:~dernils/duplicity/testing
-  - Fixed minor stuff in requirements.txt.
-  - Added a Dockerfile for testing.
-  - Minor changes to README files.
-  - Added README-TESTING with some information on testing.
-* Merged in lp:~dernils/duplicity/documentation
-  - Minor changes to README-REPO, README-TESTING
-  - Also redo the changes to requirements.txt and Dockerfile
-* Merged in lp:~dawgfoto/duplicity/replicate
-  - Add replicate command to replicate a backup (or backup
-    sets older than a given time) to another backend, leveraging
-    duplicity's backend and compression/encryption infrastructure.
-* Fixed some incoming PyLint and PEP-8 errors.
-* Merged in lp:~marix/duplicity/add-azure-arguments
-  - Using the Azure backend to store large amounts of data we found that
-    performance is sub-optimal. The changes on this branch add command line
-    parameters to fine-tune some parameters of the Azure storage library,
-    allowing to push write performance towards Azure above 1 Gb/s for large
-    back-ups. If a user does not provide the parameters the defaults of the
-    Azure storage library will continue to be used.
-* Replace incoming non-ASCII chars in commandline.py
-* bzr does not honor perms so fix the perms at the start of the testing and
-  avoid annoying error regarding testing/gnupg having too lenient perms
-* Merged in lp:~dernils/duplicity/DockerfileConvenience
-  - Added a few tools to the Dockerfile that make life easier
 * Fixed bug #1320832 with suggestion from Oskar Wycislak
   - Use chunks instead of reading it all in swiftbackend
-* Merged in lp:~dernils/duplicity/DockerfileConvenience
-  - Add a few files that are the beginning of further infrastructure based
-    on docker. It contains a Dockerfile for a simple ftp server (used for
-    backend testing) and a setup script that can be used to set up the
-    complete test environment.
-* Moved Dockerfile for duplicitytest into testinfrastructure/duplicity_test
-* Moved some things around in testing/infrastructure to clean up
 * Fixed bug #1689632 with patch from Howard Kaye
   - On MacOS, the tempfile.TemporaryFile call erroneously raises an
     IOError exception saying that too many files are open. This causes
@@ -176,17 +314,6 @@
   - swap from lockfile to fasteners module
   - use an fcntl() style lock for process lock of duplicity cache
   - lockfile will now clear if duplicity is killed or crashes
-* Merged in lp:~aaron-whitehouse/duplicity/tox_pylint_fixes
-  - Changes needed to run-tests without pylint E0401(import-error) errors
-* Merged in lp:~xlucas/duplicity/swift-storage-policies
-  - This brings support for Swift storage policies: when using a Swift
-    backend, you can specify the policy containers should be operating on.
-  - This is similar to AWS Cloud Storage classes (ia, rrs, glacier and so on).
-* Merged in lp:~dernils/duplicity/Dockerfile
-  - Added another backend to the docker test infrastructure, updated the setup
-    for testing and updated the documentation.
-* Merged in lp:~dernils/duplicity/Dockerfile
-  - Now have subnet name and IP of the subnet for testing as a variable.
 * May have finally fixed bug #1556553, "Too many open files...".
   - Applied patch from Howard Kaye, question #631423.  The fix is to dup
     the file descriptor, and then close the file in the deallocator
@@ -203,19 +330,13 @@
 * Fix bug #1672540 with patch from Benoit Nadeau
   - Rename would fail to move par files when moving across filesystems.
   - Patch uses shutil.move() to do the rename instead.
-* Merged in lp:~dernils/duplicity/docker-compose
-  - Test Infrastructure now utilizing docker-compose
-* Merged in lp:~aaron-whitehouse/duplicity/08-fix-man-verify
-  - Fix description of --verify and --compare-data in the man page. Now
-    clarifies that verify compares the restored files to hashes stored at
-    backup date, while --compare-data compares restored files to files
-    in target_path.
 * Fixed bug #1265765 with patches from Matthias Larisch and Edgar Soldin
   - SSH Paramiko backend now uses BufferedFile implementation to enable
     collecting the entire list of files on the backend.
 * Copy.com is gone so remove copycombackend.py.
 * Merged in lp:~xlucas/duplicity/swift-multibackend-bug
   - Fix a bug when swift backend is used in a multibackend configuration.
+<<<<<<< TREE
 * Fixed problem in dist/makedist when building on Mac where AppleDouble
   files were being created in the tarball.  See:
   https://superuser.com/questions/61185/why-do-i-get-files-like-foo-in-my-tarball-on-os-x
@@ -404,6 +525,116 @@
     (Hot,Cool,Archive) used for uploaded files.
 * Merged in lp:~vam9/duplicity/0.8-series-s3-kms-support
   - Added s3 kms server side encryption support with kms-grants support.
+=======
+* Merged in lp:~duplicity-team/duplicity/po-updates
+
+
+New in v0.7.12 (2017/03/21)
+---------------------------
+* Fixed bug #1623342 with patch supplied by Daniel Jakots
+  - Failing test on OpenBSD because tar/gtar not found
+* Fixed bug #1654220 with patch supplied by Kenneth Newwood
+  - Duplicity fails on MacOS because GPG version parsing fails
+* Fixed bug #1655268 "--gpg-binary option not working"
+  - If gpg binary is specified rebuild gpg profile using new binary location
+* Fixed bug #1658283 "Duplicity 0.7.11 broken with GnuPG 2.0"
+  - Made gpg version check more robust than just major version
+  - Now use --pinentry-mode=loopback on gpg 2.1 and greater
+  - Removed check for non-Linux systems, a false problem
+* Merged in lp:~matthew-t-bentley/duplicity/duplicity
+  - Sets a user agent. Backblaze asked for this in case there are errors that originate
+    from the Duplicity B2 backend
+  - Only retrieves a new upload URL when the current one expires, to bring it in line
+    with their best practices for integrations: https://www.backblaze.com/b2/docs/integration_checklist.html
+* Add detail about import exceptions in onedrivebackend.py
+* Fixed bug #1657916 with patch supplied by Daniel Harvey
+  - B2 provider cannot handle two backups in the same bucket
+* Fixed bug #1603704 with patch supplied by Maciej Bliziński
+  - Crash with UnicodeEncodeError
+* Some fixes to gpg.py to handle gpg1 & gpg2 & gpg2.1 commandline issues
+  - --gpg-agent is optional on gpg1, but on gpg2 it is used automatically
+  - --pinentry-mode is not a valid opt until gpg2.1, so condition on that
+* Fixed bug #1367675 - IMAP Backend does not work with Yahoo server
+  - added the split() as needed in 'nums=list[0].strip().split(" ")'
+  - the other fixes mentioned in the bug report comments were already done
+* Fixed bug #1671852 - Code regression caused by revision 1108
+  - change util.uexc() back to bare uexc()
+* Fixed bug #1668750 - Don't mask backend errors
+  - added exception prints to module import errors
+
+
+New in v0.7.11 (2016/12/31)
+---------------------------
+* Fixed bugs #815510 and #1615480
+  - Changed default --volsize to 200MB
+* Merged in lp:~mstoll-de/duplicity/duplicity
+  - Backblaze announced a new domain for the b2 api
+* Merged in lp:~aaron-whitehouse/duplicity/bug_1620085_exclude-if-present-locked-folder
+  - Fixes Bug #1620085: --exclude-if-present gives OSError looking for tag in locked folders
+* Fixed bug #1623342 with patch from Daniel Jakots
+  - failing test on OpenBSD because tar/gtar not found
+* Merged in lp:~mwilck/duplicity/duplicity
+  - GPG: enable truly non-interactive operation with gpg2
+  - This patch fixes the IMO unexpected behavior that, when using GnuPG2, a pass phrase dialog always pops up for
+    saving backups. This is particularly annoying when trying to do unattended / fully automatic backups.
+* Fixed bug #1621194 with code from Tornhoof
+  - Do backup to google drive working without a service account
+* Fixed bug #1642098 - does not create PAR2 archives when '--par2-options' is used
+  - Missing space between par2-options plus default options
+* Fix bug using 40-char sign keys, from Richard McGraw on mail list
+  - Remove truncation of argument and adjust comments
+* Merged in lp:~dernils/duplicity/robust-dropbox-backend
+  - Added new command line option --backend-retry-delay
+    that allows to determine the time that duplicity sleeps
+    before retrying after an error has occured.
+  - Added some robustness to dpbxbackend.py that ensures re-authentication
+    happens in case that a socket is changed (e.g. due to a forced reconnect
+    of a dynamic internet connection).
+* Merged in lp:~ed.so/duplicity/manpage.fixes
+  - Fix html output via rman on the website
+* Merged in lp:~horgh/duplicity/copy-symlink-targets-721599
+  - Add --copy-links to copy symlink contents, not just the link itself.
+* Merged in lp:~aaron-whitehouse/duplicity/Bug_1624725_files_within_folder_slash
+  - Fixed Bug #1624725, so that an include glob ending in "/" now includes folder contents (for globs with
+    and without special characters). This preserves the behaviour that an expression ending in "/" only
+    matches a folder, but now the contents of any matching folder is included.
+* Fix problem with gpg2 in yakety and zesty
+* Fix Bug #1642813 with patch from Ravi
+  - If stat() returns None, don't attempt to set perms.
+* Merged in lp:~breunigs/duplicity/amazondrive3
+  - As reported on the mailinglist, if a space is entered while duplicity asks for the URL, it fails.
+    Since all important spaces are URL encoded anyway, this should be fine even if there are spaces in
+    the URL at all. I also patched it in the onedrive backend, because it must have similar issues.
+* Prep for 0.7.11
+
+
+New in v0.7.10 (2016/08/20)
+---------------------------
+* Merged in lp:~mwilck/duplicity/0.7-series
+  - Speedup of path_matches_glob() by about 8x.  See
+    https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301332
+    for more details.
+* Remove -w from setsid in functional tests.
+* Fixed conflict in merge from Martin Wilck and applied
+  - https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301492
+  - merge fixes setsid usage in functional testing.
+* Fixed bug #1612472 with patch from David Cuthbert
+  - Restore from S3 fails with --with-prefix-archive if prefix includes '/'
+* Merged in lp:~arashad.ahamad/duplicity/duplicity_latest
+  - Changes for connecting to IBM Bluemix ObjectStorage.  See man page.
+* Merged in lp:~fenisilius/duplicity/acd_init_mkdir
+  - Allow duplicity to create remote folder
+
+
+New in v0.7.09 (2016/07/24)
+---------------------------
+* Fixed bug #1600692 with patch from Wolfgang Rohdewald
+  - Allow symlink to have optional trailing slash during verify.
+* Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files
+  - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224,
+    as this was affecting other applications (e.g. deja dup; Bug #1605939).
+* Merged in lp:~duplicity-team/duplicity/po-updates
+>>>>>>> MERGE-SOURCE
 
 
 New in v0.7.08 (2016/07/02)
@@ -444,6 +675,7 @@
   - Set line length error length to 120 (matching tox.ini) for PEP8 and
     fixed E501(line too long) errors.
 * Merged in lp:~duplicity-team/duplicity/po-updates
+<<<<<<< TREE
 * Merged in lp:~aaron-whitehouse/duplicity/08-unicode
   - Many strings have been changed to unicode for better handling of international
     characters and to make the transition to Python 3 significantly easier, primarily
@@ -463,6 +695,10 @@
     they were hacked.
 * Fixed bug #1817375 with hint from mgorse
   - Added 'global pexpect' at end of imports
+=======
+* Fix bug using 40-char sign keys, from Richard McGraw on mail list
+  - Remove truncation of argument and adjust comments
+>>>>>>> MERGE-SOURCE
 
 
 New in v0.7.07.1 (2016/04/19)
@@ -480,6 +716,9 @@
 * Fixed bug #1570293 duplicity is very slow due to excessive fsync
   - removed flush() after write.
   - revert to previous version
+* Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files
+  - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224,
+    as this was affecting other applications (e.g. deja dup; Bug #1605939).
 
 
 New in v0.7.07 (2016/04/10)
@@ -732,9 +971,6 @@
 * Merged in lp:~ed.so/duplicity/gpg.binary
   - new parameter --gpg-binary allows user to point to a different gpg binary,
     not necessarily in path
-* Merged in lp:~ed.so/duplicity/gpg.binary
-  - new parameter --gpg-binary allows user to point to a different gpg binary,
-    not necessarily in path
 * Merged in lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
   - Fixed two filename references in po/POTFILES.in, a mistake which crept in in
     rev 1093 and caused testing/run-tests to fail with "IndexError: list index

=== modified file 'Changelog.GNU'
--- Changelog.GNU	2019-02-25 16:30:59 +0000
+++ Changelog.GNU	2019-03-04 12:09:45 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2019-02-25  Kenneth Loafman  <[e-mail]>
 
     * Merged in  lp:~mgorse/duplicity/0.8-series
@@ -333,43 +334,271 @@
       - giobackend: handle a wider variety of gio backends by making less assumptions;
         in particular, this fixes the google-drive: backend
 
+=======
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Merged in lp:~mterry/duplicity/pydrive-root-0.7
+      - Just a tiny fix to clean up the temporary file we create to find the root ID.
+        It's a little surprising for the user if they wind up with this file called
+        "i_am_in_root" that they don't know where it came from. Almost sounds like
+        they were hacked.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1798206 and bug #1798504
+      - Made paramiko a global with import during __init__ so it would
+        not be loaded unless needed.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.18.2
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1788558 again
+      - If we get None for size skip check.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.18.1
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1788558
+      - Treat None as zero when printing log.
+    * Revert fix for bug #1788599.
+      - Was causing problems with directory names
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fix a 2to3 error in ssh_paramiko_backend.py
+    * Merged in lp:~duplicity-team/duplicity/po-updates
+    * Prep for 0.7.18
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1785520 with patch from Chris Hunt
+      - Fix for B2 version 1.3.4 just released
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1780617 Test fail when GnuPG >= 2.2.8
+      - Relevant change in GnuPG 2.2.8: https://dev.gnupg.org/T3981
+      - Added '--ignore-mdc-error' to all gpg calls made.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1717935 with suggestion from strainu
+      - Use urllib.quote_plus() to properly quote pathnames passed via URL
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * More fixes for bug #1734144
+      - Number of retries is now same as globals.num_retries.
+      - Added standoff delay of 0.5 sec per attempt.
+    * Fixed bug #1764432 with patch from Robke Geenen
+      - Just join the parts together.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Partial fix of bug #1734144 with patch from Joris van Eijden
+      - Note: this is really just a partial fix for now, since it only covers
+        the case where the local size does not yet match the remote size.  A
+        case where -1 is the returned length is not fixed.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1756550 Online html man page is showing a 0 byte file
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fix update of Launchpad Translations.  Translations were not being picked
+      up on a daily basis and we got several months behind.
+    * Prep for 0.7.17
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Removed changes made in bug #1044715 Provide a file history feature
+      - Changes required too much memory to carry in the manifest
+      - The option --file-changed in collection-status is now invalid
+      - This will close bugs: #1730451, #896728, #1526557, #1550176
+      - Starting a full backup will be needed to fully utilize this fix
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fix pylint error in webdavbackend.py
+    * Prep for 0.7.16
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Patched in lp:~crosser/duplicity/fix-small-file-upload
+      - Fixed small file upload changes made in Dropbox SDK v7.1
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Patched in lp:~crosser/duplicity/fix-oauth-flow
+      - Fixed bug #1638236 "BackendException with oauth2client 4.0.0"
+    * Patched in lp:~crosser/duplicity/dpbx-fix-file-listing
+      - Fixed bug #1639664 "Dropbox support needs to be updated for Dropbox SDK v7.1"
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * More fixes for Unicode handling
+      - Default to 'utf-8' if sys.getfilesystemencoding() returns 'ascii' or None
+      - Fixed bug #1386373 with suggestion from Eugene Morozov
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1733057 AttributeError: 'GPGError' object has no attribute 'decode'
+      - Replaced call to util.ufn() with call to util.uexc().  Stupid typo!
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.15
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1730902 GPG Error Handling
+      - use util.ufn() not str() to handle encoding
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1723890 with patch from Killian Lackhove
+      - Fixes error handling in pydrivebackend.py
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1720159 - Cannot allocate memory with large manifest file since 0.7.03
+      - filelist is not read if --file-changed option in collection-status not present
+      - This will keep memory usage lower in non collection-status operations
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1448094 with patch from Tomáš Zvala
+      - Don't log incremental deletes for chains that have no incrementals
+    * Fixed bug #1724144 "--gpg-options unused with some commands"
+      - Add --gpg-options to get version run command
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1654756 with new b2backend.py module from Vincent Rouille
+      - Faster (big files are uploaded in chunks)
+      - Added upload progress reporting support
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Merged in lp:~mterry/duplicity/rename-dep
+      - Make rename command a dependency for LP build
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1714663 "Volume signed by XXXXXXXXXXXXXXXX, not XXXXXXXX"
+      - Normalized comparison length to min length of compared keys before comparison
+      - Avoids comparing mix of short, long, or fingerprint size keys.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1715650 with patch from Mattheww S
+      - Fix to make duplicity attempt a get first, then create, a container
+        in order to support container ACLs.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Merged in lp:~mterry/duplicity/more-decode-issues
+      - Here's some fixes for another couple UnicodeDecodeErrors.
+      - The duplicity/dup_time.py fixes when a user passes a utf8 date string (or a string with bogus
+        utf8 characters, but they have to really try to do that). This is bug 1334436.
+      - The bin/duplicity change from str(e) to util.uexc(e) fixes bug 1324188.
+      - The rest of the changes (util.exception_traceback and bin/duplicity changes to use it) are to
+        make the printing of exceptions prettier. Without this, if you see a French exception, you see
+        "accept\xe9es" instead of "acceptées".
+      - You can test all of these changes in one simple line:
+        $ LANGUAGE=fr duplicity remove-older-than $'accept\xffées'
+    * Fix backend.py to allow string, list, and tuple types to support megabackend.py.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug introduced in new megabackend.py where process_commandline()
+      takes a string not a list.  Now it takes both.
+    * Updated web page for new megabackend requirements.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1538333 Assertion error in manifest.py: assert filecount == ...
+      - Made sure to never pass .part files as true manifest files
+      - Changed assert to log.Error to warn about truncated/corrupt filelist
+      - Added unit test to make sure detection works
+      - Note: while this condition is serious, it will not affect the basic backup and restore
+        functions.  Interactive options like --list-files-changed and --file-changed will not
+        work correctly for this backup set, so it is advised to run a full backup as soon as
+        possible after this error occurs.
+    * Fixed bug #1638033 Remove leading slash on --file-to-restore
+      - code already used rstrip('/') so change to just strip('/')
+    * Prep for 0.7.14
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1394386 with new module megabackend.py from Tomas Vondra
+      - uses megatools from https://megatools.megous.com/ instead of mega.py library
+        which has been deprecated
+      - fixed copyright and PEP8 issues
+      - replaced subprocess.call() with self.subprocess_popen() to standardize
+    * Fixed bug #1713640 with patch from Aleksandar Ivanisevic
+      - replace 2.7 syntax with 2.6 equivalent
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1711905 with suggestion from Schneider
+      - log.Warn was invoked with log.warn in webdavbackend.py
+    * Merged in lp:~mterry/duplicity/gpg-tag-versions
+      - Support gpg versions numbers that have tags on them.
+      - This can happen if you build gpg from git trunk (e.g. 2.1.15-beta20). Or if you run
+        against the freedesktop flatpak runtime (e.g. 2.1.14-unknown).
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1709047 with suggestion from Gary Hasson
+      - fixed so default was to use original filename
+    * Fixed PEP8 errors in bin/duplicity
+    * Merged in lp:~mterry/duplicity/gio_child_for_display_name_0.7
+      - gio: be slightly more correct and get child GFiles based on display name
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Patched in lp:~mterry/duplicity/giobackend-display-name
+      - giobackend: handle a wider variety of gio backends by making less assumptions;
+        in particular, this fixes the google-drive: backend
+
+>>>>>>> MERGE-SOURCE
 2017-07-20  Kenneth Loafman  <[e-mail]>
 
     * Fixed encrypted remote manifest handling to merely put out a non-fatal
       error message and continue if the private key is not available.
 
-2017-07-19  Kenneth Loafman  <[e-mail]>
[phone]  Kenneth Loafman  <[e-mail]>
 
     * Fixed slowness in 'collection-status' by basing the status on the
       remote system only.  The local cache is treated as empty.
 
 2017-07-11  Kenneth Loafman  <[e-mail]>
 
-    * Patched in lp:~dawgfoto/duplicity/skip_sync_collection_status
+    * Merged in lp:~dawgfoto/duplicity/skip_sync_collection_status
       - collection-status should not sync metadata
       - up-to-date local metadata is not needed as collection-status is
         generated from remote file list
       - syncing metadata might require to download several GBs
 
-2017-06-30  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~xlucas/duplicity/multibackend-prefix-affinity
-      - Support prefix affinity in multibackend.
-    * Merged in lp:~xlucas/duplicity/pca-backend
-      - Add support for OVH Public Cloud Archive backend.
-    * Fixed PEP8 and 2to3 issues.
-
-2017-06-23  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dawgfoto/duplicity/replicate
-      - Add integration test for newly added replicate command.
-      - Also see https://code.launchpad.net/~dawgfoto/duplicity/replicate/+merge/322836.
-
-2017-06-19  Kenneth Loafman  <[e-mail]>
[phone]  Kenneth Loafman  <[e-mail]>
 
     * Fixed problem in dist/makedist when building on Mac where AppleDouble
       files were being created in the tarball.  See:
       https://superuser.com/questions/61185/why-do-i-get-files-like-foo-in-my-tarball-on-os-x
+    * Prep for 0.17.13.1
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Merged in lp:~duplicity-team/duplicity/po-updates
+    * Prep for 0.7.13
 
 2017-06-10  Kenneth Loafman  <[e-mail]>
 
@@ -380,19 +609,6 @@
     * Merged in lp:~xlucas/duplicity/swift-multibackend-bug
       - Fix a bug when swift backend is used in a multibackend configuration.
 
-2017-06-04  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~aaron-whitehouse/duplicity/08-fix-man-verify
-      - Fix description of --verify and --compare-data in the man page. Now
-        clarifies that verify compares the restored files to hashes stored at
-        backup date, while --compare-data compares restored files to files
-        in target_path.
-
-2017-06-03  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dernils/duplicity/docker-compose
-      - Test Infrastructure now utilizing docker-compose
-
 2017-06-02  Kenneth Loafman  <[e-mail]>
 
     * Fix bug #1672540 with patch from Benoit Nadeau
@@ -418,26 +634,6 @@
       - Caveat: long incremental chains will still eat up a large number of file
         descriptors.  It's a very risky practice, so I'm not inclined to fix it.
 
-2017-05-15  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dernils/duplicity/Dockerfile
-      - Now have subnet name and IP of the subnet for testing as a variable.
-
-2017-05-14  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~xlucas/duplicity/swift-storage-policies
-      - This brings support for Swift storage policies: when using a Swift
-        backend, you can specify the policy containers should be operating on.
-      - This is similar to AWS Cloud Storage classes (ia, rrs, glacier and so on).
-    * Merged in lp:~dernils/duplicity/Dockerfile
-      - Added another backend to the docker test infrastructure, updated the setup
-        for testing and updated the documentation.
-
-2017-05-12  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~aaron-whitehouse/duplicity/tox_pylint_fixes
-      - Changes needed to run-tests without pylint E0401(import-error) errors
-
 2017-05-11  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1320641 and others regarding lockfile
@@ -452,53 +648,12 @@
         IOError exception saying that too many files are open. This causes
         restores to fail randomly, after thousands of files have been restored.
 
-2017-05-06  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dernils/duplicity/DockerfileConvenience
-      - Add a few files that are the beginning of further infrastructure based
-        on docker. It contains a Dockerfile for a simple ftp server (used for
-        backend testing) and a setup script that can be used to set up the
-        complete test environment.
-    * Moved Dockerfile for duplicitytest into testinfrastructure/duplicity_test
-    * Moved some things around in testing/infrastructure to clean up
-
-2017-05-05  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dernils/duplicity/DockerfileConvenience
-      - Added a few tools to the Dockerfile that make life easier
[phone]  Kenneth Loafman  <[e-mail]>
+
     * Fixed bug #1320832 with suggestion from Oskar Wycislak
       - Use chunks instead of reading it all in swiftbackend
 
-2017-05-04  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dawgfoto/duplicity/replicate
-      - Add replicate command to replicate a backup (or backup
-        sets older than a given time) to another backend, leveraging
-        duplicity's backend and compression/encryption infrastructure.
-    * Fixed some incoming PyLint and PEP-8 errors.
-    * Merged in lp:~marix/duplicity/add-azure-arguments
-      - Using the Azure backend to store large amounts of data we found that
-        performance is sub-optimal. The changes on this branch add command line
-        parameters to fine-tune some parameters of the Azure storage library,
-        allowing to push write performance towards Azure above 1 Gb/s for large
-        back-ups. If a user does not provide the parameters the defaults of the
-        Azure storage library will continue to be used.
-    * Replace incoming non-ASCII chars in commandline.py
-    * bzr does not honor perms so fix the perms at the start of the testing and
-      avoid annoying error regarding testing/gnupg having too lenient perms
-
-2017-04-23  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~dernils/duplicity/testing
-      - Fixed minor stuff in requirements.txt.
-      - Added a Dockerfile for testing.
-      - Minor changes to README files.
-      - Added README-TESTING with some information on testing.
-    * Merged in lp:~dernils/duplicity/documentation
-      - Minor changes to README-REPO, README-TESTING
-      - Also redo the changes to requirements.txt and Dockerfile
-
-2017-04-22  Kenneth Loafman  <[e-mail]>
[phone]  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1680682 with patch supplied from Dave Allan
       - Only specify --pinentry-mode=loopback when --use-agent is not specified
@@ -507,6 +662,10 @@
       - Use shutil.copyfile instead of os.system('cp ...')
       - Should reduce overhead of os.system() memory usage.
 
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.12
+
 2017-03-13  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1668750 - Don't mask backend errors
@@ -517,55 +676,22 @@
     * Fixed bug #1671852 - Code regression caused by revision 1108
       - change util.uexc() back to bare uexc()
 
-2017-03-05  Kenneth Loafman  <[e-mail]>
-
-    * Merged in p:~aaron-whitehouse/duplicity/pep8_E402_fixes
-      - Fixed PEP8 errors: E402 module level import not at top of file
-
-2017-03-02  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~benoit.bertholon/duplicity/duplicity
-      - Use the globals.archive_dir variable to store only a string
-        in the case of a path, uses globals.archive_dir_path
-
 2017-02-21  Kenneth Loafman  <[e-mail]>
 
-    * Merged in lp:~marix/duplicity/azure-storage-0.30.0-plus
-      - This makes the Azure backend compatible with version 0.30.0 and up of the
-        underlying azure-storage package.
-    * Merged in lp:~marix/duplicity/azure-storage-sas
-      - This branch adds support for Shared Access Signature to the Azure backend
-        which allows to run Duplicity with a minimal set of permissions.
-    * Merged in lp:~aaron-whitehouse/duplicity/pep8_test_fixes
-      - Fix PEP-8 testing by moving to using pycodestyle library.
-      - Temporarily add ignores to allow these tests to pass.
-      - Fix E305 PEP8 errors: expected 2 blank lines after class or function definition, found 1.
-    * Merged in lp:~benoit.bertholon/duplicity/duplicity
-      - Fixes bug #1666194 - ProcessCommandLine function called twice fail and arglist argument not used
-    * Fixed variable name change in last merge which broke a bunch of tests
-      - Changed archive_dir_root back to archive_dir
     * Fixed bug #1367675 - IMAP Backend does not work with Yahoo server
       - added the split() as needed in 'nums=list[0].strip().split(" ")'
       - the other fixes mentioned in the bug report comments were already done
 
-2017-02-12  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~aaron-whitehouse/duplicity/08-python-futurize-stage-1
-      - Made many of the safer changes for improved Python 3 support (python-future's futurize -stage1)
-        without functional change to the code (and leaving the isinstance(s, types.StringType) tests unchanged).
-      - Created Python 2/3 compatible tests for int and long.
-      - Update setup.py to show only Python 2.7 support.
-
 2017-02-11  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1603704 with patch supplied by Maciej Bliziński
       - Crash with UnicodeEncodeError
+    * Some fixes to gpg.py to handle gpg1 & gpg2 & gpg2.1 commandline issues
+      - --gpg-agent is optional on gpg1, but on gpg2 it is used automatically
+      - --pinentry-mode is not a valid opt until gpg2.1, so condition on that
 
 2017-02-08  Kenneth Loafman  <[e-mail]>
 
-    * Merged in lp:~aaron-whitehouse/duplicity/08-refactor-unit-test-globmatch
-      - Rename path_matches_glob_fn to select_fn_from_glob, as this more accurately reflects the return value.
-      - Significantly refactored unit/test_globmatch.py to make this cleaner and clearer.
     * Fixed bug #1657916 with patch supplied by Daniel Harvey
       - B2 provider cannot handle two backups in the same bucket
 
@@ -573,13 +699,6 @@
 
     * Add detail about import exceptions in onedrivebackend.py
 
-2017-01-30  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~aaron-whitehouse/duplicity/08-merge-glob-parsers
-      - Use a single code path for glob strings whether or not these contain special
-        characters/wildcards (glob_get_normal_sf) and remove glob_get_filename_sf and glob_get_tuple_sf.
-      - Remove run-tests-ve as this was identical to run-tests.
-
 2017-01-24  Kenneth Loafman  <[e-mail]>
 
     * Merged in lp:~matthew-t-bentley/duplicity/duplicity
@@ -588,6 +707,13 @@
       - Only retrieves a new upload URL when the current one expires, to bring it in line
         with their best practices for integrations: https://www.backblaze.com/b2/docs/integration_checklist.html
 
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Fixed bug #1658283 "Duplicity 0.7.11 broken with GnuPG 2.0"
+      - Made gpg version check more robust than just major version
+      - Now use --pinentry-mode=loopback on gpg 2.1 and greater
+      - Removed check for non-Linux systems, a false problem
+
 2017-01-19  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1655268 "--gpg-binary option not working"
@@ -599,13 +725,10 @@
       - Failing test on OpenBSD because tar/gtar not found
     * Fixed bug #1654220 with patch supplied by Kenneth Newwood
       - Duplicity fails on MacOS because GPG version parsing fails
-    * Merged in lp:~aaron-whitehouse/duplicity/0-8-merge_selection_tests
-      - Merge in TestExcludeIfPresent from 0.7-series, which tests the behaviour of
-        duplicity's --exclude-if-present option.
-      - Move and rename TestTrailingSlash2 test (was duplicate name) as in 0.7-series.
-      - Fix PEP error on adbackend.py.
-      - Add jottalib as a tox dep to fix pylint error.
-      - Remove unnecessary skipUnless Linux as per 0.7-series.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.11
 
 2016-12-29  Kenneth Loafman  <[e-mail]>
 
@@ -616,9 +739,8 @@
         Since all important spaces are URL encoded anyway, this should be fine even if there are spaces in
         the URL at all. I also patched it in the onedrive backend, because it must have similar issues.
 
-2016-12-25  Kenneth Loafman  <[e-mail]>
[phone]  Kenneth Loafman  <[e-mail]>
 
-    * Fix some issues with testing on MacOS
     * Fix problem with gpg2 in yakety and zesty
 
 2016-12-11  Kenneth Loafman  <[e-mail]>
@@ -652,21 +774,10 @@
     * Fixed bug #1642098 - does not create PAR2 archives when '--par2-options' is used
       - Missing space between par2-options plus default options
 
-2016-11-07  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~breunigs/duplicity/amazondrive2
-      - Fixed variable renaming issue
-
 2016-11-01  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1621194 with code from Tornhoof
       - Do backup to google drive working without a service account
-    * Merged in lp:~havard/duplicity/jottacloudbackend
-      - Adds support for a new backend, jottacloud.com, using the scheme `jottacloud:/<folder>`.
-      - Reverse-engineered library, `jottalib`: http://github.com/havardgulldahl/jottalib
-      - Here's how you set up jottalib https://github.com/havardgulldahl/jottalib/wiki
-    * Merged in lp:~breunigs/duplicity/amazondrive
-      - Provide a native backend for AmazonDrive
 
 2016-10-22  Kenneth Loafman  <[e-mail]>
 
@@ -680,6 +791,11 @@
     * Fixed bug #1623342 with patch from Daniel Jakots
       - failing test on OpenBSD because tar/gtar not found
 
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Merged in lp:~aaron-whitehouse/duplicity/bug_1620085_exclude-if-present-locked-folder
+      - Fixes Bug #1620085: --exclude-if-present gives OSError looking for tag in locked folders
+
 2016-08-22  Kenneth Loafman  <[e-mail]>
 
     * Fixed bugs #815510 and #1615480
@@ -687,6 +803,10 @@
     * Merged in lp:~mstoll-de/duplicity/duplicity
       - Backblaze announced a new domain for the b2 api
 
[phone]  Kenneth Loafman  <[e-mail]>
+
+    * Prep for 0.7.10
+
 2016-08-18  Kenneth Loafman  <[e-mail]>
 
     * Merged in lp:~fenisilius/duplicity/acd_init_mkdir
@@ -707,27 +827,24 @@
 
 2016-07-28  Kenneth Loafman  <[e-mail]>
 
-    * Merged in lp:~mwilck/duplicity/duplicity
+    * Merged in lp:~mwilck/duplicity/0.7-series
       - Speedup of path_matches_glob() by about 8x.  See
-        https://code.launchpad.net/~mwilck/duplicity/duplicity/+merge/301268
+        https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301332
         for more details.
+    * Remove -w from setsid in functional tests.
 
 2016-07-24  Kenneth Loafman  <[e-mail]>
 
     * Merged in lp:~aaron-whitehouse/duplicity/07-fix_deja_dup_error_on_locked_files
       - Revert log.Error to log.Warn, as it was prior to the merge in rev 1224,
         as this was affecting other applications (e.g. deja dup; Bug #1605939).
+    * Prep for 0.7.09
 
 2016-07-20  Kenneth Loafman  <[e-mail]>
 
     * Fixed bug #1600692 with patch from Wolfgang Rohdewald
       - Allow symlink to have optional trailing slash during verify.
 
-2016-07-03  Kenneth Loafman  <[e-mail]>
-
-    * Merged in lp:~aaron-whitehouse/duplicity/remove-python26
-      - Remove Python 2.6 support references and tests.
-
 2016-07-02  Kenneth Loafman  <[e-mail]>
 
     * Merged in lp:~aaron-whitehouse/duplicity/PEP8_W503_fixes

=== modified file 'README'
--- README	2018-10-07 11:54:04 +0000
+++ README	2019-03-04 12:09:45 +0000
@@ -19,7 +19,11 @@
 
 REQUIREMENTS:
 
+<<<<<<< TREE
  * Python v2.7
+=======
+ * Python v2.6 or later
+>>>>>>> MERGE-SOURCE
  * librsync v0.9.6 or later
  * GnuPG for encryption
  * fasteners 0.14.1 or later for concurrency locking
@@ -34,6 +38,7 @@
 
  * Python development files, normally found in module 'python-dev'.
  * librsync development files, normally found in module 'librsync-dev'.
+ * internationalization tools, normally found in module 'intltool'.
 
 
 A NOTE ON GnuPGInterface.py AND MULTIPLE GPG PROCESSES:

=== modified file 'README-REPO'
--- README-REPO	2017-07-11 14:55:38 +0000
+++ README-REPO	2019-03-04 12:09:45 +0000
@@ -26,3 +26,56 @@
 or
 
 PYTHONPATH=$DUP_ROOT bin/rdiffdir
+
+-----------------------
+Running the unit tests:
+-----------------------
+
+To run all tests:
+cd testing; ./run-tests
+
+You can run specific tests using:
+tox -- -s [folder].[folder].[file].[class].[test]
+For example:
+tox -- -s testing.unit.test_selection
+or:
+tox -- -s testing.unit.test_selection.MatchingTest.test_tuple_include
+
+Note: some tests require rdiff and pylint to be installed on the system for
+them to pass.
+
+Please run all tests on your branch (run-tests) before proposing a merge, to
+ensure that all tests pass. The decorator @unittest.expectedFailure can be used
+to commit a known-failing test case without breaking the test suite, for
+example to exhibit the behaviour in a bug report before it has been fixed:
+
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
+
+
+class TestClass(unittest.TestCase):
+    """Test class to show expectedFailure"""
+
+    @unittest.expectedFailure
+    def test_expected_failure(self):
+        """Test behaviour of expectedFailure"""
+        self.assertEqual(1, 2)
+
+-----------------------------------------
+Testing against multiple Python versions:
+-----------------------------------------
+
+Duplicity currently supports Python versions v2.6 or later. Duplicity uses tox
+to make it easy to test your code against multiple Python versions. Running
+tests using the commands above will automatically test code against both
+Python v2.6 and v2.7, if you have both installed on your system. It will also
+test against the versions of dependencies used by the Launchpad build system.
+You can test against a single environment, e.g.
+tox -e py26
+for example if you are working on fixing a bug, but please do a full run-tests
+before submitting a merge request.
+
+For instructions on installing Python v2.6 on newer versions of Ubuntu, see
+https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes

=== removed file 'README-TESTING'
--- README-TESTING	2017-05-14 07:17:59 +0000
+++ README-TESTING	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-# Testing duplicty
-
-## Introduction
-Duplicitys test concept bases on unit test. 
-All tests are contained in the /testing folder of the main repository. 
-
-As to see in the following sketch, there are several levels of testing duplicity and each can be used directly.
-
-                                    ┌─────────────────────┐     
-                                    │    docker image     │     
-                                    ├─────────────────────┴────┐
-                                    │                          │
-                                    │  ┌──────────────────┐    │
-                                    │  │       tox        │    │
-                                    │  └──────────────────┘    │
-                                    │            │             │
-                                    │            ▼             │
-                                    │  ┌──────────────────┐    │
-                                    │  │    unittests     │    │
-                                    │  └──────────────────┘    │
-                                    │            │             │
-                                    │            ▼             │
-                                    │  ┌──────────────────┐    │
-                                    │  │    duplicity     │    │
-                                    │  └──────────────────┘    │
-                                    │                          │
-                                    └──────────────────────────┘
-1. Testing directly using __setup.py__
-Assuming that your machine has all the required dependencies installed, you can start all the unit tests by simply typing
-
-‘setup.py test‘ 
-
-2. Using __tox__
-Tox is a generic virtualenv management and test command line tool that is used for checking your package installs correctly with different Python versions and interpreters. It 
-runs the tests in each of the environments that are configured in the tox.ini file (see root folder of the repository)
-
-Duplicity uses tox to make it easy to test your code against multiple
-environments. Running tests using the commands above will automatically test
-code against different supported environments, including the versions of
-dependencies used by the Launchpad build system.
-
-A tox run can be started simply by typing 
-
-‘tox‘
-
-from the main duplicity folder. 
-
-You can run specific tests using:
-‘tox -- -s [folder].[folder].[file].[class].[test]‘
-For example:
-‘tox -- -s testing.unit.test_selection‘
-or:
-‘tox -- -s testing.unit.test_selection.MatchingTest.test_tuple_include‘
-
-You can test against a single environment, e.g.
-‘tox -e py27‘
-for example if you are working on fixing a bug, but please do a full run-tests
-before submitting a merge request.
-
-Note: some tests require rdiff and pylint to be installed on the system for
-them to pass.
-
-Please run all tests on your branch (run-tests) before proposing a merge, to
-ensure that all tests pass. The decorator @unittest.expectedFailure can be used
-to commit a known-failing test case without breaking the test suite, for
-example to exhibit the behaviour in a bug report before it has been fixed.
-
-3. Via a __docker__ image 
-Testing on a developer's machine can be tricky. Testing duplicity requires a set of dependencies being installed and reacts sensitiviely to changes of the local python configuration. In order to make sure that such interactions do not pose any influence on executing the tests, docker is the technology of choice. 
-Along with the tests, a docker image has been created (cf. Dockerfile in root folder of repo) that ensure the following things:
-- It bases on a clean Ubunut 16.04
-- It installs all the required packages that are needed for testing
-- It then branches the repository of duplicty to the folder /duplicty/testing within the docker image
-- And installs all the required python packages (as defined in the requirements.txt)
-Therewith, the docker image provides a clean and reproducible environment for executing the tests of duplicty. 
-In order to get hands on the docker image you simply: 
-1) Install Docker on your machine (https://docs.docker.com/engine/installation/)
-2) Start the image docker run -it dernils/duplicitytest /bin/bash (if you did not use the image before, it will be downloaded automatically)
-3) At the prompt of the docker image type:
-‘cd /testing‘
-‘tox‘ 
-to start a run of the test cases. 
-
-## Dependencies for testing
-If you should prefer to execute the tests locally without using docker, the Dockerfile that is checked into the root folder of the repository contains useful information. It contains a section marked "The following packages are needed for testing duplicity". Within this section all dependencies that need to be installed on a machine to execute the test cases are identified. 
-
-## Working with test coverage
-Python makes it easy to determine, how well the tests cover the source code. 
-
-You first run the tests __under observation__ of the coverage script:
-‘coverage run setup.py test‘
-After that, a report can be generated by the use of the command:
-‘coverage html --omit="testing/*,/usr/*"‘
-
-The report will be generated and stored in the folder htmlcov. 
-
-## The wider picture - supporting containers for testing
-Testing duplicity invokes backends. The backends are the places where the backup data is actually stored (e.g. an ftp server). In order to have the highest degree of control over the testing process, backends that can be set up locally are also operated in separated docker containers. The whole test infrastructure is shown in the following picture. 
-
-┌─────────────────────┐         ┌──────────────────────────────────────────┐   
-│docker image         │         │docker image                              │   
-│dernils/duplicitytest│         │dernils/duplicity_testinfrastructure_ssh  │   
-├─────────────────────┴────┐    ├──────────────────────────────────────────┴──┐
-│                          │    │                                             │
-│  ┌──────────────────┐    │    │   ┌──────────────────┐                      │
-│  │       tox        │    │ ┌──┼──▶│       sshd       │                      │
-│  └──────────────────┘    │ │  │   └──────────────────┘                      │
-│            │             │ │  │                                             │
-│            ▼             │ │  └─────────────────────────────────────────────┘
-│  ┌──────────────────┐    │ │  ┌──────────────────────────────────────────┐   
-│  │    unittests     │    │ │  │docker image                              │   
-│  └──────────────────┘    │ │  │dernils/duplicity_testinfrastructure_ftp  │   
-│            │             │ │  ├──────────────────────────────────────────┴──┐
-│            ▼             │ │  │                                             │
-│  ┌──────────────────┐    │ │  │   ┌──────────────────┐                      │
-│  │    duplicity     │◀───┼─┴──┼──▶│    pure-ftpd     │                      │
-│  └──────────────────┘    │    │   └──────────────────┘                      │
-│            │             │    │                                             │
-└────────────┼─────────────┘    └─────────────────────────────────────────────┘
-             │                                                                 
-             │                                                                 
-             │                                                                 
-             └────────────┐                                                    
-                          │                                                    
-       Internet .─────────┼─────────.                                          
-         _.────'          │          `─────.                                   
-     _.─'                 │                 `──.                               
-   ,'                     ▼                     `.                             
-  ;             ┌──────────────────┐              :                            
-  :             │     Dropbox      │              ;                            
-   ╲            └──────────────────┘             ╱                             
-    `.                                         ,'                              
-      `──.                                 _.─'                                
-          `─────.                   _.────'                                    
-                 `─────────────────'                                           
-
-The docker images that contain the test infrastructure are defined in the folder /testing/infrastructure. There is a build script to compile the Dockerfile into actual images (build-duplicitiy-test.sh). However, as all images are also published on the docker hub, it is not necessary to build the images before starting testing. Testing can directly be started by using the script setup.sh. If the required docker images are not yet existing, locally, they will be downloaded by Docker. 
-

=== modified file 'bin/duplicity'
--- bin/duplicity	2018-11-29 19:00:15 +0000
+++ bin/duplicity	2019-03-04 12:09:45 +0000
@@ -27,6 +27,7 @@
 # Please send mail to me or the mailing list if you find bugs or have
 # any suggestions.
 
+<<<<<<< TREE
 from builtins import filter
 from builtins import next
 from builtins import map
@@ -34,21 +35,33 @@
 from builtins import object
 import duplicity.errors
 import copy
+=======
+>>>>>>> MERGE-SOURCE
 import gzip
 import os
+import sys
+import time
+import types
+import traceback
 import platform
+import statvfs
+import resource
 import re
+<<<<<<< TREE
 import resource
 from os import statvfs
 import sys
+=======
+>>>>>>> MERGE-SOURCE
 import threading
-import time
-import traceback
-import types
+from datetime import datetime
 import fasteners
 
-from datetime import datetime
-from duplicity import asyncscheduler
+from duplicity import log
+log.setup()
+
+import duplicity.errors
+
 from duplicity import collections
 from duplicity import commandline
 from duplicity import diffdir
@@ -57,17 +70,23 @@
 from duplicity import file_naming
 from duplicity import globals
 from duplicity import gpg
-from duplicity import log
 from duplicity import manifest
 from duplicity import patchdir
 from duplicity import path
-from duplicity import progress
 from duplicity import robust
 from duplicity import tempdir
+from duplicity import asyncscheduler
 from duplicity import util
-
+from duplicity import progress
+
+
+<<<<<<< TREE
 if u'--pydevd' in sys.argv or os.getenv(u'PYDEVD', None):
     import pydevd  # pylint: disable=import-error
+=======
+if '--pydevd' in sys.argv or os.getenv('PYDEVD', None):
+    import pydevd  # @UnresolvedImport
+>>>>>>> MERGE-SOURCE
     pydevd.settrace()
     # In a dev environment the path is screwed so fix it.
     base = sys.path.pop(0)
@@ -75,8 +94,6 @@
     base = os.path.sep.join(base)
     sys.path.insert(0, base)
 
-log.setup()
-
 # If exit_val is not None, exit with given value at end.
 exit_val = None
 
@@ -317,10 +334,31 @@
         return start_index, start_block, end_index, end_block
 
     def validate_block(orig_size, dest_filename):
+<<<<<<< TREE
         info = backend.query_info([dest_filename])[dest_filename]
         size = info[u'size']
         if size is None:
             return  # error querying file
+=======
+        """
+        Compare the remote size to the local one to ensure the transfer went
+        through.
+        Try to get the remote size 3 times because some systems take a little
+        time before they report the size accurately.
+        """
+        for attempt in range(0, globals.num_retries):
+            info = backend.query_info([dest_filename])[dest_filename]
+            size = info['size']
+            if size == orig_size:
+                break
+            if size is None:
+                return
+            log.Notice(_("Remote filesize %d for %s does not match local size %d, retrying.") %
+                       (0 if size is None else size,
+                        util.escape(dest_filename),
+                        orig_size))
+            time.sleep(1 + (attempt * 0.5))
+>>>>>>> MERGE-SOURCE
         if size != orig_size:
             code_extra = u"%s %d %d" % (util.escape(dest_filename), orig_size, size)
             log.FatalError(_(u"File %s was corrupted during upload.") % util.fsdecode(dest_filename),
@@ -465,7 +503,6 @@
 
     # Upload the collection summary.
     # bytes_written += write_manifest(mf, backup_type, backend)
-    mf.set_files_changed_info(diffdir.stats.get_delta_entries_file())
 
     return bytes_written
 
@@ -474,7 +511,7 @@
     u"""
     Return a fileobj opened for writing, save results as manifest
 
-    Save manifest in globals.archive_dir_path gzipped.
+    Save manifest in globals.archive_dir gzipped.
     Save them on the backend encrypted as needed.
 
     @type man_type: string
@@ -494,7 +531,7 @@
                                           manifest=True,
                                           encrypted=globals.encryption)
 
-    fh = dup_temp.get_fileobj_duppath(globals.archive_dir_path,
+    fh = dup_temp.get_fileobj_duppath(globals.archive_dir,
                                       part_man_filename,
                                       perm_man_filename,
                                       remote_man_filename)
@@ -524,7 +561,7 @@
     remote_sig_filename = file_naming.get(sig_type, encrypted=globals.encryption,
                                           gzipped=globals.compression)
 
-    fh = dup_temp.get_fileobj_duppath(globals.archive_dir_path,
+    fh = dup_temp.get_fileobj_duppath(globals.archive_dir,
                                       part_sig_filename,
                                       perm_sig_filename,
                                       remote_sig_filename,
@@ -533,8 +570,13 @@
 
 
 def full_backup(col_stats):
+<<<<<<< TREE
     u"""
     Do full backup of directory to backend, using archive_dir_path
+=======
+    """
+    Do full backup of directory to backend, using archive_dir
+>>>>>>> MERGE-SOURCE
 
     @type col_stats: CollectionStatus object
     @param col_stats: collection status
@@ -622,8 +664,13 @@
 
 
 def incremental_backup(sig_chain):
+<<<<<<< TREE
     u"""
     Do incremental backup of directory to backend, using archive_dir_path
+=======
+    """
+    Do incremental backup of directory to backend, using archive_dir
+>>>>>>> MERGE-SOURCE
 
     @rtype: void
     @return: void
@@ -836,6 +883,7 @@
     def check_signature():
         u"""Thunk run when closing volume file"""
         actual_sig = fileobj.fileobj.get_signature()
+<<<<<<< TREE
         actual_sig = u"None" if actual_sig is None else actual_sig
         sign_key = globals.gpg_profile.sign_key
         sign_key = u"None" if sign_key is None else sign_key
@@ -843,6 +891,15 @@
         if actual_sig[ofs:] != sign_key[ofs:]:
             log.FatalError(_(u"Volume was signed by key %s, not %s") %
                            (actual_sig[ofs:], sign_key[ofs:]),
+=======
+        actual_sig = "None" if actual_sig is None else actual_sig
+        sign_key = globals.gpg_profile.sign_key
+        sign_key = "None" if sign_key is None else sign_key
+        ofs = -min(len(actual_sig), len(sign_key))
+        if actual_sig[ofs:] != sign_key[ofs:]:
+            log.FatalError(_("Volume was signed by key %s, not %s") %
+                           (actual_sig[ofs:], sign_key[ofs:]),
+>>>>>>> MERGE-SOURCE
                            log.ErrorCode.unsigned_volume)
 
     fileobj.addhook(check_signature)
@@ -907,7 +964,7 @@
             col_stats.backend.delete(ext_remote)
             for fn in ext_local:
                 try:
-                    globals.archive_dir_path.append(fn).delete()
+                    globals.archive_dir.append(fn).delete()
                 except Exception:
                     pass
     else:
@@ -1011,6 +1068,7 @@
                    _(u"Rerun command with --force option to actually delete."))
 
 
+<<<<<<< TREE
 def replicate():
     u"""
     Replicate backup files from one remote to another, possibly encrypting or adding parity.
@@ -1127,6 +1185,8 @@
     globals.backend.close()
 
 
+=======
+>>>>>>> MERGE-SOURCE
 def sync_archive():
     u"""
     Synchronize local archive manifest file and sig chains to remote archives.
@@ -1199,7 +1259,7 @@
         return (pr, loc_name, fn)
 
     def remove_local(fn):
-        del_name = globals.archive_dir_path.append(fn).name
+        del_name = globals.archive_dir.append(fn).name
 
         log.Notice(_(u"Deleting local %s (not authoritative at backend).") %
                    util.fsdecode(del_name))
@@ -1266,14 +1326,14 @@
         else:
             gpg.GzipWriteFile(src_iter, tdp.name, size=sys.maxsize)
         tdp.setdata()
-        tdp.move(globals.archive_dir_path.append(loc_name))
+        tdp.move(globals.archive_dir.append(loc_name))
 
     # get remote metafile list
     remlist = globals.backend.list()
     remote_metafiles, ignored, rem_needpass = get_metafiles(remlist)
 
     # get local metafile list
-    loclist = globals.archive_dir_path.listdir()
+    loclist = globals.archive_dir.listdir()
     local_metafiles, local_partials, loc_needpass = get_metafiles(loclist)
 
     # we have the list of metafiles on both sides. remote is always
@@ -1496,7 +1556,11 @@
     # determine what action we're performing and process command line
     action = commandline.ProcessCommandLine(sys.argv[1:])
 
+<<<<<<< TREE
     globals.lockpath = os.path.join(globals.archive_dir_path.name, b"lockfile")
+=======
+    globals.lockpath = os.path.join(globals.archive_dir.name, "lockfile")
+>>>>>>> MERGE-SOURCE
     globals.lockfile = fasteners.process_lock.InterProcessLock(globals.lockpath)
     log.Debug(_(u"Acquiring lockfile %s") % globals.lockpath)
     if not globals.lockfile.acquire(blocking=False):
@@ -1527,12 +1591,16 @@
     check_resources(action)
 
     # check archive synch with remote, fix if needed
+<<<<<<< TREE
     if action not in [u"collection-status", u"replicate"]:
+=======
+    if action not in ["collection-status"]:
+>>>>>>> MERGE-SOURCE
         sync_archive()
 
     # get current collection status
     col_stats = collections.CollectionsStatus(globals.backend,
-                                              globals.archive_dir_path,
+                                              globals.archive_dir,
                                               action).set_values()
 
     while True:
@@ -1563,7 +1631,7 @@
                     log.Notice(_(u"Cleaning up previous partial %s backup set, restarting." % action))
                     last_backup.delete()
                     col_stats = collections.CollectionsStatus(globals.backend,
-                                                              globals.archive_dir_path,
+                                                              globals.archive_dir,
                                                               action).set_values()
                     continue
             break
@@ -1592,12 +1660,18 @@
         verify(col_stats)
     elif action == u"list-current":
         list_current(col_stats)
+<<<<<<< TREE
     elif action == u"collection-status":
         if not globals.file_changed:
             log.PrintCollectionStatus(col_stats, True)
         else:
             log.PrintCollectionFileChangedStatus(col_stats, globals.file_changed, True)
     elif action == u"cleanup":
+=======
+    elif action == "collection-status":
+        log.PrintCollectionStatus(col_stats, True)
+    elif action == "cleanup":
+>>>>>>> MERGE-SOURCE
         cleanup(col_stats)
     elif action == u"remove-old":
         remove_old(col_stats)
@@ -1605,8 +1679,11 @@
         remove_all_but_n_full(col_stats)
     elif action == u"sync":
         sync_archive()
+<<<<<<< TREE
     elif action == u"replicate":
         replicate()
+=======
+>>>>>>> MERGE-SOURCE
     else:
         assert action == u"inc" or action == u"full", action
         # the passphrase for full and inc is used by --sign-key
@@ -1665,8 +1742,13 @@
     finally:
         tempdir.default().cleanup()
 
+<<<<<<< TREE
 
 if __name__ == u"__main__":
+=======
+
+if __name__ == "__main__":
+>>>>>>> MERGE-SOURCE
     try:
 
         #         import cProfile
@@ -1703,8 +1785,13 @@
         # For gpg errors, don't show an ugly stack trace by
         # default. But do with sufficient verbosity.
         util.release_lockfile()
+<<<<<<< TREE
         log.Info(_(u"GPG error detail: %s")
                  % util.exception_traceback())
+=======
+        log.Info(_("GPG error detail: %s")
+                 % util.exception_traceback())
+>>>>>>> MERGE-SOURCE
         log.FatalError(u"%s: %s" % (e.__class__.__name__, e.args[0]),
                        log.ErrorCode.gpg_failed,
                        e.__class__.__name__)
@@ -1713,8 +1800,13 @@
         util.release_lockfile()
         # For user errors, don't show an ugly stack trace by
         # default. But do with sufficient verbosity.
+<<<<<<< TREE
         log.Info(_(u"User error detail: %s")
                  % util.exception_traceback())
+=======
+        log.Info(_("User error detail: %s")
+                 % util.exception_traceback())
+>>>>>>> MERGE-SOURCE
         log.FatalError(u"%s: %s" % (e.__class__.__name__, util.uexc(e)),
                        log.ErrorCode.user_error,
                        e.__class__.__name__)
@@ -1723,15 +1815,24 @@
         util.release_lockfile()
         # For backend errors, don't show an ugly stack trace by
         # default. But do with sufficient verbosity.
+<<<<<<< TREE
         log.Info(_(u"Backend error detail: %s")
                  % util.exception_traceback())
+=======
+        log.Info(_("Backend error detail: %s")
+                 % util.exception_traceback())
+>>>>>>> MERGE-SOURCE
         log.FatalError(u"%s: %s" % (e.__class__.__name__, util.uexc(e)),
                        log.ErrorCode.user_error,
                        e.__class__.__name__)
 
     except Exception as e:
         util.release_lockfile()
+<<<<<<< TREE
         if u"Forced assertion for testing" in util.uexc(e):
+=======
+        if "Forced assertion for testing" in util.uexc(e):
+>>>>>>> MERGE-SOURCE
             log.FatalError(u"%s: %s" % (e.__class__.__name__, util.uexc(e)),
                            log.ErrorCode.exception,
                            e.__class__.__name__)

=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2019-01-26 16:36:27 +0000
+++ bin/duplicity.1	2019-03-04 12:09:45 +0000
@@ -21,7 +21,7 @@
 source_url target_directory
 
 .B duplicity collection-status
-.I [options] [--file-changed <relpath>]
+.I [options]
 target_url
 
 .B duplicity list-current-files
@@ -48,10 +48,6 @@
 .I [options] [--force] [--extra-clean]
 target_url
 
-.B duplicity replicate
-.I [options] [--time time]
-source_url target_url
-
 .SH DESCRIPTION
 Duplicity incrementally backs up files and folders into
 tar-format volumes encrypted with GnuPG and places them to a
@@ -168,28 +164,23 @@
 
 .TP
 .BI "verify " "[--compare-data] [--time <time>] [--file-to-restore <rel_path>] <url> <local_path>"
-Verify tests the integrity of the backup archives at the remote location by downloading each file
-and checking both that it can restore the archive and that the restored file matches the signature
-of that file stored in the backup, i.e. compares the archived file with its hash value from archival
-time. Verify does not actually restore and will not overwrite any local files. Duplicity
-will exit with a non-zero error level if any files do not match the signature stored in the archive
-for that file. On verbosity level 4 or higher, it will log a message for each file that differs
-from the stored signature. Files must be downloaded to the local machine in order to compare them.
-Verify does not compare the backed-up version of the file to the current local copy of the files
-unless the --compare-data option is used (see below).
+Restore backup contents temporarily file by file and compare against the local path's contents.
+duplicity will exit with a non-zero error level if any files are different.
+On verbosity level info (4) or higher, a message for each file that has
+changed will be logged.
 .br
 The
 .I --file-to-restore
 option restricts verify to that file or folder.
 The
 .I --time
-option allows to select a backup to verify.
+option allows to select a backup to verify against.
 The
 .I --compare-data
 option enables data comparison (see below).
 
 .TP
-.BI "collection-status " "[--file-changed <relpath>]" "<url>"
+.BI "collection-status " "<url>"
 Summarize the status of the backup repository by printing the chains
 and sets found, and the number of volumes in each.
 
@@ -252,19 +243,6 @@
 .I --force
 will be needed to delete the files instead of just listing them.
 
-.TP
-.BI "replicate " "[--time time] <source_url> <target_url>"
-Replicate backup sets from source to target backend. Files will be
-(re)-encrypted and (re)-compressed depending on normal backend
-options. Signatures and volumes will not get recomputed, thus options like
-.BI --volsize
-or
-.BI --max-blocksize
-have no effect.
-When
-.I --time time
-is given, only backup sets older than time will be replicated.
-
 .SH OPTIONS
 
 .TP
@@ -349,14 +327,8 @@
 
 .TP
 .BI --compare-data
-Enable data comparison of regular files on action verify. This conducts a
-verify as described above to verify the integrity of the backup archives,
-but additionally compares restored files to those in target_directory.
-Duplicity will not replace any files in target_directory. Duplicity will
-exit with a non-zero error level if the files do not correctly verify or
-if any files from the archive differ from those in target_directory. On
-verbosity level 4 or higher, it will log a message for each file that
-differs from its equivalent in target_directory.
+Enable data comparison of regular files on action verify.
+This is disabled by default for performance reasons.
 
 .TP
 .BI --copy-links
@@ -465,15 +437,6 @@
 argument for more information.
 
 .TP
-.BI "--file-changed " path
-This option may be given in collection-status mode, causing only
-.I path
-status to be collect instead of the entire contents of the backup archive.
-.I path
-should be given relative to the root of the directory backed up.
-
-
-.TP
 .BI "--file-prefix, --file-prefix-manifest, --file-prefix-archive, --file-prefix-signature
 Adds a prefix to all files, manifest files, archive files, and/or signature files.
 
@@ -816,6 +779,7 @@
 when uploading to S3 to ensure you kill connections to slow S3 endpoints.
 
 .TP
+<<<<<<< TREE
 .BI "--azure-blob-tier"
 Standard storage tier used for backup files (Hot|Cool|Archive).
 
@@ -839,6 +803,8 @@
 blob size exceeds 64MB. The default values is 2.
 
 .TP
+=======
+>>>>>>> MERGE-SOURCE
 .BI "--scp-command " command
 .B (only ssh pexpect backend with --use-scp enabled)
 The
@@ -948,13 +914,6 @@
 .BR "A NOTE ON SSL CERTIFICATE VERIFICATION" .
 
 .TP
-.BI --swift-storage-policy
-Use this storage policy when operating on Swift containers.
-.br
-See also
-.BR "A NOTE ON SWIFT (OPENSTACK OBJECT STORAGE) ACCESS" .
-
-.TP
 .BI "--tempdir " directory
 Use this existing directory for duplicity temporary files instead of
 the system default, which is usually the /tmp directory. This option
@@ -1093,15 +1052,6 @@
 Formats of each of the URL schemes follow:
 
 .PP
-.B "Amazon Drive Backend"
-.PP
-.RS
-ad://some_dir
-.PP
-See also
-.B "A NOTE ON AMAZON DRIVE"
-.RE
-.PP
 .BR "Azure"
 .PP
 .RS
@@ -1266,15 +1216,6 @@
 .B "A NOTE ON SWIFT (OPENSTACK OBJECT STORAGE) ACCESS"
 .RE
 .PP
-.BR "Public Cloud Archive" " (OVH)"
-.PP
-.RS
-pca://container_name[/prefix]
-.PP
-See also
-.B "A NOTE ON PCA ACCESS"
-.RE
-.PP
 .B "Tahoe-LAFS"
 .PP
 .RS
@@ -1584,25 +1525,6 @@
 which aren't followed by 'foo'.  However, it wouldn't match /home even
 if /home/ben/1234567 existed.
 
-.SH A NOTE ON AMAZON DRIVE
-.IP 1.
-The API Keys used for Amazon Drive have not been granted production limits.
-Amazon do not say what the development limits are and are not replying to
-to requests to whitelist duplicity. A related tool, acd_cli, was demoted to
-development limits, but continues to work fine except for cases of excessive
-usage. If you experience throttling and similar issues with Amazon Drive using
-this backend, please report them to the mailing list.
-.IR
-.IP 2.
-If you previously used the
-.BI acd+acdcli
-backend, it is strongly recommended to update to the
-.BI ad
-backend instead, since it interfaces directly with Amazon Drive. You will need
-to setup the OAuth once again, but can otherwise keep your backups and config.
-.IR
-.RE
-
 .SH A NOTE ON AZURE ACCESS
 The Azure backend requires the Microsoft Azure Storage SDK for Python to be
 installed on the system.
@@ -1610,13 +1532,9 @@
 .B REQUIREMENTS
 above.
 
-It uses environment variables for authentification:
+It uses two environment variables for authentification:
 .BR AZURE_ACCOUNT_NAME " (required),"
-.BR AZURE_ACCOUNT_KEY " (optional),
-.BR AZURE_SHARED_ACCESS_SIGNATURE " (optional)."
-One of
-.BR AZURE_ACCOUNT_KEY " or"
-.BR AZURE_SHARED_ACCESS_SIGNATURE " is required."
+.BR AZURE_ACCOUNT_KEY " (required)"
 
 A container name must be a valid DNS name, conforming to the following naming
 rules:
@@ -1753,13 +1671,8 @@
 
 .SH A NOTE ON FILENAME PREFIXES
 
-Filename prefixes can be used in
-.B "multi backend "
-with
-.B "mirror "
-mode to define affinity rules. They can also be used in conjunction with
-S3 lifecycle rules to transition archive files to Glacier, while keeping
-metadata (signature and manifest files) on S3.
+Filename prefixes can be used in conjunction with S3 lifecycle rules to transition
+archive files to Glacier, while keeping metadata (signature and manifest files) on S3.
 
 Duplicity does not require access to archive files except when restoring from backup.
 
@@ -1876,8 +1789,7 @@
      "name" : "FOO",
      "value" : "bar"
     }
-   ],
-   "prefixes": ["prefix1_", "prefix2_"]
+   ]
  },
  {
   "url": "file:///path/to/dir"
@@ -2093,40 +2005,6 @@
 .B SWIFT_AUTHVERSION
 is unspecified, it will default to version 1.
 
-.SH A NOTE ON PCA ACCESS
-PCA is a long-term data archival solution by OVH. It runs a slightly modified
-version of Openstack Swift introducing latency in the data retrieval process.
-It is a good pick for a
-.BR "multi backend "
-configuration where receiving volumes while an other backend is used to store
-manifests and signatures.
-
-.br
-The backend requires python-switclient to be installed on the system.
-python-keystoneclient is also needed to interact with OpenStack's Keystone
-Identity service.
-See
-.B REQUIREMENTS
-above.
-
-It uses following environment variables for authentification:
-.BR PCA_USERNAME " (required),"
-.BR PCA_PASSWORD " (required),"
-.BR PCA_AUTHURL " (required),"
-.BR PCA_USERID " (optional),"
-.BR PCA_TENANTID " (optional, but either the tenant name or tenant id must be supplied)"
-.BR PCA_REGIONNAME " (optional),"
-.BR PCA_TENANTNAME " (optional, but either the tenant name or tenant id must be supplied)"
-
-If the user was previously authenticated, the following environment
-variables can be used instead:
-.BR PCA_PREAUTHURL " (required),"
-.BR PCA_PREAUTHTOKEN " (required)"
-
-If
-.B PCA_AUTHVERSION
-is unspecified, it will default to version 2.
-
 .SH A NOTE ON MEDIAFIRE BACKEND
 This backend requires
 .B mediafire
@@ -2237,13 +2115,6 @@
 
 Some backends also require additional components (probably available as packages for your specific platform):
 .TP
-.BR "Amazon Drive backend"
-.B python-requests
-- http://python-requests.org
-.br
-.B python-requests-oauthlib
-- https://github.com/requests/requests-oauthlib
-.TP
 .BR "azure backend" " (Azure Blob Storage Service)"
 .B Microsoft Azure Storage SDK for Python
 - https://pypi.python.org/pypi/azure-storage/
@@ -2260,10 +2131,6 @@
 .B Dropbox Python SDK
 - https://www.dropbox.com/developers/reference/sdk
 .TP
-.BR "copy backend" " (Copy.com)"
-.B python-urllib3
-- https://github.com/shazow/urllib3
-.TP
 .BR "gdocs gdata backend" " (legacy Google Docs backend)"
 .B Google Data APIs Python Client Library
 - http://code.google.com/p/gdata-python-client/

=== modified file 'debian/control'
=== renamed file 'docs/Makefile' => 'docs/Makefile.THIS'
=== removed directory 'docs/_static'
=== removed directory 'docs/_templates'
=== renamed file 'docs/conf.py' => 'docs/conf.py.THIS'
=== removed file 'docs/duplicity.asyncscheduler.rst'
--- docs/duplicity.asyncscheduler.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.asyncscheduler.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.asyncscheduler module
-===============================
-
-.. automodule:: duplicity.asyncscheduler
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backend.rst'
--- docs/duplicity.backend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backend module
-========================
-
-.. automodule:: duplicity.backend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.azurebackend.rst'
--- docs/duplicity.backends.azurebackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.azurebackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.azurebackend module
-======================================
-
-.. automodule:: duplicity.backends.azurebackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.b2backend.rst'
--- docs/duplicity.backends.b2backend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.b2backend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.b2backend module
-===================================
-
-.. automodule:: duplicity.backends.b2backend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.botobackend.rst'
--- docs/duplicity.backends.botobackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.botobackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.botobackend module
-=====================================
-
-.. automodule:: duplicity.backends.botobackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.cfbackend.rst'
--- docs/duplicity.backends.cfbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.cfbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.cfbackend module
-===================================
-
-.. automodule:: duplicity.backends.cfbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.dpbxbackend.rst'
--- docs/duplicity.backends.dpbxbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.dpbxbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.dpbxbackend module
-=====================================
-
-.. automodule:: duplicity.backends.dpbxbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.gdocsbackend.rst'
--- docs/duplicity.backends.gdocsbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.gdocsbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.gdocsbackend module
-======================================
-
-.. automodule:: duplicity.backends.gdocsbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.giobackend.rst'
--- docs/duplicity.backends.giobackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.giobackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.giobackend module
-====================================
-
-.. automodule:: duplicity.backends.giobackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.hsibackend.rst'
--- docs/duplicity.backends.hsibackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.hsibackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.hsibackend module
-====================================
-
-.. automodule:: duplicity.backends.hsibackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.hubicbackend.rst'
--- docs/duplicity.backends.hubicbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.hubicbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.hubicbackend module
-======================================
-
-.. automodule:: duplicity.backends.hubicbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.imapbackend.rst'
--- docs/duplicity.backends.imapbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.imapbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.imapbackend module
-=====================================
-
-.. automodule:: duplicity.backends.imapbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.lftpbackend.rst'
--- docs/duplicity.backends.lftpbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.lftpbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.lftpbackend module
-=====================================
-
-.. automodule:: duplicity.backends.lftpbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.localbackend.rst'
--- docs/duplicity.backends.localbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.localbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.localbackend module
-======================================
-
-.. automodule:: duplicity.backends.localbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.mediafirebackend.rst'
--- docs/duplicity.backends.mediafirebackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.mediafirebackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.mediafirebackend module
-==========================================
-
-.. automodule:: duplicity.backends.mediafirebackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.megabackend.rst'
--- docs/duplicity.backends.megabackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.megabackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.megabackend module
-=====================================
-
-.. automodule:: duplicity.backends.megabackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.multibackend.rst'
--- docs/duplicity.backends.multibackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.multibackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.multibackend module
-======================================
-
-.. automodule:: duplicity.backends.multibackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.ncftpbackend.rst'
--- docs/duplicity.backends.ncftpbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.ncftpbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.ncftpbackend module
-======================================
-
-.. automodule:: duplicity.backends.ncftpbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.onedrivebackend.rst'
--- docs/duplicity.backends.onedrivebackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.onedrivebackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.onedrivebackend module
-=========================================
-
-.. automodule:: duplicity.backends.onedrivebackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.par2backend.rst'
--- docs/duplicity.backends.par2backend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.par2backend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.par2backend module
-=====================================
-
-.. automodule:: duplicity.backends.par2backend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.pydrivebackend.rst'
--- docs/duplicity.backends.pydrivebackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.pydrivebackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.pydrivebackend module
-========================================
-
-.. automodule:: duplicity.backends.pydrivebackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.backends.pyrax_identity.hubic.rst' => 'docs/duplicity.backends.pyrax_identity.hubic.rst.THIS'
=== renamed file 'docs/duplicity.backends.pyrax_identity.rst' => 'docs/duplicity.backends.pyrax_identity.rst.THIS'
=== renamed file 'docs/duplicity.backends.rst' => 'docs/duplicity.backends.rst.THIS'
=== removed file 'docs/duplicity.backends.rsyncbackend.rst'
--- docs/duplicity.backends.rsyncbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.rsyncbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.rsyncbackend module
-======================================
-
-.. automodule:: duplicity.backends.rsyncbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.backends.ssh_paramiko_backend.rst' => 'docs/duplicity.backends.ssh_paramiko_backend.rst.THIS'
=== renamed file 'docs/duplicity.backends.ssh_pexpect_backend.rst' => 'docs/duplicity.backends.ssh_pexpect_backend.rst.THIS'
=== removed file 'docs/duplicity.backends.swiftbackend.rst'
--- docs/duplicity.backends.swiftbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.swiftbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.swiftbackend module
-======================================
-
-.. automodule:: duplicity.backends.swiftbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.sxbackend.rst'
--- docs/duplicity.backends.sxbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.sxbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.sxbackend module
-===================================
-
-.. automodule:: duplicity.backends.sxbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.tahoebackend.rst'
--- docs/duplicity.backends.tahoebackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.tahoebackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.tahoebackend module
-======================================
-
-.. automodule:: duplicity.backends.tahoebackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.backends.webdavbackend.rst'
--- docs/duplicity.backends.webdavbackend.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.backends.webdavbackend.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.backends.webdavbackend module
-=======================================
-
-.. automodule:: duplicity.backends.webdavbackend
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.cached_ops.rst' => 'docs/duplicity.cached_ops.rst.THIS'
=== removed file 'docs/duplicity.collections.rst'
--- docs/duplicity.collections.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.collections.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.collections module
-============================
-
-.. automodule:: duplicity.collections
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.commandline.rst'
--- docs/duplicity.commandline.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.commandline.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.commandline module
-============================
-
-.. automodule:: duplicity.commandline
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.diffdir.rst'
--- docs/duplicity.diffdir.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.diffdir.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.diffdir module
-========================
-
-.. automodule:: duplicity.diffdir
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.dup_temp.rst' => 'docs/duplicity.dup_temp.rst.THIS'
=== renamed file 'docs/duplicity.dup_threading.rst' => 'docs/duplicity.dup_threading.rst.THIS'
=== renamed file 'docs/duplicity.dup_time.rst' => 'docs/duplicity.dup_time.rst.THIS'
=== removed file 'docs/duplicity.errors.rst'
--- docs/duplicity.errors.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.errors.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.errors module
-=======================
-
-.. automodule:: duplicity.errors
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.file_naming.rst' => 'docs/duplicity.file_naming.rst.THIS'
=== removed file 'docs/duplicity.filechunkio.rst'
--- docs/duplicity.filechunkio.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.filechunkio.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.filechunkio module
-============================
-
-.. automodule:: duplicity.filechunkio
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.globals.rst'
--- docs/duplicity.globals.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.globals.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.globals module
-========================
-
-.. automodule:: duplicity.globals
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.globmatch.rst'
--- docs/duplicity.globmatch.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.globmatch.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.globmatch module
-==========================
-
-.. automodule:: duplicity.globmatch
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.gpg.rst'
--- docs/duplicity.gpg.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.gpg.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.gpg module
-====================
-
-.. automodule:: duplicity.gpg
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.gpginterface.rst'
--- docs/duplicity.gpginterface.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.gpginterface.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.gpginterface module
-=============================
-
-.. automodule:: duplicity.gpginterface
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.lazy.rst'
--- docs/duplicity.lazy.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.lazy.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.lazy module
-=====================
-
-.. automodule:: duplicity.lazy
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.librsync.rst'
--- docs/duplicity.librsync.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.librsync.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.librsync module
-=========================
-
-.. automodule:: duplicity.librsync
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.log.rst'
--- docs/duplicity.log.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.log.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.log module
-====================
-
-.. automodule:: duplicity.log
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.manifest.rst'
--- docs/duplicity.manifest.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.manifest.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.manifest module
-=========================
-
-.. automodule:: duplicity.manifest
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.patchdir.rst'
--- docs/duplicity.patchdir.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.patchdir.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.patchdir module
-=========================
-
-.. automodule:: duplicity.patchdir
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.path.rst'
--- docs/duplicity.path.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.path.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.path module
-=====================
-
-.. automodule:: duplicity.path
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.progress.rst'
--- docs/duplicity.progress.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.progress.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.progress module
-=========================
-
-.. automodule:: duplicity.progress
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.robust.rst'
--- docs/duplicity.robust.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.robust.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.robust module
-=======================
-
-.. automodule:: duplicity.robust
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/duplicity.rst' => 'docs/duplicity.rst.THIS'
=== removed file 'docs/duplicity.selection.rst'
--- docs/duplicity.selection.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.selection.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.selection module
-==========================
-
-.. automodule:: duplicity.selection
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.statistics.rst'
--- docs/duplicity.statistics.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.statistics.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.statistics module
-===========================
-
-.. automodule:: duplicity.statistics
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.tarfile.rst'
--- docs/duplicity.tarfile.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.tarfile.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.tarfile module
-========================
-
-.. automodule:: duplicity.tarfile
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.tempdir.rst'
--- docs/duplicity.tempdir.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.tempdir.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.tempdir module
-========================
-
-.. automodule:: duplicity.tempdir
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/duplicity.util.rst'
--- docs/duplicity.util.rst	2018-07-24 16:17:12 +0000
+++ docs/duplicity.util.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-duplicity.util module
-=====================
-
-.. automodule:: duplicity.util
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/index.rst' => 'docs/index.rst.THIS'
=== renamed file 'docs/make.bat' => 'docs/make.bat.THIS'
=== renamed file 'docs/testing.functional.rst' => 'docs/testing.functional.rst.THIS'
=== renamed file 'docs/testing.functional.test_badupload.rst' => 'docs/testing.functional.test_badupload.rst.THIS'
=== renamed file 'docs/testing.functional.test_cleanup.rst' => 'docs/testing.functional.test_cleanup.rst.THIS'
=== renamed file 'docs/testing.functional.test_final.rst' => 'docs/testing.functional.test_final.rst.THIS'
=== renamed file 'docs/testing.functional.test_log.rst' => 'docs/testing.functional.test_log.rst.THIS'
=== renamed file 'docs/testing.functional.test_rdiffdir.rst' => 'docs/testing.functional.test_rdiffdir.rst.THIS'
=== renamed file 'docs/testing.functional.test_restart.rst' => 'docs/testing.functional.test_restart.rst.THIS'
=== renamed file 'docs/testing.functional.test_selection.rst' => 'docs/testing.functional.test_selection.rst.THIS'
=== renamed file 'docs/testing.functional.test_verify.rst' => 'docs/testing.functional.test_verify.rst.THIS'
=== removed file 'docs/testing.overrides.gettext.rst'
--- docs/testing.overrides.gettext.rst	2018-07-24 16:17:12 +0000
+++ docs/testing.overrides.gettext.rst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-testing.overrides.gettext module
-================================
-
-.. automodule:: testing.overrides.gettext
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== removed file 'docs/testing.overrides.rst'
--- docs/testing.overrides.rst	2018-07-24 16:17:12 +0000
+++ docs/testing.overrides.rst	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-testing.overrides package
-=========================
-
-Submodules
-----------
-
-.. toctree::
-
-   testing.overrides.gettext
-
-Module contents
----------------
-
-.. automodule:: testing.overrides
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/testing.rst' => 'docs/testing.rst.THIS'
=== renamed file 'docs/testing.test_code.rst' => 'docs/testing.test_code.rst.THIS'
=== removed file 'docs/testing.unit.rst'
--- docs/testing.unit.rst	2018-07-24 16:17:12 +0000
+++ docs/testing.unit.rst	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-testing.unit package
-====================
-
-Submodules
-----------
-
-.. toctree::
-
-   testing.unit.test_backend
-   testing.unit.test_backend_instance
-   testing.unit.test_collections
-   testing.unit.test_diffdir
-   testing.unit.test_dup_temp
-   testing.unit.test_dup_time
-   testing.unit.test_file_naming
-   testing.unit.test_globmatch
-   testing.unit.test_gpg
-   testing.unit.test_gpginterface
-   testing.unit.test_lazy
-   testing.unit.test_manifest
-   testing.unit.test_patchdir
-   testing.unit.test_path
-   testing.unit.test_selection
-   testing.unit.test_statistics
-   testing.unit.test_tarfile
-   testing.unit.test_tempdir
-
-Module contents
----------------
-
-.. automodule:: testing.unit
-    :members:
-    :undoc-members:
-    :show-inheritance:

=== renamed file 'docs/testing.unit.test_backend.rst' => 'docs/testing.unit.test_backend.rst.THIS'
=== renamed file 'docs/testing.unit.test_backend_instance.rst' => 'docs/testing.unit.test_backend_instance.rst.THIS'
=== renamed file 'docs/testing.unit.test_collections.rst' => 'docs/testing.unit.test_collections.rst.THIS'
=== renamed file 'docs/testing.unit.test_diffdir.rst' => 'docs/testing.unit.test_diffdir.rst.THIS'
=== renamed file 'docs/testing.unit.test_dup_temp.rst' => 'docs/testing.unit.test_dup_temp.rst.THIS'
=== renamed file 'docs/testing.unit.test_dup_time.rst' => 'docs/testing.unit.test_dup_time.rst.THIS'
=== renamed file 'docs/testing.unit.test_file_naming.rst' => 'docs/testing.unit.test_file_naming.rst.THIS'
=== renamed file 'docs/testing.unit.test_globmatch.rst' => 'docs/testing.unit.test_globmatch.rst.THIS'
=== renamed file 'docs/testing.unit.test_gpg.rst' => 'docs/testing.unit.test_gpg.rst.THIS'
=== renamed file 'docs/testing.unit.test_gpginterface.rst' => 'docs/testing.unit.test_gpginterface.rst.THIS'
=== renamed file 'docs/testing.unit.test_lazy.rst' => 'docs/testing.unit.test_lazy.rst.THIS'
=== renamed file 'docs/testing.unit.test_manifest.rst' => 'docs/testing.unit.test_manifest.rst.THIS'
=== renamed file 'docs/testing.unit.test_patchdir.rst' => 'docs/testing.unit.test_patchdir.rst.THIS'
=== renamed file 'docs/testing.unit.test_path.rst' => 'docs/testing.unit.test_path.rst.THIS'
=== renamed file 'docs/testing.unit.test_selection.rst' => 'docs/testing.unit.test_selection.rst.THIS'
=== renamed file 'docs/testing.unit.test_statistics.rst' => 'docs/testing.unit.test_statistics.rst.THIS'
=== renamed file 'docs/testing.unit.test_tarfile.rst' => 'docs/testing.unit.test_tarfile.rst.THIS'
=== renamed file 'docs/testing.unit.test_tempdir.rst' => 'docs/testing.unit.test_tempdir.rst.THIS'
=== modified file 'duplicity/_librsyncmodule.c'
--- duplicity/_librsyncmodule.c	2018-12-05 03:48:47 +0000
+++ duplicity/_librsyncmodule.c	2019-03-04 12:09:45 +0000
@@ -330,7 +330,7 @@
   fd = dup(fd);
   if (fd == -1) {
     char buf[256];
-    (void)strerror_r(errno, buf, sizeof(buf));
+    strerror_r(errno, buf, sizeof(buf));
     PyErr_SetString(PyExc_TypeError, buf);
     return NULL;
   }

=== modified file 'duplicity/backend.py'
--- duplicity/backend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backend.py	2019-03-04 12:09:45 +0000
@@ -455,8 +455,13 @@
         else:
             return commandline
 
+<<<<<<< TREE
     def __subprocess_popen(self, args):
         u"""
+=======
+    def __subprocess_popen(self, args):
+        """
+>>>>>>> MERGE-SOURCE
         For internal use.
         Execute the given command line, interpreted as a shell command.
         Returns int Exitcode, string StdOut, string StdErr
@@ -480,6 +485,7 @@
 
         Raise a BackendException on failure.
         """
+<<<<<<< TREE
         import shlex
 
         if isinstance(commandline, (list, tuple)):
@@ -493,6 +499,21 @@
         log.Info(_(u"Reading results of '%s'") % logstr)
 
         result, stdout, stderr = self.__subprocess_popen(args)
+=======
+        import shlex
+
+        if isinstance(commandline, (types.ListType, types.TupleType)):
+            logstr = ' '.join(commandline)
+            args = commandline
+        else:
+            logstr = commandline
+            args = shlex.split(commandline)
+
+        logstr = self.munge_password(logstr)
+        log.Info(_("Reading results of '%s'") % logstr)
+
+        result, stdout, stderr = self.__subprocess_popen(args)
+>>>>>>> MERGE-SOURCE
         if result != 0:
             try:
                 ignores = self.popen_breaks[args[0]]
@@ -500,8 +521,13 @@
                 u""" ignore a predefined set of error codes """
                 return 0, u'', u''
             except (KeyError, ValueError):
+<<<<<<< TREE
                 raise BackendException(u"Error running '%s': returned %d, with output:\n%s" %
                                        (logstr, result, stdout.decode() + u'\n' + stderr.decode()))
+=======
+                raise BackendException("Error running '%s': returned %d, with output:\n%s" %
+                                       (logstr, result, stdout + '\n' + stderr))
+>>>>>>> MERGE-SOURCE
         return result, stdout, stderr
 
 
@@ -573,7 +599,11 @@
                 # There shouldn't be any encoding errors for files we care
                 # about, since duplicity filenames are ascii.  But user files
                 # may be in the same directory.  So just replace characters.
+<<<<<<< TREE
                 return util.fsencode(filename)
+=======
+                return filename.encode(globals.fsencoding, 'replace')
+>>>>>>> MERGE-SOURCE
             else:
                 return filename
 

=== modified file 'duplicity/backends/_cf_pyrax.py'
--- duplicity/backends/_cf_pyrax.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/_cf_pyrax.py	2019-03-04 12:09:45 +0000
@@ -71,6 +71,7 @@
 
         self.client_exc = pyrax.exceptions.ClientException
         self.nso_exc = pyrax.exceptions.NoSuchObject
+<<<<<<< TREE
 
         # query rackspace for the specified container name
         try:
@@ -90,6 +91,27 @@
                                u"You may be using a read-only user that can view but not create containers.\n" +
                                u"Please check your credentials and permissions.",
                                log.ErrorCode.backend_permission_denied)
+=======
+
+        # query rackspace for the specified container name
+        try:
+            self.container = pyrax.cloudfiles.get_container(container)
+        except pyrax.exceptions.Forbidden as e:
+            log.FatalError("%s : %s \n" % (e.__class__.__name__, util.uexc(e)) +
+                           "Container may exist, but access was denied.\n" +
+                           "If this container exists, please check its X-Container-Read/Write headers.\n" +
+                           "Otherwise, please check your credentials and permissions.",
+                           log.ErrorCode.backend_permission_denied)
+        except pyrax.exceptions.NoSuchContainer as e:
+            try:
+                self.container = pyrax.cloudfiles.create_container(container)
+            except pyrax.exceptions.Forbidden as e:
+                log.FatalError("%s : %s \n" % (e.__class__.__name__, util.uexc(e)) +
+                               "Container does not exist, but creation was denied.\n" +
+                               "You may be using a read-only user that can view but not create containers.\n" +
+                               "Please check your credentials and permissions.",
+                               log.ErrorCode.backend_permission_denied)
+>>>>>>> MERGE-SOURCE
 
     def _error_code(self, operation, e):
         if isinstance(e, self.nso_exc):

=== added file 'duplicity/backends/acdclibackend.py.OTHER'
--- duplicity/backends/acdclibackend.py.OTHER	1970-01-01 00:00:00 +0000
+++ duplicity/backends/acdclibackend.py.OTHER	2019-03-04 12:09:45 +0000
@@ -0,0 +1,151 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright 2015 Stefan Breunig <[e-mail]>
+# Copyright 2015 Malay Shah <[e-mail]>
+# Based on the backend ncftpbackend.py
+#
+# This file is part of duplicity.
+#
+# Duplicity is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# Duplicity is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with duplicity; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+import os.path
+import urllib
+import string
+import json
+
+import duplicity.backend
+from duplicity import globals
+from duplicity import log
+from duplicity.errors import *  # @UnusedWildImport
+from duplicity import tempdir
+
+
+class ACDBackend(duplicity.backend.Backend):
+    acd_cmd = 'acd_cli'
+    """Connect to remote store using acd_cli"""
+    def __init__(self, parsed_url):
+        duplicity.backend.Backend.__init__(self, parsed_url)
+
+        # we expect an error return, so go low-level and ignore it
+        try:
+            p = os.popen(self.acd_cmd + " version")
+            fout = p.read()
+            ret = p.close()
+        except Exception:
+            pass
+        # the expected error is 0
+        if ret is not None:
+            log.FatalError(self.acd_cmd + " not found:  Please install acd_cli",
+                           log.ErrorCode.backend_not_found)
+
+        self.parsed_url = parsed_url
+        self.url_string = duplicity.backend.strip_auth_from_url(self.parsed_url)
+
+        # Use an explicit directory name.
+        if self.url_string[-1] != '/':
+            self.url_string += '/'
+
+        self.subprocess_popen(self.acd_cmd + " sync")
+
+        # Initialize remote directory
+        remote_path = urllib.unquote(self.parsed_url.path.replace('///', '/')).rstrip()
+        commandline = self.acd_cmd + " ls '%s'" % (remote_path)
+        try:
+            self.subprocess_popen(commandline)
+        except BackendException as e:
+            if e.code == 50:  # Remote directory not there, create a new one
+                commandline = self.acd_cmd + " mkdir '%s'" % remote_path
+                self.subprocess_popen(commandline)
+
+    def _put(self, source_path, remote_filename=None):
+        """Transfer source_path to remote_filename"""
+        if not remote_filename:
+            remote_filename = source_path.get_filename()
+
+        # WORKAROUND for acd_cli: cannot specify remote filename
+        # Link tmp file to the desired remote filename locally and upload
+        remote_path = urllib.unquote(self.parsed_url.path.replace('///', '/'))
+        local_real_duplicity_file = os.path.join(os.path.dirname(source_path.name), remote_filename.rstrip())
+
+        deleteFile = False
+        if(source_path.name != local_real_duplicity_file):
+            try:
+                os.symlink(source_path.name, local_real_duplicity_file)
+                deleteFile = True
+            except IOError as e:
+                log.FatalError("Unable to copy " + source_path.name + " to " + local_real_duplicity_file)
+
+        commandline = self.acd_cmd + " upload --force --overwrite '%s' '%s'" % \
+            (local_real_duplicity_file, remote_path)
+
+        try:
+            l = self.subprocess_popen(commandline)
+        finally:
+            if (deleteFile):
+                try:
+                    os.remove(local_real_duplicity_file)
+                except OSError as e:
+                    log.FatalError("Unable to remove file %s" % e)
+
+    def _get(self, remote_filename, local_path):
+        """Get remote filename, saving it to local_path"""
+        remote_path = os.path.join(urllib.unquote(self.parsed_url.path.replace('///', '/')), remote_filename).rstrip()
+        local_dir = os.path.dirname(local_path.name)
+        local_filename = os.path.basename(local_path.name)
+        commandline = self.acd_cmd + " download '%s' '%s'" % \
+            (remote_path, local_dir)
+        l = self.subprocess_popen(commandline)
+
+        # Keep the remote filename and move the file over
+        try:
+            os.rename(os.path.join(local_dir, remote_filename), local_path.name)
+        except IOError as e:
+            log.FatalError("Unable to move file %s" % e)
+
+        local_path.setdata()
+        if not local_path.exists():
+            raise BackendException("File %s not found" % local_path.name)
+
+    def _query(self, remote_filename):
+        remote_path = os.path.join(urllib.unquote(self.parsed_url.path.replace('///', '/')), remote_filename).rstrip()
+        commandline = self.acd_cmd + " metadata '%s'" % remote_path
+        node = self.subprocess_popen(commandline)
+        if (node[0] == 0 and node[1]):
+            try:
+                size = json.loads(node[1])['contentProperties']['size']
+                return {'size': size}
+            except ValueError as e:
+                raise BackendException('Malformed JSON: expected "contentProperties->size" member in %s' % node[1])
+        return {'size': -1}
+
+    def _list(self):
+        """List files in directory"""
+        def dir_split(str):
+            if (str):
+                return str.split()[2]
+            else:
+                return None
+        commandline = self.acd_cmd + " ls '%s'" % self.parsed_url.path.replace('///', '/')
+        l = self.subprocess_popen(commandline)
+        return [x for x in map(dir_split, l[1].split('\n')) if x]
+
+    def _delete(self, remote_filename):
+        """Delete remote_filename"""
+        remote_file_path = os.path.join(urllib.unquote(self.parsed_url.path.replace('///', '/')),
+                                        remote_filename).rstrip()
+        commandline = self.acd_cmd + " rm '%s'" % (remote_file_path)
+        self.subprocess_popen(commandline)
+
+duplicity.backend.register_backend("acd+acdcli", ACDBackend)

=== renamed file 'duplicity/backends/adbackend.py' => 'duplicity/backends/adbackend.py.THIS'
=== modified file 'duplicity/backends/azurebackend.py'
--- duplicity/backends/azurebackend.py	2019-01-01 21:36:27 +0000
+++ duplicity/backends/azurebackend.py	2019-03-04 12:09:45 +0000
@@ -23,7 +23,6 @@
 import os
 
 import duplicity.backend
-from duplicity import globals
 from duplicity import log
 from duplicity.errors import BackendException
 
@@ -46,11 +45,15 @@
                 self.AzureConflictError = azure.WindowsAzureConflictError
             else:
                 # v1.0.0 and above
+<<<<<<< TREE
                 import azure.storage.blob
                 if hasattr(azure.storage.blob, u'BlobService'):
                     from azure.storage.blob import BlobService
                 else:
                     from azure.storage.blob.blockblobservice import BlockBlobService as BlobService
+=======
+                from azure.storage.blob import BlobService
+>>>>>>> MERGE-SOURCE
                 self.AzureMissingResourceError = azure.common.AzureMissingResourceHttpError
                 self.AzureConflictError = azure.common.AzureConflictHttpError
         except ImportError as e:
@@ -58,7 +61,15 @@
 Azure backend requires Microsoft Azure Storage SDK for Python (https://pypi.python.org/pypi/azure-storage/).
 Exception: %s""" % str(e))
 
+        if 'AZURE_ACCOUNT_NAME' not in os.environ:
+            raise BackendException('AZURE_ACCOUNT_NAME environment variable not set.')
+        if 'AZURE_ACCOUNT_KEY' not in os.environ:
+            raise BackendException('AZURE_ACCOUNT_KEY environment variable not set.')
+        self.blob_service = BlobService(account_name=os.environ['AZURE_ACCOUNT_NAME'],
+                                        account_key=os.environ['AZURE_ACCOUNT_KEY'])
+
         # TODO: validate container name
+<<<<<<< TREE
         self.container = parsed_url.path.lstrip(u'/')
 
         if u'AZURE_ACCOUNT_NAME' not in os.environ:
@@ -104,6 +115,9 @@
                 self.blob_service._BLOB_MAX_CHUNK_DATA_SIZE = globals.azure_max_block_size
                 
     def _create_container(self):
+=======
+        self.container = parsed_url.path.lstrip('/')
+>>>>>>> MERGE-SOURCE
         try:
             self.blob_service.create_container(self.container, fail_on_exist=True)
         except self.AzureConflictError:
@@ -115,11 +129,15 @@
                            log.ErrorCode.connection_failed)
 
     def _put(self, source_path, remote_filename):
+<<<<<<< TREE
         kwargs = {}
         if globals.azure_max_connections:
             kwargs[u'max_connections'] = globals.azure_max_connections
 
+=======
+>>>>>>> MERGE-SOURCE
         # https://azure.microsoft.com/en-us/documentation/articles/storage-python-how-to-use-blob-storage/#upload-a-blob-into-a-container
+<<<<<<< TREE
         try:
             self.blob_service.create_blob_from_path(self.container, remote_filename, source_path.name, **kwargs)
         except AttributeError:  # Old versions use a different method name
@@ -134,6 +152,10 @@
             except AttributeError:  # might not be available in old API
                 pass
             
+=======
+        self.blob_service.put_block_blob_from_path(self.container, remote_filename, source_path.name)
+
+>>>>>>> MERGE-SOURCE
     def _get(self, remote_filename, local_path):
         # https://azure.microsoft.com/en-us/documentation/articles/storage-python-how-to-use-blob-storage/#download-blobs
         self.blob_service.get_blob_to_path(self.container, remote_filename, local_path.name)
@@ -156,16 +178,24 @@
 
     def _query(self, filename):
         prop = self.blob_service.get_blob_properties(self.container, filename)
+<<<<<<< TREE
         try:
             info = {u'size': int(prop.properties.content_length)}
         except AttributeError:
             # old versions directly returned the properties
             info = {u'size': int(prop[u'content-length'])}
         return info
+=======
+        return {'size': int(prop['content-length'])}
+>>>>>>> MERGE-SOURCE
 
     def _error_code(self, operation, e):
         if isinstance(e, self.AzureMissingResourceError):
             return log.ErrorCode.backend_not_found
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u'azure', AzureBackend)
+=======
+duplicity.backend.register_backend('azure', AzureBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/b2backend.py'
--- duplicity/backends/b2backend.py	2018-12-27 16:43:07 +0000
+++ duplicity/backends/b2backend.py	2019-03-04 12:09:45 +0000
@@ -27,11 +27,15 @@
 from builtins import object
 import os
 import hashlib
+<<<<<<< TREE
 from urllib.parse import quote_plus  # pylint: disable=import-error
+=======
+>>>>>>> MERGE-SOURCE
 
 import duplicity.backend
 from duplicity.errors import BackendException, FatalBackendException
 from duplicity import log
+<<<<<<< TREE
 from duplicity import progress
 
 
@@ -50,6 +54,30 @@
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         pass
+=======
+from duplicity import progress
+
+
+def progress_listener_factory():
+    u"""
+    Returns progress instance suitable for passing to b2.api.B2Api
+    methods.
+    """
+    class B2ProgressListener(b2.progress.AbstractProgressListener):
+        def __init__(self):
+            super(B2ProgressListener, self).__init__()
+
+        def set_total_bytes(self, total_byte_count):
+            self.total_byte_count = total_byte_count
+
+        def bytes_completed(self, byte_count):
+            progress.report_transfer(byte_count, self.total_byte_count)
+
+        def close(self):
+            super(B2ProgressListener, self).close()
+    return B2ProgressListener()
+
+>>>>>>> MERGE-SOURCE
 
 class B2Backend(duplicity.backend.Backend):
     u"""
@@ -62,6 +90,7 @@
         """
         duplicity.backend.Backend.__init__(self, parsed_url)
 
+<<<<<<< TREE
         # Import B2 API
         try:
             global b2
@@ -77,6 +106,24 @@
         self.parsed_url.hostname = u'B2'
 
         account_id = parsed_url.username
+=======
+        # Import B2 API
+        try:
+            global b2
+            import b2
+            import b2.api
+            import b2.account_info
+            import b2.download_dest
+            import b2.file_version
+            import b2.progress
+        except ImportError:
+            raise BackendException('B2 backend requires B2 Python APIs (pip install b2)')
+
+        self.service = b2.api.B2Api(b2.account_info.InMemoryAccountInfo())
+        self.parsed_url.hostname = 'B2'
+
+        account_id = parsed_url.username
+>>>>>>> MERGE-SOURCE
         account_key = self.get_password()
 
         self.url_parts = [
@@ -86,13 +133,23 @@
             self.username = self.url_parts.pop(0)
             bucket_name = self.url_parts.pop(0)
         else:
+<<<<<<< TREE
             raise BackendException(u"B2 requires a bucket name")
         self.path = u"".join([url_part + u"/" for url_part in self.url_parts])
         self.service.authorize_account(u'production', account_id, account_key)
 
         log.Log(u"B2 Backend (path= %s, bucket= %s, minimum_part_size= %s)" %
                 (self.path, bucket_name, self.service.account_info.get_minimum_part_size()), log.INFO)
+=======
+            raise BackendException("B2 requires a bucket name")
+        self.path = "".join([url_part + "/" for url_part in self.url_parts])
+        self.service.authorize_account('production', account_id, account_key)
+
+        log.Log("B2 Backend (path= %s, bucket= %s, minimum_part_size= %s)" %
+                (self.path, bucket_name, self.service.account_info.get_minimum_part_size()), log.INFO)
+>>>>>>> MERGE-SOURCE
         try:
+<<<<<<< TREE
             self.bucket = self.service.get_bucket_by_name(bucket_name)
             log.Log(u"Bucket found", log.INFO)
         except b2.exception.NonExistentBucket:
@@ -101,23 +158,46 @@
                 self.bucket = self.service.create_bucket(bucket_name, u'allPrivate')
             except:
                 raise FatalBackendException(u"Bucket cannot be created")
+=======
+            self.bucket = self.service.get_bucket_by_name(bucket_name)
+            log.Log("Bucket found", log.INFO)
+        except b2.exception.NonExistentBucket:
+            try:
+                log.Log("Bucket not found, creating one", log.INFO)
+                self.bucket = self.service.create_bucket(bucket_name, 'allPrivate')
+            except:
+                raise FatalBackendException("Bucket cannot be created")
+>>>>>>> MERGE-SOURCE
 
     def _get(self, remote_filename, local_path):
         u"""
         Download remote_filename to local_path
         """
+<<<<<<< TREE
         log.Log(u"Get: %s -> %s" % (self.path + remote_filename, local_path.name), log.INFO)
         self.bucket.download_file_by_name(quote_plus(self.path + remote_filename),
                                           b2.download_dest.DownloadDestLocalFile(local_path.name))
+=======
+        log.Log("Get: %s -> %s" % (self.path + remote_filename, local_path.name), log.INFO)
+        self.bucket.download_file_by_name(self.path + remote_filename,
+                                          b2.download_dest.DownloadDestLocalFile(local_path.name))
+>>>>>>> MERGE-SOURCE
 
     def _put(self, source_path, remote_filename):
         u"""
         Copy source_path to remote_filename
         """
+<<<<<<< TREE
         log.Log(u"Put: %s -> %s" % (source_path.name, self.path + remote_filename), log.INFO)
         self.bucket.upload_local_file(source_path.name, quote_plus(self.path + remote_filename),
                                       content_type=u'application/pgp-encrypted',
                                       progress_listener=B2ProgressListener())
+=======
+        log.Log("Put: %s -> %s" % (source_path.name, self.path + remote_filename), log.INFO)
+        self.bucket.upload_local_file(source_path.name, self.path + remote_filename,
+                                      content_type='application/pgp-encrypted',
+                                      progress_listener=progress_listener_factory())
+>>>>>>> MERGE-SOURCE
 
     def _list(self):
         u"""
@@ -130,14 +210,21 @@
         u"""
         Delete filename from remote server
         """
+<<<<<<< TREE
         log.Log(u"Delete: %s" % self.path + filename, log.INFO)
         file_version_info = self.file_info(quote_plus(self.path + filename))
         self.bucket.delete_file_version(file_version_info.id_, file_version_info.file_name)
+=======
+        log.Log("Delete: %s" % self.path + filename, log.INFO)
+        file_version_info = self.file_info(self.path + filename)
+        self.bucket.delete_file_version(file_version_info.id_, file_version_info.file_name)
+>>>>>>> MERGE-SOURCE
 
     def _query(self, filename):
         u"""
         Get size info of filename
         """
+<<<<<<< TREE
         log.Log(u"Query: %s" % self.path + filename, log.INFO)
         file_version_info = self.file_info(quote_plus(self.path + filename))
         return {u'size': file_version_info.size
@@ -153,3 +240,20 @@
 
 
 duplicity.backend.register_backend(u"b2", B2Backend)
+=======
+        log.Log("Query: %s" % self.path + filename, log.INFO)
+        file_version_info = self.file_info(self.path + filename)
+        return {'size': file_version_info.size
+                if file_version_info is not None and file_version_info.size is not None else -1}
+
+    def file_info(self, filename):
+        response = self.bucket.list_file_names(filename, 1)
+        for entry in response['files']:
+            file_version_info = b2.file_version.FileVersionInfoFactory.from_api_response(entry)
+            if file_version_info.file_name == filename:
+                return file_version_info
+        raise BackendException('File not found')
+
+
+duplicity.backend.register_backend("b2", B2Backend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/dpbxbackend.py'
--- duplicity/backends/dpbxbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/dpbxbackend.py	2019-03-04 12:09:45 +0000
@@ -45,7 +45,21 @@
 from duplicity import log, globals
 from duplicity import progress
 from duplicity.errors import BackendException
+<<<<<<< TREE
 from duplicity.globals import num_retries
+=======
+import os
+import sys
+import traceback
+import urllib
+import re
+
+from dropbox import Dropbox
+from dropbox.exceptions import AuthError, BadInputError, ApiError
+from dropbox.files import UploadSessionCursor, CommitInfo, WriteMode, \
+    GetMetadataError, DeleteError, UploadSessionLookupError, ListFolderError
+from dropbox.oauth import DropboxOAuth2FlowNoRedirect
+>>>>>>> MERGE-SOURCE
 from requests.exceptions import ConnectionError
 import duplicity.backend
 
@@ -164,12 +178,23 @@
         print(u'-' * 72)
         auth_code = input(u"Enter the authorization code here: ").strip()
         try:
+<<<<<<< TREE
             log.Debug(u'dpbx,auth_flow.finish(%s)' % auth_code)
             authresult = auth_flow.finish(auth_code)
+=======
+            log.Debug('dpbx,auth_flow.finish(%s)' % auth_code)
+            authresult = auth_flow.finish(auth_code)
+>>>>>>> MERGE-SOURCE
         except Exception as e:
+<<<<<<< TREE
             raise BackendException(u'dpbx: Unable to obtain access token: %s' % e)
         log.Info(u"dpbx: Authentication successfull")
         self.save_access_token(authresult.access_token)
+=======
+            raise BackendException('dpbx: Unable to obtain access token: %s' % e)
+        log.Info("dpbx: Authentication successfull")
+        self.save_access_token(authresult.access_token)
+>>>>>>> MERGE-SOURCE
 
     def login(self):
         if self.load_access_token() is None:
@@ -403,10 +428,17 @@
         # Do a long listing to avoid connection reset
         if not self.user_authenticated():
             self.login()
+<<<<<<< TREE
         remote_dir = u'/' + urllib.parse.unquote(self.parsed_url.path.lstrip(u'/')).rstrip()
 
         log.Debug(u'dpbx.files_list_folder(%s)' % remote_dir)
+=======
+        remote_dir = '/' + urllib.unquote(self.parsed_url.path.lstrip('/')).rstrip()
+
+        log.Debug('dpbx.files_list_folder(%s)' % remote_dir)
+>>>>>>> MERGE-SOURCE
         res = []
+<<<<<<< TREE
         try:
             resp = self.api_client.files_list_folder(remote_dir)
             log.Debug(u'dpbx.list(%s): %s' % (remote_dir, resp))
@@ -422,6 +454,23 @@
                 log.Debug(u'dpbx.list(%s): ignore missing folder (%s)' % (remote_dir, e))
             else:
                 raise
+=======
+        try:
+            resp = self.api_client.files_list_folder(remote_dir)
+            log.Debug('dpbx.list(%s): %s' % (remote_dir, resp))
+
+            while True:
+                res.extend([entry.name for entry in resp.entries])
+                if not resp.has_more:
+                    break
+                resp = self.api_client.files_list_folder_continue(resp.cursor)
+        except ApiError as e:
+            if (isinstance(e.error, ListFolderError) and e.error.is_path() and
+                    e.error.get_path().is_not_found()):
+                log.Debug('dpbx.list(%s): ignore missing folder (%s)' % (remote_dir, e))
+            else:
+                raise
+>>>>>>> MERGE-SOURCE
 
         # Warn users of old version dpbx about automatically renamed files
         self.check_renamed_files(res)

=== modified file 'duplicity/backends/gdocsbackend.py'
--- duplicity/backends/gdocsbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/gdocsbackend.py	2019-03-04 12:09:45 +0000
@@ -193,7 +193,13 @@
         # Done!
         return result
 
+<<<<<<< TREE
 
 u""" gdata is an alternate way to access gdocs, currently 05/2015 lacking OAuth support """
 duplicity.backend.register_backend(u'gdata+gdocs', GDocsBackend)
 duplicity.backend.uses_netloc.extend([u'gdata+gdocs'])
+=======
+""" gdata is an alternate way to access gdocs, currently 05/2015 lacking OAuth support """
+duplicity.backend.register_backend('gdata+gdocs', GDocsBackend)
+duplicity.backend.uses_netloc.extend(['gdata+gdocs'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/giobackend.py'
--- duplicity/backends/giobackend.py	2018-07-23 14:55:39 +0000
+++ duplicity/backends/giobackend.py	2019-03-04 12:09:45 +0000
@@ -143,8 +143,13 @@
         self.__copy_file(source_file, target_file)
 
     def _get(self, filename, local_path):
+<<<<<<< TREE
         from gi.repository import Gio  # @UnresolvedImport  # pylint: disable=import-error
         source_file = self.remote_file.get_child_for_display_name(filename)
+=======
+        from gi.repository import Gio  # @UnresolvedImport
+        source_file = self.remote_file.get_child_for_display_name(filename)
+>>>>>>> MERGE-SOURCE
         target_file = Gio.File.new_for_path(local_path.name)
         self.__copy_file(source_file, target_file)
 
@@ -169,11 +174,22 @@
         target_file.delete(None)
 
     def _query(self, filename):
+<<<<<<< TREE
         from gi.repository import Gio  # @UnresolvedImport  # pylint: disable=import-error
         target_file = self.remote_file.get_child_for_display_name(filename)
+=======
+        from gi.repository import Gio  # @UnresolvedImport
+        target_file = self.remote_file.get_child_for_display_name(filename)
+>>>>>>> MERGE-SOURCE
         info = target_file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_SIZE,
                                       Gio.FileQueryInfoFlags.NONE, None)
+<<<<<<< TREE
         return {u'size': info.get_size()}
 
 
 duplicity.backend.register_backend_prefix(u'gio', GIOBackend)
+=======
+        return {'size': info.get_size()}
+
+duplicity.backend.register_backend_prefix('gio', GIOBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/hsibackend.py'
--- duplicity/backends/hsibackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/hsibackend.py	2019-03-04 12:09:45 +0000
@@ -65,6 +65,11 @@
         commandline = u'%s "rm %s%s"' % (hsi_command, self.remote_prefix, filename)
         self.subprocess_popen(commandline)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"hsi", HSIBackend)
 duplicity.backend.uses_netloc.extend([u'hsi'])
+=======
+duplicity.backend.register_backend("hsi", HSIBackend)
+duplicity.backend.uses_netloc.extend(['hsi'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/hubicbackend.py'
--- duplicity/backends/hubicbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/hubicbackend.py	2019-03-04 12:09:45 +0000
@@ -64,5 +64,9 @@
         self.nso_exc = pyrax.exceptions.NoSuchObject
         self.container = pyrax.cloudfiles.create_container(container)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"cf+hubic", HubicBackend)
+=======
+duplicity.backend.register_backend("cf+hubic", HubicBackend)
+>>>>>>> MERGE-SOURCE

=== renamed file 'duplicity/backends/jottacloudbackend.py' => 'duplicity/backends/jottacloudbackend.py.THIS'
=== modified file 'duplicity/backends/lftpbackend.py'
--- duplicity/backends/lftpbackend.py	2019-02-21 21:42:26 +0000
+++ duplicity/backends/lftpbackend.py	2019-03-04 12:09:45 +0000
@@ -205,6 +205,7 @@
         )
         log.Debug(u"CMD: %s" % commandline)
         _, l, e = self.subprocess_popen(commandline)
+<<<<<<< TREE
         log.Debug(u"STDERR:\n"
                   u"%s" % (e))
         log.Debug(u"STDOUT:\n"
@@ -232,4 +233,32 @@
                                       u'lftp+sftp',
                                       u'lftp+webdav', u'lftp+webdavs',
                                       u'lftp+http', u'lftp+https']
+=======
+        log.Debug("STDERR:\n"
+                  "%s" % (e))
+        log.Debug("STDOUT:\n"
+                  "%s" % (l))
+
+duplicity.backend.register_backend("ftp", LFTPBackend)
+duplicity.backend.register_backend("ftps", LFTPBackend)
+duplicity.backend.register_backend("fish", LFTPBackend)
+duplicity.backend.register_backend("ftpes", LFTPBackend)
+
+duplicity.backend.register_backend("lftp+ftp", LFTPBackend)
+duplicity.backend.register_backend("lftp+ftps", LFTPBackend)
+duplicity.backend.register_backend("lftp+fish", LFTPBackend)
+duplicity.backend.register_backend("lftp+ftpes", LFTPBackend)
+duplicity.backend.register_backend("lftp+sftp", LFTPBackend)
+duplicity.backend.register_backend("lftp+webdav", LFTPBackend)
+duplicity.backend.register_backend("lftp+webdavs", LFTPBackend)
+duplicity.backend.register_backend("lftp+http", LFTPBackend)
+duplicity.backend.register_backend("lftp+https", LFTPBackend)
+
+duplicity.backend.uses_netloc.extend(['ftp', 'ftps', 'fish', 'ftpes',
+                                      'lftp+ftp', 'lftp+ftps',
+                                      'lftp+fish', 'lftp+ftpes',
+                                      'lftp+sftp',
+                                      'lftp+webdav', 'lftp+webdavs',
+                                      'lftp+http', 'lftp+https']
+>>>>>>> MERGE-SOURCE
                                      )

=== modified file 'duplicity/backends/localbackend.py'
--- duplicity/backends/localbackend.py	2018-07-23 14:55:39 +0000
+++ duplicity/backends/localbackend.py	2019-03-04 12:09:45 +0000
@@ -71,7 +71,13 @@
         target_file = self.remote_pathdir.append(filename)
         target_file.setdata()
         size = target_file.getsize() if target_file.exists() else -1
+<<<<<<< TREE
         return {u'size': size}
 
 
 duplicity.backend.register_backend(u"file", LocalBackend)
+=======
+        return {'size': size}
+
+duplicity.backend.register_backend("file", LocalBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/megabackend.py'
--- duplicity/backends/megabackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/megabackend.py	2019-03-04 12:09:45 +0000
@@ -34,6 +34,7 @@
     def __init__(self, parsed_url):
         duplicity.backend.Backend.__init__(self, parsed_url)
 
+<<<<<<< TREE
         # ensure all the necessary megatools binaries exist
         self._check_binary_exists(u'megals')
         self._check_binary_exists(u'megamkdir')
@@ -61,7 +62,37 @@
     def _check_binary_exists(self, cmd):
         u'checks that a specified command exists in the current path'
 
+=======
+        # ensure all the necessary megatools binaries exist
+        self._check_binary_exists('megals')
+        self._check_binary_exists('megamkdir')
+        self._check_binary_exists('megaget')
+        self._check_binary_exists('megaput')
+        self._check_binary_exists('megarm')
+
+        # store some basic info
+        self._hostname = parsed_url.hostname
+
+        if parsed_url.password is None:
+            self._megarc = os.getenv('HOME') + '/.megarc'
+        else:
+            self._megarc = False
+            self._username = parsed_url.username
+            self._password = self.get_password()
+
+        # remote folder (Can we assume /Root prefix?)
+        self._root = '/Root'
+        self._folder = self._root + '/' + parsed_url.path[1:]
+
+        # make sure the remote folder exists (the whole path)
+        self._makedir_recursive(parsed_url.path[1:].split('/'))
+
+    def _check_binary_exists(self, cmd):
+        'checks that a specified command exists in the current path'
+
+>>>>>>> MERGE-SOURCE
         try:
+<<<<<<< TREE
             # ignore the output, we only need the return code
             subprocess.check_output([u'which', cmd])
         except Exception as e:
@@ -90,10 +121,45 @@
                 self._make_dir(p)
             except:
                 pass
+=======
+            # ignore the output, we only need the return code
+            subprocess.check_output(['which', cmd])
+        except Exception as e:
+            raise BackendException("command '%s' not found, make sure megatools are installed" % (cmd,))
+
+    def _makedir(self, path):
+        'creates a remote directory'
+
+        if self._megarc:
+            cmd = ['megamkdir', '--config', self._megarc, path]
+        else:
+            cmd = ['megamkdir', '-u', self._username, '-p', self._password, path]
+
+        self.subprocess_popen(cmd)
+
+    def _makedir_recursive(self, path):
+        'creates a remote directory (recursively the whole path), ingores errors'
+
+        print ("mkdir: %s" % ('/'.join(path),))
+
+        p = self._root
+
+        for folder in path:
+            p = p + '/' + folder
+            try:
+                self._make_dir(p)
+            except:
+                pass
+>>>>>>> MERGE-SOURCE
 
     def _put(self, source_path, remote_filename):
+<<<<<<< TREE
         u'uploads file to Mega (deletes it first, to ensure it does not exist)'
 
+=======
+        'uploads file to Mega (deletes it first, to ensure it does not exist)'
+
+>>>>>>> MERGE-SOURCE
         try:
             self.delete(remote_filename)
         except Exception:
@@ -102,16 +168,29 @@
         self.upload(local_file=source_path.get_canonical(), remote_file=remote_filename)
 
     def _get(self, remote_filename, local_path):
+<<<<<<< TREE
         u'downloads file from Mega'
 
         self.download(remote_file=remote_filename, local_file=local_path.name)
+=======
+        'downloads file from Mega'
+
+        self.download(remote_file=remote_filename, local_file=local_path.name)
+>>>>>>> MERGE-SOURCE
 
     def _list(self):
+<<<<<<< TREE
         u'list files in the backup folder'
 
         return self.folder_contents(files_only=True)
+=======
+        'list files in the backup folder'
+
+        return self.folder_contents(files_only=True)
+>>>>>>> MERGE-SOURCE
 
     def _delete(self, filename):
+<<<<<<< TREE
         u'deletes remote '
 
         self.delete(remote_file=filename)
@@ -178,3 +257,71 @@
 
 duplicity.backend.register_backend(u'mega', MegaBackend)
 duplicity.backend.uses_netloc.extend([u'mega'])
+=======
+        'deletes remote '
+
+        self.delete(remote_file=filename)
+
+    def folder_contents(self, files_only=False):
+        'lists contents of a folder, optionally ignoring subdirectories'
+
+        print ("megals: %s" % (self._folder,))
+
+        if self._megarc:
+            cmd = ['megals', '--config', self._megarc, self._folder]
+        else:
+            cmd = ['megals', '-u', self._username, '-p', self._password, self._folder]
+
+        files = subprocess.check_output(cmd)
+        files = files.strip().split('\n')
+
+        # remove the folder name, including the path separator
+        files = [f[len(self._folder) + 1:] for f in files]
+
+        # optionally ignore entries containing path separator (i.e. not files)
+        if files_only:
+            files = [f for f in files if '/' not in f]
+
+        return files
+
+    def download(self, remote_file, local_file):
+
+        print ("megaget: %s" % (remote_file,))
+
+        if self._megarc:
+            cmd = ['megaget', '--config', self._megarc, '--no-progress',
+                   '--path', local_file, self._folder + '/' + remote_file]
+        else:
+            cmd = ['megaget', '-u', self._username, '-p', self._password, '--no-progress',
+                   '--path', local_file, self._folder + '/' + remote_file]
+
+        self.subprocess_popen(cmd)
+
+    def upload(self, local_file, remote_file):
+
+        print ("megaput: %s" % (remote_file,))
+
+        if self._megarc:
+            cmd = ['megaput', '--config', self._megarc, '--no-progress',
+                   '--path', self._folder + '/' + remote_file, local_file]
+        else:
+            cmd = ['megaput', '-u', self._username, '-p', self._password, '--no-progress',
+                   '--path', self._folder + '/' + remote_file, local_file]
+
+        self.subprocess_popen(cmd)
+
+    def delete(self, remote_file):
+
+        print ("megarm: %s" % (remote_file,))
+
+        if self._megarc:
+            cmd = ['megarm', '--config', self._megarc, self._folder + '/' + remote_file]
+        else:
+            cmd = ['megarm', '-u', self._username, '-p', self._password, self._folder + '/' + remote_file]
+
+        self.subprocess_popen(cmd)
+
+
+duplicity.backend.register_backend('mega', MegaBackend)
+duplicity.backend.uses_netloc.extend(['mega'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/multibackend.py'
--- duplicity/backends/multibackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/multibackend.py	2019-03-04 12:09:45 +0000
@@ -44,7 +44,6 @@
 
     # the stores we are managing
     __stores = []
-    __affinities = {}
 
     # Set of known query paramaters
     __knownQueryParameters = frozenset([
@@ -188,6 +187,7 @@
 
             store = duplicity.backend.get_backend(url)
             self.__stores.append(store)
+<<<<<<< TREE
 
             # Prefix affinity
             if u'prefixes' in config:
@@ -201,11 +201,14 @@
                 else:
                     self.__affinities[prefix] = [store]
 
+=======
+>>>>>>> MERGE-SOURCE
             # store_list = store.list()
             # log.Log(_("MultiBackend: at init, store %s has %s files")
             #         % (url, len(store_list)),
             #         log.INFO)
 
+<<<<<<< TREE
     def _eligible_stores(self, filename):
         if self.__affinities:
             matching_prefixes = [k for k in list(self.__affinities.keys()) if filename.startswith(k)]
@@ -217,23 +220,21 @@
         # No affinity rule or no matching store for that prefix
         return self.__stores
 
+=======
+>>>>>>> MERGE-SOURCE
     def _put(self, source_path, remote_filename):
         # Store an indication of whether any of these passed
         passed = False
-
-        # Eligibile stores for this action
-        stores = self._eligible_stores(remote_filename)
-
         # Mirror mode always starts at zero
         if self.__mode == u'mirror':
             self.__write_cursor = 0
 
         first = self.__write_cursor
         while True:
-            store = stores[self.__write_cursor]
+            store = self.__stores[self.__write_cursor]
             try:
                 next = self.__write_cursor + 1
-                if (next > len(stores) - 1):
+                if (next > len(self.__stores) - 1):
                     next = 0
                 log.Log(_(u"MultiBackend: _put: write to store #%s (%s)")
                         % (self.__write_cursor, store.backend.parsed_url.url_string),
@@ -274,9 +275,7 @@
         # before finally giving up).  So we need to get the list first
         # before we try to fetch
         # ENHANCEME: maintain a cached list for each store
-        stores = self._eligible_stores(remote_filename)
-
-        for s in stores:
+        for s in self.__stores:
             list = s.list()
             if remote_filename in list:
                 s.get(remote_filename, local_path)
@@ -307,16 +306,13 @@
     def _delete(self, filename):
         # Store an indication on whether any passed
         passed = False
-
-        stores = self._eligible_stores(filename)
-
         # since the backend operations will be retried, we can't
         # simply try to get from the store, if not found, move to the
         # next store (since each failure will be retried n times
         # before finally giving up).  So we need to get the list first
         # before we try to delete
         # ENHANCEME: maintain a cached list for each store
-        for s in stores:
+        for s in self.__stores:
             list = s.list()
             if filename in list:
                 s._do_delete(filename)
@@ -333,5 +329,9 @@
                     log.ERROR)
 #           raise BackendException("failed to delete")
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u'multi', MultiBackend)
+=======
+duplicity.backend.register_backend('multi', MultiBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/ncftpbackend.py'
--- duplicity/backends/ncftpbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/ncftpbackend.py	2019-03-04 12:09:45 +0000
@@ -122,6 +122,11 @@
             (self.flags, filename, self.url_string)
         self.subprocess_popen(commandline)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"ncftp+ftp", NCFTPBackend)
 duplicity.backend.uses_netloc.extend([u'ncftp+ftp'])
+=======
+duplicity.backend.register_backend("ncftp+ftp", NCFTPBackend)
+duplicity.backend.uses_netloc.extend(['ncftp+ftp'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/onedrivebackend.py'
--- duplicity/backends/onedrivebackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/onedrivebackend.py	2019-03-04 12:09:45 +0000
@@ -348,5 +348,9 @@
     def _retry_cleanup(self):
         self.initialize_oauth2_session()
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u'onedrive', OneDriveBackend)
+=======
+duplicity.backend.register_backend('onedrive', OneDriveBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/par2backend.py'
--- duplicity/backends/par2backend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/par2backend.py	2019-03-04 12:09:45 +0000
@@ -218,5 +218,9 @@
     def close(self):
         self.wrapped_backend._close()
 
+<<<<<<< TREE
 
 backend.register_backend_prefix(u'par2', Par2Backend)
+=======
+backend.register_backend_prefix('par2', Par2Backend)
+>>>>>>> MERGE-SOURCE

=== renamed file 'duplicity/backends/pcabackend.py' => 'duplicity/backends/pcabackend.py.THIS'
=== modified file 'duplicity/backends/pydrivebackend.py'
--- duplicity/backends/pydrivebackend.py	2019-02-24 15:09:46 +0000
+++ duplicity/backends/pydrivebackend.py	2019-03-04 12:09:45 +0000
@@ -93,8 +93,13 @@
         else:
             file_in_root = self.drive.CreateFile({u'title': u'i_am_in_root'})
             file_in_root.Upload()
+<<<<<<< TREE
             parent_folder_id = file_in_root[u'parents'][0][u'id']
             file_in_root.Delete()
+=======
+            parent_folder_id = file_in_root['parents'][0]['id']
+            file_in_root.Delete()
+>>>>>>> MERGE-SOURCE
 
         # Fetch destination folder entry and create hierarchy if required.
         folder_names = string.split(parsed_url.path, u'/')
@@ -215,11 +220,19 @@
             return log.ErrorCode.backend_permission_denied
         return log.ErrorCode.backend_error
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u'pydrive', PyDriveBackend)
 u""" pydrive is an alternate way to access gdocs """
 duplicity.backend.register_backend(u'pydrive+gdocs', PyDriveBackend)
 u""" register pydrive as the default way to access gdocs """
 duplicity.backend.register_backend(u'gdocs', PyDriveBackend)
+=======
+duplicity.backend.register_backend('pydrive', PyDriveBackend)
+""" pydrive is an alternate way to access gdocs """
+duplicity.backend.register_backend('pydrive+gdocs', PyDriveBackend)
+""" register pydrive as the default way to access gdocs """
+duplicity.backend.register_backend('gdocs', PyDriveBackend)
+>>>>>>> MERGE-SOURCE
 
 duplicity.backend.uses_netloc.extend([u'pydrive', u'pydrive+gdocs', u'gdocs'])

=== modified file 'duplicity/backends/rsyncbackend.py'
--- duplicity/backends/rsyncbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/rsyncbackend.py	2019-03-04 12:09:45 +0000
@@ -155,6 +155,11 @@
             util.ignore_missing(os.unlink, file)
         os.rmdir(dir)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"rsync", RsyncBackend)
 duplicity.backend.uses_netloc.extend([u'rsync'])
+=======
+duplicity.backend.register_backend("rsync", RsyncBackend)
+duplicity.backend.uses_netloc.extend(['rsync'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/ssh_paramiko_backend.py'
--- duplicity/backends/ssh_paramiko_backend.py	2018-12-23 16:52:31 +0000
+++ duplicity/backends/ssh_paramiko_backend.py	2019-03-04 12:09:45 +0000
@@ -103,8 +103,13 @@
             """
             def missing_host_key(self, client, hostname, key):
                 fp = hexlify(key.get_fingerprint())
+<<<<<<< TREE
                 fingerprint = u':'.join(a + b for a, b in list(zip(fp[::2], fp[1::2])))
                 question = u"""The authenticity of host '%s' can't be established.
+=======
+                fingerprint = ':'.join(a + b for a, b in list(zip(fp[::2], fp[1::2])))
+                question = """The authenticity of host '%s' can't be established.
+>>>>>>> MERGE-SOURCE
 %s key fingerprint is %s.
 Are you sure you want to continue connecting (yes/no)? """ % (hostname,
                                                               key.get_name().upper(),

=== modified file 'duplicity/backends/ssh_pexpect_backend.py'
--- duplicity/backends/ssh_pexpect_backend.py	2019-02-25 16:30:59 +0000
+++ duplicity/backends/ssh_pexpect_backend.py	2019-03-04 12:09:45 +0000
@@ -297,7 +297,13 @@
         commandline = (u"%s %s %s" % (self.sftp_command, globals.ssh_options, self.host_string))
         self.run_sftp_command(commandline, commands)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"pexpect+sftp", SSHPExpectBackend)
 duplicity.backend.register_backend(u"pexpect+scp", SSHPExpectBackend)
 duplicity.backend.uses_netloc.extend([u'pexpect+sftp', u'pexpect+scp'])
+=======
+duplicity.backend.register_backend("pexpect+sftp", SSHPExpectBackend)
+duplicity.backend.register_backend("pexpect+scp", SSHPExpectBackend)
+duplicity.backend.uses_netloc.extend(['pexpect+sftp', 'pexpect+scp'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/swiftbackend.py'
--- duplicity/backends/swiftbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/swiftbackend.py	2019-03-04 12:09:45 +0000
@@ -22,7 +22,6 @@
 import os
 
 import duplicity.backend
-from duplicity import globals
 from duplicity import log
 from duplicity import util
 from duplicity.errors import BackendException
@@ -112,9 +111,12 @@
         else:
             self.prefix = u''
 
+<<<<<<< TREE
         policy = globals.swift_storage_policy
         policy_header = u'X-Storage-Policy'
 
+=======
+>>>>>>> MERGE-SOURCE
         container_metadata = None
         try:
             self.conn = Connection(**conn_kwargs)
@@ -129,15 +131,17 @@
         if container_metadata is None:
             log.Info(u"Creating container %s" % self.container)
             try:
-                headers = dict([[policy_header, policy]]) if policy else None
-                self.conn.put_container(self.container, headers=headers)
+                self.conn.put_container(self.container)
             except Exception as e:
                 log.FatalError(u"Container creation failed: %s %s"
                                % (e.__class__.__name__, str(e)),
                                log.ErrorCode.connection_failed)
+<<<<<<< TREE
         elif policy and container_metadata[policy_header.lower()] != policy:
             log.FatalError(u"Container '%s' exists but its storage policy is '%s' not '%s'."
                            % (self.container, container_metadata[policy_header.lower()], policy))
+=======
+>>>>>>> MERGE-SOURCE
 
     def _error_code(self, operation, e):
         if isinstance(e, self.resp_exc):

=== modified file 'duplicity/backends/sxbackend.py'
--- duplicity/backends/sxbackend.py	2018-07-23 14:55:39 +0000
+++ duplicity/backends/sxbackend.py	2019-03-04 12:09:45 +0000
@@ -49,5 +49,9 @@
         commandline = u"sxrm {0}/{1}".format(self.url_string, filename)
         self.subprocess_popen(commandline)
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"sx", SXBackend)
+=======
+duplicity.backend.register_backend("sx", SXBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/tahoebackend.py'
--- duplicity/backends/tahoebackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/tahoebackend.py	2019-03-04 12:09:45 +0000
@@ -73,7 +73,13 @@
         return output.split(b'\n') if output else []
 
     def _delete(self, filename):
+<<<<<<< TREE
         self.run(u"tahoe", u"rm", self.get_remote_path(filename))
 
 
 duplicity.backend.register_backend(u"tahoe", TAHOEBackend)
+=======
+        self.run("tahoe", "rm", self.get_remote_path(filename))
+
+duplicity.backend.register_backend("tahoe", TAHOEBackend)
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/backends/webdavbackend.py'
--- duplicity/backends/webdavbackend.py	2018-12-23 16:52:31 +0000
+++ duplicity/backends/webdavbackend.py	2019-03-04 12:09:45 +0000
@@ -260,11 +260,19 @@
             try:
                 return self.get_kerberos_authorization()
             except ImportError:
+<<<<<<< TREE
                 log.Warn(_(u"python-kerberos needed to use kerberos \
+=======
+                log.Warn(_("python-kerberos needed to use kerberos \
+>>>>>>> MERGE-SOURCE
                           authorization, falling back to basic auth."))
                 return self.get_basic_authorization()
             except Exception as e:
+<<<<<<< TREE
                 log.Warn(_(u"Kerberos authorization failed: %s.\
+=======
+                log.Warn(_("Kerberos authorization failed: %s.\
+>>>>>>> MERGE-SOURCE
                           Falling back to basic auth.") % e)
                 return self.get_basic_authorization()
         elif token.lower() == u'basic':
@@ -277,9 +285,15 @@
         return urllib2.parse_keqv_list(urllib2.parse_http_list(challenge_string))
 
     def get_kerberos_authorization(self):
+<<<<<<< TREE
         import kerberos  # pylint: disable=import-error
         _, ctx = kerberos.authGSSClientInit(u"HTTP@%s" % self.conn.host)
         kerberos.authGSSClientStep(ctx, u"")
+=======
+        import kerberos  # pylint: disable=import-error
+        _, ctx = kerberos.authGSSClientInit("HTTP@%s" % self.conn.host)
+        kerberos.authGSSClientStep(ctx, "")
+>>>>>>> MERGE-SOURCE
         tgt = kerberos.authGSSClientResponse(ctx)
         return u'Negotiate %s' % tgt
 
@@ -287,8 +301,13 @@
         u"""
         Returns the basic auth header
         """
+<<<<<<< TREE
         auth_string = u'%s:%s' % (self.username, self.password)
         return u'Basic %s' % base64.encodestring(auth_string).strip()
+=======
+        auth_string = '%s:%s' % (self.username, self.password)
+        return 'Basic %s' % "".join(base64.encodestring(auth_string).split())
+>>>>>>> MERGE-SOURCE
 
     def get_digest_authorization(self, path):
         u"""
@@ -474,9 +493,17 @@
             if response:
                 response.close()
 
+<<<<<<< TREE
 
 duplicity.backend.register_backend(u"http", WebDAVBackend)
 duplicity.backend.register_backend(u"https", WebDAVBackend)
 duplicity.backend.register_backend(u"webdav", WebDAVBackend)
 duplicity.backend.register_backend(u"webdavs", WebDAVBackend)
 duplicity.backend.uses_netloc.extend([u'http', u'https', u'webdav', u'webdavs'])
+=======
+duplicity.backend.register_backend("http", WebDAVBackend)
+duplicity.backend.register_backend("https", WebDAVBackend)
+duplicity.backend.register_backend("webdav", WebDAVBackend)
+duplicity.backend.register_backend("webdavs", WebDAVBackend)
+duplicity.backend.uses_netloc.extend(['http', 'https', 'webdav', 'webdavs'])
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2019-02-22 20:25:02 +0000
+++ duplicity/collections.py	2019-03-04 12:09:45 +0000
@@ -32,7 +32,7 @@
 
 import types
 import gettext
-import sys
+
 
 from duplicity import log
 from duplicity import file_naming
@@ -44,12 +44,15 @@
 from duplicity import util
 from duplicity.gpg import GPGError
 
+<<<<<<< TREE
 # For type testing against both int and long types that works in python 2/3
 if sys.version_info < (3,):
     integer_types = (int, int)
 else:
     integer_types = (int,)
 
+=======
+>>>>>>> MERGE-SOURCE
 
 class CollectionsError(Exception):
     pass
@@ -73,7 +76,6 @@
         self.end_time = None  # will be set if inc
         self.partial = False  # true if a partial backup
         self.encrypted = False  # true if an encrypted backup
-        self.files_changed = []
         self.action = action
 
     def is_complete(self):
@@ -138,10 +140,6 @@
         self.encrypted = bool(pr.encrypted)
         self.info_set = True
 
-    def set_files_changed(self):
-        mf = self.get_manifest()
-        self.files_changed = mf.get_files_changed()
-
     def set_manifest(self, remote_filename):
         u"""
         Add local and remote manifest filenames to backup set
@@ -150,8 +148,13 @@
                                                remote_filename)
         self.remote_manifest_name = remote_filename
 
+<<<<<<< TREE
         if self.action not in [u"collection-status", u"replicate"]:
             local_filename_list = globals.archive_dir_path.listdir()
+=======
+        if self.action not in ["collection-status"]:
+            local_filename_list = globals.archive_dir.listdir()
+>>>>>>> MERGE-SOURCE
         else:
             local_filename_list = []
         for local_filename in local_filename_list:
@@ -161,9 +164,7 @@
                     pr.start_time == self.start_time and
                     pr.end_time == self.end_time):
                 self.local_manifest_path = \
-                    globals.archive_dir_path.append(local_filename)
-
-                self.set_files_changed()
+                    globals.archive_dir.append(local_filename)
                 break
 
     def delete(self):
@@ -177,8 +178,13 @@
         except Exception:
             log.Debug(_(u"BackupSet.delete: missing %s") % [util.fsdecode(f) for f in rfn])
             pass
+<<<<<<< TREE
         if self.action not in [u"collection-status", u"replicate"]:
             local_filename_list = globals.archive_dir_path.listdir()
+=======
+        if self.action not in ["collection-status"]:
+            local_filename_list = globals.archive_dir.listdir()
+>>>>>>> MERGE-SOURCE
         else:
             local_filename_list = []
         for lfn in local_filename_list:
@@ -187,7 +193,7 @@
                     pr.start_time == self.start_time and
                     pr.end_time == self.end_time):
                 try:
-                    globals.archive_dir_path.append(lfn).delete()
+                    globals.archive_dir.append(lfn).delete()
                 except Exception:
                     log.Debug(_(u"BackupSet.delete: missing %s") % [util.fsdecode(f) for f in lfn])
                     pass
@@ -242,8 +248,13 @@
         """
         assert self.local_manifest_path
         manifest_buffer = self.local_manifest_path.get_data()
+<<<<<<< TREE
         log.Info(_(u"Processing local manifest %s (%s)") % (
             self.local_manifest_path.name, len(manifest_buffer)))
+=======
+        log.Info(_("Processing local manifest %s (%s)") % (
+            self.local_manifest_path.name, len(manifest_buffer)))
+>>>>>>> MERGE-SOURCE
         return manifest.Manifest().from_string(manifest_buffer)
 
     def get_remote_manifest(self):
@@ -254,11 +265,21 @@
         try:
             manifest_buffer = self.backend.get_data(self.remote_manifest_name)
         except GPGError as message:
+<<<<<<< TREE
             log.Error(_(u"Error processing remote manifest (%s): %s") %
                       (util.fsdecode(self.remote_manifest_name), util.uexc(message)))
+=======
+            log.Error(_("Error processing remote manifest (%s): %s") %
+                      (util.ufn(self.remote_manifest_name), util.uexc(message)))
+>>>>>>> MERGE-SOURCE
             return None
+<<<<<<< TREE
         log.Info(_(u"Processing remote manifest %s (%s)") % (
             util.fsdecode(self.remote_manifest_name), len(manifest_buffer)))
+=======
+        log.Info(_("Processing remote manifest %s (%s)") % (
+            util.ufn(self.remote_manifest_name), len(manifest_buffer)))
+>>>>>>> MERGE-SOURCE
         return manifest.Manifest().from_string(manifest_buffer)
 
     def get_manifest(self):
@@ -298,9 +319,6 @@
             return self.end_time
         assert 0, u"Neither self.time nor self.end_time set"
 
-    def get_files_changed(self):
-        return self.files_changed
-
     def __len__(self):
         u"""
         Return the number of volumes in the set
@@ -482,19 +500,19 @@
         Return new SignatureChain.
 
         local should be true iff the signature chain resides in
-        globals.archive_dir_path and false if the chain is in
+        globals.archive_dir and false if the chain is in
         globals.backend.
 
-        @param local: True if sig chain in globals.archive_dir_path
+        @param local: True if sig chain in globals.archive_dir
         @type local: Boolean
 
         @param location: Where the sig chain is located
-        @type location: globals.archive_dir_path or globals.backend
+        @type location: globals.archive_dir or globals.backend
         """
         if local:
-            self.archive_dir_path, self.backend = location, None
+            self.archive_dir, self.backend = location, None
         else:
-            self.archive_dir_path, self.backend = None, location
+            self.archive_dir, self.backend = None, location
         self.fullsig = None  # filename of full signature
         self.inclist = []  # list of filenames of incremental signatures
         self.start_time, self.end_time = None, None
@@ -503,8 +521,13 @@
         u"""
         Local or Remote and List of files in the set
         """
+<<<<<<< TREE
         if self.archive_dir_path:
             place = _(u"local")
+=======
+        if self.archive_dir:
+            place = _("local")
+>>>>>>> MERGE-SOURCE
         else:
             place = _(u"remote")
         filelist = []
@@ -518,14 +541,24 @@
         Check to make sure times are in whole seconds
         """
         for time in time_list:
+<<<<<<< TREE
             if type(time) not in integer_types:
                 assert 0, u"Time %s in %s wrong type" % (time, time_list)
+=======
+            if type(time) not in (types.LongType, types.IntType):
+                assert 0, "Time %s in %s wrong type" % (time, time_list)
+>>>>>>> MERGE-SOURCE
 
     def islocal(self):
+<<<<<<< TREE
         u"""
         Return true if represents a signature chain in archive_dir_path
-        """
-        if self.archive_dir_path:
+=======
+        """
+        Return true if represents a signature chain in archive_dir
+>>>>>>> MERGE-SOURCE
+        """
+        if self.archive_dir:
             return True
         else:
             return False
@@ -562,11 +595,17 @@
         optionally at a certain time
         """
         assert self.fullsig
-        if self.archive_dir_path:  # local
+        if self.archive_dir:  # local
             def filename_to_fileobj(filename):
+<<<<<<< TREE
                 u"""Open filename in archive_dir_path, return filtered fileobj"""
                 sig_dp = path.DupPath(self.archive_dir_path.name, (filename,))
                 return sig_dp.filtered_open(u"rb")
+=======
+                """Open filename in archive_dir, return filtered fileobj"""
+                sig_dp = path.DupPath(self.archive_dir.name, (filename,))
+                return sig_dp.filtered_open("rb")
+>>>>>>> MERGE-SOURCE
         else:
             filename_to_fileobj = self.backend.get_fileobj_read
         return [filename_to_fileobj(f) for f in self.get_filenames(time)]
@@ -576,11 +615,11 @@
         Remove all files in signature set
         """
         # Try to delete in opposite order, so something useful even if aborted
-        if self.archive_dir_path:
+        if self.archive_dir:
             for i in range(len(self.inclist) - 1, -1, -1):
-                self.archive_dir_path.append(self.inclist[i]).delete()
+                self.archive_dir.append(self.inclist[i]).delete()
             if not keep_full:
-                self.archive_dir_path.append(self.fullsig).delete()
+                self.archive_dir.append(self.fullsig).delete()
         else:
             assert self.backend
             inclist_copy = self.inclist[:]
@@ -610,12 +649,17 @@
     u"""
     Hold information about available chains and sets
     """
+<<<<<<< TREE
     def __init__(self, backend, archive_dir_path, action):
         u"""
+=======
+    def __init__(self, backend, archive_dir, action):
+        """
+>>>>>>> MERGE-SOURCE
         Make new object.  Does not set values
         """
         self.backend = backend
-        self.archive_dir_path = archive_dir_path
+        self.archive_dir = archive_dir
         self.action = action
 
         # Will hold (signature chain, backup chain) pair of active
@@ -640,8 +684,13 @@
         u"""
         Return summary of the collection, suitable for printing to log
         """
+<<<<<<< TREE
         l = [u"backend %s" % (self.backend.__class__.__name__,),
              u"archive-dir %s" % (self.archive_dir_path,)]
+=======
+        l = ["backend %s" % (self.backend.__class__.__name__,),
+             "archive-dir %s" % (self.archive_dir,)]
+>>>>>>> MERGE-SOURCE
 
         for i in range(len(self.other_backup_chains)):
             # A bit of a misnomer.  Chain might have a sig.
@@ -665,7 +714,11 @@
              u"-----------------",
              _(u"Connecting with backend: %s") %
              (self.backend.__class__.__name__,),
+<<<<<<< TREE
              _(u"Archive dir: %s") % (self.archive_dir_path.uc_name if self.archive_dir_path else u'None',)]
+=======
+             _("Archive dir: %s") % (util.ufn(self.archive_dir.name),)]
+>>>>>>> MERGE-SOURCE
 
         l.append(u"\n" +
                  ngettext(u"Found %d secondary backup chain.",
@@ -703,8 +756,13 @@
         return u"\n".join(l)
 
     def set_values(self, sig_chain_warning=1):
+<<<<<<< TREE
         u"""
         Set values from archive_dir_path and backend.
+=======
+        """
+        Set values from archive_dir and backend.
+>>>>>>> MERGE-SOURCE
 
         Returns self for convenience.  If sig_chain_warning is set to None,
         do not warn about unnecessary sig chains.  This is because there may
@@ -720,8 +778,13 @@
                   len(backend_filename_list))
 
         # get local filename list
+<<<<<<< TREE
         if self.action not in [u"collection-status", u"replicate"]:
             local_filename_list = self.archive_dir_path.listdir()
+=======
+        if self.action not in ["collection-status"]:
+            local_filename_list = self.archive_dir.listdir()
+>>>>>>> MERGE-SOURCE
         else:
             local_filename_list = []
         log.Debug(ngettext(u"%d file exists in cache",
@@ -909,8 +972,13 @@
         return ([p[1] for p in time_set_pairs], incomplete_sets)
 
     def get_signature_chains(self, local, filelist=None):
+<<<<<<< TREE
         u"""
         Find chains in archive_dir_path (if local is true) or backend
+=======
+        """
+        Find chains in archive_dir (if local is true) or backend
+>>>>>>> MERGE-SOURCE
 
         Use filelist if given, otherwise regenerate.  Return value is
         pair (list of chains, list of signature paths not in any
@@ -920,8 +988,13 @@
             if filelist is not None:
                 return filelist
             elif local:
+<<<<<<< TREE
                 if self.action not in [u"collection-status", u"replicate"]:
                     return self.archive_dir_path.listdir()
+=======
+                if self.action not in ["collection-status"]:
+                    return self.archive_dir.listdir()
+>>>>>>> MERGE-SOURCE
                 else:
                     return []
             else:
@@ -932,7 +1005,7 @@
             Return new empty signature chain
             """
             if local:
-                return SignatureChain(True, self.archive_dir_path)
+                return SignatureChain(True, self.archive_dir)
             else:
                 return SignatureChain(False, self.backend)
 
@@ -1196,6 +1269,7 @@
             old_sets = [s for s in chain.get_all_sets() if s.get_time() < t]
             result_sets.extend(old_sets)
         return self.sort_sets(result_sets)
+<<<<<<< TREE
 
     def get_file_changed_record(self, filepath):
         u"""
@@ -1246,3 +1320,5 @@
 
         l.append(u"-------------------------")
         return u"\n".join(l)
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2019-01-25 17:08:40 +0000
+++ duplicity/commandline.py	2019-03-04 12:09:45 +0000
@@ -19,8 +19,12 @@
 # along with duplicity; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+<<<<<<< TREE
 u"""Parse command line, check for consistency, and set globals"""
 from __future__ import print_function
+=======
+"""Parse command line, check for consistency, and set globals"""
+>>>>>>> MERGE-SOURCE
 
 from builtins import filter
 from builtins import str
@@ -58,8 +62,8 @@
 collection_status = None  # Will be set to true if collection-status command given
 cleanup = None  # Set to true if cleanup command given
 verify = None  # Set to true if verify command given
-replicate = None  # Set to true if replicate command given
 
+<<<<<<< TREE
 commands = [u"cleanup",
             u"collection-status",
             u"full",
@@ -71,6 +75,18 @@
             u"restore",
             u"verify",
             u"replicate"
+=======
+commands = ["cleanup",
+            "collection-status",
+            "full",
+            "incremental",
+            "list-current-files",
+            "remove-older-than",
+            "remove-all-but-n-full",
+            "remove-all-inc-of-but-n-full",
+            "restore",
+            "verify",
+>>>>>>> MERGE-SOURCE
             ]
 
 
@@ -203,8 +219,12 @@
             optparse.Option.take_action(
                 self, action, dest, opt, value, values, parser)
 
+<<<<<<< TREE
 
 u"""
+=======
+"""
+>>>>>>> MERGE-SOURCE
 Fix:
     File "/usr/lib/pythonX.X/optparse.py", line XXXX, in print_help
     file.write(self.format_help().encode(encoding, "replace"))
@@ -245,7 +265,7 @@
 def parse_cmdline_options(arglist):
     u"""Parse argument list"""
     global select_opts, select_files, full_backup
-    global list_current, collection_status, cleanup, remove_time, verify, replicate
+    global list_current, collection_status, cleanup, remove_time, verify
 
     def set_log_fd(fd):
         if fd < 1:
@@ -270,7 +290,11 @@
                            log.ErrorCode.cant_open_filelist)
 
     def print_ver(o, s, v, p):
+<<<<<<< TREE
         print(u"duplicity %s" % (globals.version))
+=======
+        print "duplicity %s" % (globals.version)
+>>>>>>> MERGE-SOURCE
         sys.exit(0)
 
     def add_rename(o, s, v, p):
@@ -391,9 +415,15 @@
     # whole root.
     # TRANSL: Used in usage help to represent a Unix-style path name. Example:
     # --archive-dir <path>
+<<<<<<< TREE
     parser.add_option(u"--file-to-restore", u"-r", action=u"callback", type=u"file",
                       metavar=_(u"path"), dest=u"restore_dir",
                       callback=lambda o, s, v, p: setattr(p.values, u"restore_dir", util.fsencode(v.strip(u'/'))))
+=======
+    parser.add_option("--file-to-restore", "-r", action="callback", type="file",
+                      metavar=_("path"), dest="restore_dir",
+                      callback=lambda o, s, v, p: setattr(p.values, "restore_dir", v.strip('/')))
+>>>>>>> MERGE-SOURCE
 
     # Used to confirm certain destructive operations like deleting old files.
     parser.add_option(u"--force", action=u"store_true")
@@ -577,6 +607,7 @@
     parser.add_option("--s3-kms-key-id", action=u"store", dest="s3_kms_key_id")
     parser.add_option("--s3-kms-grant", action=u"store", dest="s3_kms_grant")
 
+<<<<<<< TREE
     # Option to specify a Swift container storage policy.
     parser.add_option(u"--swift-storage-policy", type=u"string", metavar=_(u"policy"))
 
@@ -598,6 +629,8 @@
     # Standard storage tier used for storring backup files (Hot|Cool|Archive).
     parser.add_option(u"--azure-blob-tier", type=u"string", metavar=_(u"Hot|Cool|Archive"))
 
+=======
+>>>>>>> MERGE-SOURCE
     # scp command to use (ssh pexpect backend)
     parser.add_option(u"--scp-command", metavar=_(u"command"))
 
@@ -662,18 +695,21 @@
     parser.add_option(u"--volsize", type=u"int", action=u"callback", metavar=_(u"number"),
                       callback=lambda o, s, v, p: setattr(p.values, u"volsize", v * 1024 * 1024))
 
+<<<<<<< TREE
     # If set, collect only the file status, not the whole root.
     parser.add_option(u"--file-changed", action=u"callback", type=u"file",
                       metavar=_(u"path"), dest=u"file_changed",
                       callback=lambda o, s, v, p: setattr(p.values, u"file_changed", v.rstrip(u'/')))
 
+=======
+>>>>>>> MERGE-SOURCE
     # delay time before next try after a failure of a backend operation
     # TRANSL: Used in usage help. Example:
     # --backend-retry-delay <seconds>
     parser.add_option(u"--backend-retry-delay", type=u"int", metavar=_(u"seconds"))
 
     # parse the options
-    (options, args) = parser.parse_args(arglist)
+    (options, args) = parser.parse_args()
 
     # Copy all arguments and their values to the globals module.  Don't copy
     # attributes that are 'hidden' (start with an underscore) or whose name is
@@ -743,9 +779,12 @@
         num_expect = 1
     elif cmd == u"verify":
         verify = True
+<<<<<<< TREE
     elif cmd == u"replicate":
         replicate = True
         num_expect = 2
+=======
+>>>>>>> MERGE-SOURCE
 
     if len(args) != num_expect:
         command_line_error(u"Expected %d args, got %d" % (num_expect, len(args)))
@@ -764,12 +803,16 @@
     elif len(args) == 1:
         backend_url = args[0]
     elif len(args) == 2:
+<<<<<<< TREE
         if replicate:
             if not backend.is_backend_url(args[0]) or not backend.is_backend_url(args[1]):
                 command_line_error(u"Two URLs expected for replicate.")
             src_backend_url, backend_url = args[0], args[1]
         else:
             lpath, backend_url = args_to_path_backend(args[0], args[1])  # @UnusedVariable
+=======
+        lpath, backend_url = args_to_path_backend(args[0], args[1])  # @UnusedVariable
+>>>>>>> MERGE-SOURCE
     else:
         command_line_error(u"Too many arguments")
 
@@ -780,8 +823,13 @@
     set_archive_dir(expand_archive_dir(globals.archive_dir,
                                        globals.backup_name))
 
+<<<<<<< TREE
     log.Info(_(u"Using archive dir: %s") % (globals.archive_dir_path.uc_name,))
     log.Info(_(u"Using backup name: %s") % (globals.backup_name,))
+=======
+    log.Info(_("Using archive dir: %s") % (util.ufn(globals.archive_dir.name),))
+    log.Info(_("Using backup name: %s") % (globals.backup_name,))
+>>>>>>> MERGE-SOURCE
 
     return args
 
@@ -944,7 +992,6 @@
   duplicity remove-older-than %(time)s [%(options)s] %(target_url)s
   duplicity remove-all-but-n-full %(count)s [%(options)s] %(target_url)s
   duplicity remove-all-inc-of-but-n-full %(count)s [%(options)s] %(target_url)s
-  duplicity replicate %(source_url)s %(target_url)s
 
 """ % dict
 
@@ -964,7 +1011,6 @@
   scp://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
   ssh://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
   swift://%(container_name)s
-  pca://%(container_name)s
   tahoe://%(alias)s/%(directory)s
   webdav://%(user)s[:%(password)s]@%(other_host)s/%(some_dir)s
   webdavs://%(user)s[:%(password)s]@%(other_host)s/%(some_dir)s
@@ -991,8 +1037,7 @@
   remove-older-than <%(time)s> <%(target_url)s>
   remove-all-but-n-full <%(count)s> <%(target_url)s>
   remove-all-inc-of-but-n-full <%(count)s> <%(target_url)s>
-  verify <%(target_url)s> <%(source_dir)s>
-  replicate <%(source_url)s> <%(target_url)s>""" % dict
+  verify <%(target_url)s> <%(source_dir)s>""" % dict
 
     return msg
 
@@ -1004,12 +1049,19 @@
             os.makedirs(dirstring)
         except Exception:
             pass
+<<<<<<< TREE
     archive_dir_path = path.Path(dirstring)
     if not archive_dir_path.isdir():
         log.FatalError(_(u"Specified archive directory '%s' does not exist, "
                          u"or is not a directory") % (archive_dir_path.uc_name,),
+=======
+    archive_dir = path.Path(dirstring)
+    if not archive_dir.isdir():
+        log.FatalError(_("Specified archive directory '%s' does not exist, "
+                         "or is not a directory") % (util.ufn(archive_dir.name),),
+>>>>>>> MERGE-SOURCE
                        log.ErrorCode.bad_archive_dir)
-    globals.archive_dir_path = archive_dir_path
+    globals.archive_dir = archive_dir
 
 
 def set_sign_key(sign_key):
@@ -1094,8 +1146,13 @@
 
 
 def check_consistency(action):
+<<<<<<< TREE
     u"""Final consistency check, see if something wrong with command line"""
     global full_backup, select_opts, list_current, collection_status, cleanup, replicate
+=======
+    """Final consistency check, see if something wrong with command line"""
+    global full_backup, select_opts, list_current
+>>>>>>> MERGE-SOURCE
 
     def assert_only_one(arglist):
         u"""Raises error if two or more of the elements of arglist are true"""
@@ -1105,9 +1162,15 @@
                 n += 1
         assert n <= 1, u"Invalid syntax, two conflicting modes specified"
 
+<<<<<<< TREE
     if action in [u"list-current", u"collection-status",
                   u"cleanup", u"remove-old", u"remove-all-but-n-full", u"remove-all-inc-of-but-n-full", u"replicate"]:
         assert_only_one([list_current, collection_status, cleanup, replicate,
+=======
+    if action in ["list-current", "collection-status",
+                  "cleanup", "remove-old", "remove-all-but-n-full", "remove-all-inc-of-but-n-full"]:
+        assert_only_one([list_current, collection_status, cleanup,
+>>>>>>> MERGE-SOURCE
                          globals.remove_time is not None])
     elif action == u"restore" or action == u"verify":
         if full_backup:
@@ -1153,8 +1216,14 @@
             sign_key=src.sign_key,
             recipients=src.recipients,
             hidden_recipients=src.hidden_recipients)
+<<<<<<< TREE
     log.Debug(_(u"GPG binary is %s, version %s") %
               ((globals.gpg_binary or u'gpg'), globals.gpg_profile.gpg_version))
+=======
+    log.Debug(_("GPG binary is %s, version %s") %
+              ((globals.gpg_binary or 'gpg'),
+               "%d.%d.%d" % globals.gpg_profile.gpg_version))
+>>>>>>> MERGE-SOURCE
 
     # we can now try to import all the backends
     backend.import_backends()
@@ -1185,11 +1254,22 @@
 "file:///usr/local".  See the man page for more information.""") % (args[0],),
                            log.ErrorCode.bad_url)
     elif len(args) == 2:
+<<<<<<< TREE
         if replicate:
             globals.src_backend = backend.get_backend(args[0])
             globals.backend = backend.get_backend(args[1])
             action = u"replicate"
+=======
+        # Figure out whether backup or restore
+        backup, local_pathname = set_backend(args[0], args[1])
+        if backup:
+            if full_backup:
+                action = "full"
+            else:
+                action = "inc"
+>>>>>>> MERGE-SOURCE
         else:
+<<<<<<< TREE
             # Figure out whether backup or restore
             backup, local_pathname = set_backend(args[0], args[1])
             if backup:
@@ -1197,15 +1277,29 @@
                     action = u"full"
                 else:
                     action = u"inc"
+=======
+            if verify:
+                action = "verify"
+>>>>>>> MERGE-SOURCE
             else:
+<<<<<<< TREE
                 if verify:
                     action = u"verify"
                 else:
                     action = u"restore"
+=======
+                action = "restore"
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
             process_local_dir(action, local_pathname)
             if action in [u'full', u'inc', u'verify']:
                 set_selection()
+=======
+        process_local_dir(action, local_pathname)
+        if action in ['full', 'inc', 'verify']:
+            set_selection()
+>>>>>>> MERGE-SOURCE
     elif len(args) > 2:
         raise AssertionError(u"this code should not be reachable")
 

=== modified file 'duplicity/compilec.py'
--- duplicity/compilec.py	2018-12-04 20:50:28 +0000
+++ duplicity/compilec.py	2019-03-04 12:09:45 +0000
@@ -22,6 +22,7 @@
 
 import sys
 import os
+<<<<<<< TREE
 
 # Avoid conflict on python 2 with collections.py vs. built-in collections module
 sp = sys.path
@@ -29,6 +30,9 @@
 #  https://github.com/PyCQA/pylint/issues/73
 from distutils.core import setup, Extension  # pylint: disable=import-error,no-name-in-module
 sys.path = sp
+=======
+from distutils.core import setup, Extension
+>>>>>>> MERGE-SOURCE
 
 assert len(sys.argv) == 1
 sys.argv.append("build")

=== modified file 'duplicity/diffdir.py'
--- duplicity/diffdir.py	2018-11-29 19:00:15 +0000
+++ duplicity/diffdir.py	2019-03-04 12:09:45 +0000
@@ -92,7 +92,7 @@
     """
     global stats
     stats = statistics.StatsDeltaProcess()
-    if isinstance(dirsig_fileobj_list, list):
+    if isinstance(dirsig_fileobj_list, types.ListType):
         sig_iter = combine_path_iters([sigtar2path_iter(x) for x
                                        in dirsig_fileobj_list])
     else:
@@ -227,7 +227,7 @@
                     else:
                         ti.name = b"deleted/" + b"/".join(sig_path.index)
                     sigTarFile.addfile(ti)
-                stats.add_deleted_file(sig_path)
+                stats.add_deleted_file()
                 yield ROPath(sig_path.index)
         elif not sig_path or new_path != sig_path:
             # Must calculate new signature and create delta
@@ -294,7 +294,7 @@
     while 1:
         if not relem1:
             try:
-                relem1 = next(riter1)
+                relem1 = riter1.next()
             except StopIteration:
                 if relem2:
                     yield (None, relem2)
@@ -304,7 +304,7 @@
             index1 = relem1.index
         if not relem2:
             try:
-                relem2 = next(riter2)
+                relem2 = riter2.next()
             except StopIteration:
                 if relem1:
                     yield (relem1, None)
@@ -345,7 +345,7 @@
         Represent the next element as a triple, to help sorting
         """
         try:
-            path = next(path_iter_list[iter_index])
+            path = path_iter_list[iter_index].next()
         except StopIteration:
             return None
         return (path.index, iter_index, path)
@@ -385,7 +385,7 @@
     """
     global stats
     stats = statistics.StatsDeltaProcess()
-    if isinstance(sig_infp_list, list):
+    if isinstance(sig_infp_list, types.ListType):
         sig_path_iter = get_combined_path_iter(sig_infp_list)
     else:
         sig_path_iter = sigtar2path_iter(sig_infp_list)
@@ -541,7 +541,11 @@
             result = self.process_continued()  # pylint: disable=assignment-from-no-return
         else:
             # Below a StopIteration exception will just be passed upwards
+<<<<<<< TREE
             result = self.process(next(self.input_iter))  # pylint: disable=assignment-from-no-return
+=======
+            result = self.process(self.input_iter.next())
+>>>>>>> MERGE-SOURCE
         block_number = self.process_next_vol_number
         self.offset += len(result.data)
         self.previous_index = result.index

=== modified file 'duplicity/dup_threading.py'
--- duplicity/dup_threading.py	2018-11-29 19:00:15 +0000
+++ duplicity/dup_threading.py	2019-03-04 12:09:45 +0000
@@ -28,12 +28,15 @@
 at least python 2.5.)
 """
 
+<<<<<<< TREE
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
 import sys
 from duplicity import errors
 
+=======
+>>>>>>> MERGE-SOURCE
 _threading_supported = True
 
 try:
@@ -48,6 +51,10 @@
     import dummy_threading as threading
     _threading_supported = False
 
+import sys
+
+from duplicity import errors
+
 
 def threading_supported():
     u"""

=== modified file 'duplicity/dup_time.py'
=== modified file 'duplicity/file_naming.py'
--- duplicity/file_naming.py	2018-11-29 19:00:15 +0000
+++ duplicity/file_naming.py	2019-03-04 12:09:45 +0000
@@ -448,11 +448,3 @@
         self.encrypted = encrypted  # true if gpg encrypted
 
         self.partial = partial
-
-    def __eq__(self, other):
-        return self.type == other.type and \
-            self.manifest == other.manifest and \
-            self.time == other.time and \
-            self.start_time == other.start_time and \
-            self.end_time == other.end_time and \
-            self.partial == other.partial

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2019-01-25 17:08:40 +0000
+++ duplicity/globals.py	2019-03-04 12:09:45 +0000
@@ -58,9 +58,14 @@
 # contains the signatures and manifests of the relevent backup
 # collection), and for checkpoint state between volumes.
 # NOTE: this gets expanded in duplicity.commandline
+<<<<<<< TREE
 os.environ[u"XDG_CACHE_HOME"] = os.getenv(u"XDG_CACHE_HOME", os.path.expanduser(u"~/.cache"))
 archive_dir = os.path.expandvars(u"$XDG_CACHE_HOME/duplicity")
 archive_dir_path = None
+=======
+os.environ["XDG_CACHE_HOME"] = os.getenv("XDG_CACHE_HOME", os.path.expanduser("~/.cache"))
+archive_dir = os.path.expandvars("$XDG_CACHE_HOME/duplicity")
+>>>>>>> MERGE-SOURCE
 
 # config dir for future use
 os.environ[u"XDG_CONFIG_HOME"] = os.getenv(u"XDG_CONFIG_HOME", os.path.expanduser(u"~/.config"))
@@ -220,6 +225,7 @@
 # Use server side encryption in s3
 s3_use_sse = False
 
+<<<<<<< TREE
 # Use server side kms encryption in s3
 s3_use_sse_kms = False
 s3_kms_key_id = None
@@ -240,6 +246,8 @@
 # Standard storage tier used for storring backup blobs (Hot|Cool|Archive).
 azure_blob_tier = None
 
+=======
+>>>>>>> MERGE-SOURCE
 # Whether to use the full email address as the user name when
 # logging into an imap server. If false just the user name
 # part of the email address is used.
@@ -321,11 +329,9 @@
 # Whether to enable gio backend
 use_gio = False
 
-# If set, collect only the file status, not the whole root.
-file_changed = None
-
 # delay (in seconds) before next operation after failure
 backend_retry_delay = 30
+<<<<<<< TREE
 
 # default filesystem encoding
 # In Python 2 it seems that sys.getfilesystemencoding() will normally return
@@ -333,3 +339,12 @@
 # either 'ascii' or None.  Both are bogus, so default to 'utf-8' if it does.
 fsencoding = sys.getfilesystemencoding()
 fsencoding = fsencoding if fsencoding not in [u'ascii', u'ANSI_X3.4-1968', None] else u'utf-8'
+=======
+
+# default filesystem encoding
+# In Python 2 it seems that sys.getfilesystemencoding() will normally return
+# 'utf-8' or some other sane encoding, but will sometimes fail and return
+# either 'ascii' or None.  Both are bogus, so default to 'utf-8' if it does.
+fsencoding = sys.getfilesystemencoding()
+fsencoding = fsencoding if fsencoding not in ['ascii', None] else 'utf-8'
+>>>>>>> MERGE-SOURCE

=== modified file 'duplicity/globmatch.py'
--- duplicity/globmatch.py	2018-11-29 19:00:15 +0000
+++ duplicity/globmatch.py	2019-03-04 12:09:45 +0000
@@ -56,8 +56,13 @@
     return list(map(glob_to_regex, prefixes))
 
 
+<<<<<<< TREE
 def select_fn_from_glob(glob_str, include, ignore_case=False):
     u"""Return a function test_fn(path) which
+=======
+def path_matches_glob_fn(glob_str, include, ignore_case=False):
+    """Return a function test_fn(path) which
+>>>>>>> MERGE-SOURCE
     tests whether path matches glob, as per the Unix shell rules, taking as
     arguments a path, a glob string and include (0 indicating that the glob
     string is an exclude glob and 1 indicating that it is an include glob,
@@ -66,16 +71,18 @@
     1 - if the file should be included
     2 - if the folder should be scanned for any included/excluded files
     None - if the selection function has nothing to say about the file
-
-    Note: including a folder implicitly includes everything within it.
     """
     assert isinstance(glob_str, str)
     glob_ends_w_slash = False
 
+<<<<<<< TREE
     if glob_str == u"/":
         # If the glob string is '/', it implicitly includes everything
         glob_str = u"/**"
     elif glob_str[-1] == u"/":
+=======
+    if glob_str != "/" and glob_str[-1] == "/":
+>>>>>>> MERGE-SOURCE
         glob_ends_w_slash = True