Merge lp:~mterry/duplicity/optparse into lp:duplicity/0.6

[Michael Terry]

[Kenneth Loafman (kenneth-loafman)]

Take a look at my comment in https://bugs.launchpad.net/duplicity/+bug/490619. Mostly, it looks fine, but there's still some work to be done.

When I did the merge on my own machine, I had to take two files, commandline.py and globals.py, directly from the optparse branch since there are merge errors line the ones below. That plus the errors in the link above say its not ready yet.

review: Needs Fixing

[lp:~mterry/duplicity/optparse]

621. By Michael Terry on 2009-12-08

fix a few typos

622. By Michael Terry on 2009-12-13

fix an undefined variable usage

623. By Michael Terry on 2009-12-13

use defaults from globals.py for commandline options

624. By Michael Terry on 2009-12-13

don't set xdg dirs in duplicity-bin now that globals.py is restored

625. By Michael Terry on 2009-12-14

whoops, remove debug code

=== modified file 'duplicity-bin'
--- duplicity-bin	2009-10-23 20:35:06 +0000
+++ duplicity-bin	2009-12-14 01:53:14 +0000
@@ -1111,12 +1111,12 @@
         os.setuid(os.geteuid())
         os.setgid(os.getegid())
 
+    # determine what action we're performing and process command line
+    action = commandline.ProcessCommandLine(sys.argv[1:])
+
     # set the current time strings
     dup_time.setcurtime()
 
-    # determine what action we're performing and process command line
-    action = commandline.ProcessCommandLine(sys.argv[1:])
-
     # get the passphrase if we need to based on action/options
     globals.gpg_profile.passphrase = get_passphrase(1, action)
 

=== modified file 'duplicity/backend.py'
--- duplicity/backend.py	2009-07-15 14:02:09 +0000
+++ duplicity/backend.py	2009-12-14 01:53:14 +0000
@@ -26,7 +26,6 @@
 
 import os
 import sys
-import socket
 import time
 import re
 import getpass
@@ -48,9 +47,6 @@
 import duplicity.backends
 
 
-# todo: this should really NOT be done here
-socket.setdefaulttimeout(globals.timeout)
-
 _forced_backend = None
 _backends = {}
 

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2009-11-26 16:32:54 +0000
+++ duplicity/commandline.py	2009-12-14 01:53:14 +0000
@@ -21,10 +21,13 @@
 
 """Parse command line, check for consistency, and set globals"""
 
+from copy import copy
+import optparse
 import getopt
 import os
 import re
 import sys
+import socket
 
 try:
     from hashlib import md5
@@ -62,6 +65,7 @@
             "verify",
             ]
 
+<<<<<<< TREE
 options = ["allow-source-mismatch",
            "archive-dir=",
            "asynchronous-upload",
@@ -123,6 +127,8 @@
            ]
 
 
+=======
+>>>>>>> MERGE-SOURCE
 def old_fn_deprecation(opt):
     print >>sys.stderr, _("Warning: Option %s is pending deprecation "
                           "and will be removed in a future release.\n"
@@ -163,28 +169,365 @@
     burlhash.update(backend_url)
     return burlhash.hexdigest()
 
+def check_file(option, opt, value):
+    return expand_fn(value)
+
+def check_time(option, opt, value):
+    try:
+        return dup_time.genstrtotime(value)
+    except dup_time.TimeException, e:
+        raise optparse.OptionValueError(str(e))
+
+def check_verbosity(option, opt, value):
+    fail = False
+
+    value = value.lower()
+    if value in ['e', 'error']:
+        verb = log.ERROR
+    elif value in ['w', 'warning']:
+        verb = log.WARNING
+    elif value in ['n', 'notice']:
+        verb = log.NOTICE
+    elif value in ['i', 'info']:
+        verb = log.INFO
+    elif value in ['d', 'debug']:
+        verb = log.DEBUG
+    else:
+        try:
+            verb = int(value)
+        except ValueError:
+            fail = True
+        if verb < 0 or verb > 9:
+            fail = True
+
+    if fail:
+        # TRANSL: In this portion of the usage instructions, "[ewnid]" indicates which
+        # characters are permitted (e, w, n, i, or d); the brackets imply their own
+        # meaning in regex; i.e., only one of the characters is allowed in an instance.
+        raise optparse.OptionValueError("Verbosity must be one of: digit [0-9], character [ewnid], "
+                                        "or word ['error', 'warning', 'notice', 'info', 'debug']. "
+                                        "The default is 4 (Notice).  It is strongly recommended "
+                                        "that verbosity level is set at 2 (Warning) or higher.")
+
+    return verb
+
+class DupOption(optparse.Option):
+    TYPES = optparse.Option.TYPES + ("file", "time", "verbosity",)
+    TYPE_CHECKER = copy(optparse.Option.TYPE_CHECKER)
+    TYPE_CHECKER["file"] = check_file
+    TYPE_CHECKER["time"] = check_time
+    TYPE_CHECKER["verbosity"] = check_verbosity
+
+    ACTIONS = optparse.Option.ACTIONS + ("extend",)
+    STORE_ACTIONS = optparse.Option.STORE_ACTIONS + ("extend",)
+    TYPED_ACTIONS = optparse.Option.TYPED_ACTIONS + ("extend",)
+    ALWAYS_TYPED_ACTIONS = optparse.Option.ALWAYS_TYPED_ACTIONS + ("extend",)
+
+    def take_action(self, action, dest, opt, value, values, parser):
+        if action == "extend":
+            if hasattr(values, dest):
+                setattr(values, dest, getattr(values, dest) + ' ' + value)
+            else:
+                setattr(values, dest, value)
+        else:
+            optparse.Option.take_action(
+                self, action, dest, opt, value, values, parser)
 
 def parse_cmdline_options(arglist):
     """Parse argument list"""
     global select_opts, select_files, full_backup
     global list_current, collection_status, cleanup, remove_time, verify
 
-
-    def sel_fl(filename):
-        """Helper function for including/excluding filelists below"""
-        try:
-            return open(filename, "r")
+    def use_gio(*args):
+        try:
+            import duplicity.backends.giobackend
+            backend.force_backend(duplicity.backends.giobackend.GIOBackend)
+        except ImportError:
+            log.FatalError(_("Unable to load gio module"), log.ErrorCode.gio_not_available)
+
+    def set_log_fd(fd):
+        if fd < 1:
+            raise optparse.OptionValueError("log-fd must be greater than zero.")
+        log.add_fd(fd)
+
+    def set_time_sep(sep, opt):
+        if sep == '-':
+            raise optparse.OptionValueError("Dash ('-') not valid for time-separator.")
+        globals.time_separator = sep
+        old_fn_deprecation(opt)
+
+    def add_selection(o, s, v, p):
+        select_opts.append((s, v))
+
+    def add_filelist(o, s, v, p):
+        filename = v
+        select_opts.append((s, filename))
+        try:
+            select_files.append(open(filename, "r"))
         except IOError:
             log.FatalError(_("Error opening file %s") % filename,
                            log.ErrorCode.cant_open_filelist)
 
+    def print_ver(o, s, v, p):
+        print "duplicity %s" % (globals.version)
+        sys.exit(0)
+
+    parser = optparse.OptionParser(option_class=DupOption, usage=usage())
+
+    # If this is true, only warn and don't raise fatal error when backup
+    # source directory doesn't match previous backup source directory.
+    parser.add_option("--allow-source-mismatch", action="store_true")
+
+    # Set to the path of the archive directory (the directory which
+    # contains the signatures and manifests of the relevent backup
+    # collection), and for checkpoint state between volumes.
+    # TRANSL: Used in usage help to represent a Unix-style path name. Example:
+    # --archive-dir <path>
+    parser.add_option("--archive-dir", type="file", metavar=_("path"))
+
+    # Asynchronous put/get concurrency limit
+    # (default of 0 disables asynchronicity).
+    parser.add_option("--asynchronous-upload", action="store_const", const=1,
+                      dest="async_concurrency")
+
+    # config dir for future use
+    parser.add_option("--config-dir", type="file", metavar=_("path"),
+                      help=optparse.SUPPRESS_HELP)
+
+    parser.add_option("--current-time", action="callback", type="int",
+                      dest="", help=optparse.SUPPRESS_HELP,
+                      callback=lambda o, s, v, p: dup_time.setcurtime(v))
+
+    # Don't actually do anything, but still report what would be done
+    parser.add_option("--dry-run", action="store_true")
+
+    # TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
+    # --encrypt-key <gpg_key_id>
+    parser.add_option("--encrypt-key", type="string", metavar=_("gpg-key-id"),
+                      dest="", action="callback",
+                      callback=lambda o, s, v, p: globals.gpg_profile.recipients.append(v))
+
+    # TRANSL: Used in usage help to represent a "glob" style pattern for
+    # matching one or more files, as described in the documentation.
+    # Example:
+    # --exclude <shell_pattern>
+    parser.add_option("--exclude", action="callback", metavar=_("shell_pattern"),
+                      dest="", type="string", callback=add_selection)
+
+    parser.add_option("--exclude-device-files", action="callback",
+                      dest="", callback=add_selection)
+
+    parser.add_option("--exclude-filelist", type="file", metavar=_("filename"),
+                      dest="", action="callback", callback=add_filelist)
+
+    parser.add_option("--exclude-filelist-stdin", action="callback", dest="",
+                      callback=lambda o, s, v, p: (select_opts.append(("--exclude-filelist", "standard input")),
+                                                   select_files.append(sys.stdin)))
+
+    parser.add_option("--exclude-globbing-filelist", type="file", metavar=_("filename"),
+                      dest="", action="callback", callback=add_filelist)
+
+    # TRANSL: Used in usage help to represent the name of a file. Example:
+    # --log-file <filename>
+    parser.add_option("--exclude-if-present", metavar=_("filename"), dest="",
+                      type="file", action="callback", callback=add_selection)
+
+    parser.add_option("--exclude-other-filesystems", action="callback",
+                      dest="", callback=add_selection)
+
+    # TRANSL: Used in usage help to represent a regular expression (regexp).
+    parser.add_option("--exclude-regexp", metavar=_("regular_expression"),
+                      dest="", type="string", action="callback", callback=add_selection)
+
+    # Whether we should be particularly aggressive when cleaning up
+    parser.add_option("--extra-clean", action="store_true")
+
+    # used in testing only - raises exception after volume
+    parser.add_option("--fail-on-volume", type="int",
+                      help=optparse.SUPPRESS_HELP)
+
+    # If set, restore only the subdirectory or file specified, not the
+    # whole root.
+    # TRANSL: Used in usage help to represent a Unix-style path name. Example:
+    # --archive-dir <path>
+    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.rstrip('/')))
+
+    # Used to confirm certain destructive operations like deleting old files.
+    parser.add_option("--force", action="store_true")
+
+    # FTP data connection type
+    parser.add_option("--ftp-passive", action="store_const", const="passive", dest="ftp_connection")
+    parser.add_option("--ftp-regular", action="store_const", const="regular", dest="ftp_connection")
+
+    # If set, forces a full backup if the last full backup is older than
+    # the time specified
+    parser.add_option("--full-if-older-than", type="time", dest="full_force_time", metavar=_("time"))
+
+    parser.add_option("--gio", action="callback", callback=use_gio)
+
+    parser.add_option("--gpg-options", action="extend", metavar=_("options"))
+
+    # ignore (some) errors during operations; supposed to make it more
+    # likely that you are able to restore data under problematic
+    # circumstances. the default should absolutely always be False unless
+    # you know what you are doing.
+    parser.add_option("--ignore-errors", action="callback", 
+                      callback=lambda o, s, v, p: (log.Warn(
+                          _("Running in 'ignore errors' mode due to %s; please "
+                            "re-consider if this was not intended") % s),
+                          setattr(p.values, o.dest, True)))
+
+    # 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.
+    parser.add_option("--imap-full-address", action="store_true",
+                      help=optparse.SUPPRESS_HELP)
+
+    # Name of the imap folder where we want to store backups.
+    # Can be changed with a command line argument.
+    # TRANSL: Used in usage help to represent an imap mailbox
+    parser.add_option("--imap-mailbox", metavar=_("imap_mailbox"))
+
+    parser.add_option("--include", action="callback", metavar=_("shell_pattern"),
+                      dest="", type="string", callback=add_selection)
+    parser.add_option("--include-filelist", type="file", metavar=_("filename"),
+                      dest="", action="callback", callback=add_filelist)
+    parser.add_option("--include-globbing-filelist", type="file", metavar=_("filename"),
+                      dest="", action="callback", callback=add_filelist)
+    parser.add_option("--include-regexp", metavar=_("regular_expression"), dest="",
+                      type="string", action="callback", callback=add_selection)
+
+    parser.add_option("--log-fd", type="int", metavar=_("file_descriptor"),
+                      dest="", action="callback",
+                      callback=lambda o, s, v, p: set_log_fd(v))
+
+    # TRANSL: Used in usage help to represent the name of a file. Example:
+    # --log-file <filename>
+    parser.add_option("--log-file", type="file", metavar=_("filename"),
+                      dest="", action="callback",
+                      callback=lambda o, s, v, p: log.add_file(v))
+
+    # TRANSL: Used in usage help (noun)
+    parser.add_option("--name", dest="backup_name", metavar=_("backup name"))
+
+    # If set to false, then do not encrypt files on remote system
+    parser.add_option("--no-encryption", action="store_false", dest="encryption")
+
+    # If set, print the statistics after every backup session
+    parser.add_option("--no-print-statistics", action="store_false", dest="print_statistics")
+
+    # If true, filelists and directory statistics will be split on
+    # nulls instead of newlines.
+    parser.add_option("--null-separator", action="store_true")
+
+    # number of retries on network operations
+    # TRANSL: Used in usage help to represent a desired number of
+    # something. Example:
+    # --num-retries <number>
+    parser.add_option("--num-retries", type="int", metavar=_("number"))
+
+    # Whether the old filename format is in effect.
+    parser.add_option("--old-filenames", action="callback", 
+                      callback=lambda o, s, v, p: (setattr(p.values, o.dest, True),
+                                                   old_fn_deprecation(s)))
+
+    # Restores will try to bring back the state as of the following time.
+    # If it is None, default to current time.
+    # TRANSL: Used in usage help to represent a time spec for a previous
+    # point in time, as described in the documentation. Example:
+    # duplicity remove-older-than time [options] target_url
+    parser.add_option("--restore-time", "--time", "-t", type="time", metavar=_("time"))
+
+    # Whether to create European buckets (sorry, hard-coded to only
+    # support european for now).
+    parser.add_option("--s3-european-buckets", action="store_true")
+
+    # Whether to use "new-style" subdomain addressing for S3 buckets. Such
+    # use is not backwards-compatible with upper-case buckets, or buckets
+    # that are otherwise not expressable in a valid hostname.
+    parser.add_option("--s3-use-new-style", action="store_true")
+
+    # scp command to use
+    # TRANSL: noun
+    parser.add_option("--scp-command", metavar=_("command"))
+
+    # sftp command to use
+    # TRANSL: noun
+    parser.add_option("--sftp-command", metavar=_("command"))
+
+    # If set, use short (< 30 char) filenames for all the remote files.
+    parser.add_option("--short-filenames", action="callback", 
+                      callback=lambda o, s, v, p: (setattr(p.values, o.dest, True),
+                                                   old_fn_deprecation(s)))
+
+    # TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
+    # --encrypt-key <gpg_key_id>
+    parser.add_option("--sign-key", type="string", metavar=_("gpg-key-id"),
+                      dest="", action="callback",
+                      callback=lambda o, s, v, p: set_sign_key(v))
+
+    # default to batch mode using public-key encryption
+    parser.add_option("--ssh-askpass", action="store_true")
+
+    # user added ssh options
+    parser.add_option("--ssh-options", action="extend", metavar=_("options"))
+
+    # Working directory for the tempfile module. Defaults to /tmp on most systems.
+    parser.add_option("--tempdir", dest="temproot", type="file", metavar=_("path"))
+
+    # network timeout value
+    # TRANSL: Used in usage help. Example:
+    # --timeout <seconds>
+    parser.add_option("--timeout", type="int", metavar=_("seconds"))
+
+    # Character used like the ":" in time strings like
+    # 2002-08-06T04:22:00-07:00.  The colon isn't good for filenames on
+    # windows machines.
+    # TRANSL: abbreviation for "character" (noun)
+    parser.add_option("--time-separator", type="string", metavar=_("char"),
+                      action="callback",
+                      callback=lambda o, s, v, p: set_time_sep(v, s))
+
+    # Whether to specify --use-agent in GnuPG options
+    parser.add_option("--use-agent", action="store_true")
+
+    parser.add_option("--verbosity", "-v", type="verbosity", metavar="[0-9]",
+                      dest="", action="callback",
+                      callback=lambda o, s, v, p: log.setverbosity(v))
+
+    parser.add_option("-V", "--version", action="callback", callback=print_ver)
+
+    # volume size
+    # TRANSL: Used in usage help to represent a desired number of
+    # something. Example:
+    # --num-retries <number>
+    parser.add_option("--volsize", type="int", action="callback", metavar=_("number"),
+                      callback=lambda o, s, v, p: setattr(p.values, "volsize", v*1024*1024))
+
+    (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
+    # the empty string (used for arguments that don't directly store a value
+    # by using dest="")
+    for f in filter(lambda x: x and not x.startswith("_"), dir(options)):
+        v = getattr(options, f)
+        # Only set if v is not None because None is the default for all the
+        # variables.  If user didn't set it, we'll use defaults in globals.py
+        if v is not None:
+            setattr(globals, f, v)
+
+    socket.setdefaulttimeout(globals.timeout)
+
     # expect no cmd and two positional args
     cmd = ""
     num_expect = 2
 
     # process first arg as command
-    if arglist and arglist[0][0] != '-':
-        cmd = arglist.pop(0)
+    if args:
+        cmd = args.pop(0)
         possible = [c for c in commands if c.startswith(cmd)]
         # no unique match, that's an error
         if len(possible) > 1:
@@ -194,7 +537,7 @@
             cmd = possible[0]
         # no matches, assume no cmd
         elif not possible:
-            arglist.insert(0, cmd)
+            args.insert(0, cmd)
 
     if cmd == "cleanup":
         cleanup = True
@@ -213,14 +556,14 @@
         num_expect = 1
     elif cmd == "remove-older-than":
         try:
-            arg = arglist.pop(0)
+            arg = args.pop(0)
         except:
             command_line_error("Missing time string for remove-older-than")
         globals.remove_time = dup_time.genstrtotime(arg)
         num_expect = 1
     elif cmd == "remove-all-but-n-full":
         try:
-            arg = arglist.pop(0)
+            arg = args.pop(0)
         except:
             command_line_error("Missing count for remove-all-but-n-full")
         globals.keep_chains = int(arg)
@@ -230,6 +573,7 @@
     elif cmd == "verify":
         verify = True
 
+<<<<<<< TREE
     # parse the remaining args
     try:
         optlist, args = getopt.gnu_getopt(arglist, "hrt:v:V", options)
@@ -398,6 +742,8 @@
     if globals.old_filenames:
         dup_time.curtimestr = dup_time.timetostring(dup_time.curtime)
 
+=======
+>>>>>>> MERGE-SOURCE
     if len(args) != num_expect:
         command_line_error("Expected %d args, got %d" % (num_expect, len(args)))
 
@@ -440,7 +786,7 @@
 
 
 def usage():
-    """Print terse usage info. The code is broken down into pieces for ease of
+    """Returns terse usage info. The code is broken down into pieces for ease of
     translation maintenance. Any comments that look extraneous or redundant should
     be assumed to be for the benefit of translators, since they can get each string
     (paired with its preceding comment, if any) independently of the others."""
@@ -454,9 +800,6 @@
         # tahoe://alias/some_dir
         'alias'          : _("alias"),
 
-        # TRANSL: Used in usage help (noun)
-        'backup_name'    : _("backup name"),
-
         # TRANSL: Used in help to represent a "bucket name" for Amazon Web
         # Services' Simple Storage Service (S3). Example:
         # s3://other.host/bucket_name[/prefix]
@@ -574,44 +917,42 @@
         # ftp://user[:password]@other.host[:port]/some_dir
         'user'           : _("user") }
 
-    msg = _("duplicity version %s running on %s.") % (globals.version, sys.platform)
-    msg = "\n" + msg + "\n"
-
     # TRANSL: Header in usage help
-    msg = msg + _("Usage:") + """
-    duplicity [full|incremental] [%(options)s] %(source_dir)s %(target_url)s
-    duplicity [restore] [%(options)s] %(source_url)s %(target_dir)s
-    duplicity verify [%(options)s] %(source_url)s %(target_dir)s
-    duplicity collection-status [%(options)s] %(target_url)s
-    duplicity list-current-files [%(options)s] %(target_url)s
-    duplicity cleanup [%(options)s] %(target_url)s
-    duplicity remove-older-than %(time)s [%(options)s] %(target_url)s
-    duplicity remove-all-but-n-full %(count)s [%(options)s] %(target_url)s
+    msg = """
+  duplicity [full|incremental] [%(options)s] %(source_dir)s %(target_url)s
+  duplicity [restore] [%(options)s] %(source_url)s %(target_dir)s
+  duplicity verify [%(options)s] %(source_url)s %(target_dir)s
+  duplicity collection-status [%(options)s] %(target_url)s
+  duplicity list-current-files [%(options)s] %(target_url)s
+  duplicity cleanup [%(options)s] %(target_url)s
+  duplicity remove-older-than %(time)s [%(options)s] %(target_url)s
+  duplicity remove-all-but-n-full %(count)s [%(options)s] %(target_url)s
 
 """ % dict
 
     # TRANSL: Header in usage help
     msg = msg + _("Backends and their URL formats:") + """
-    cf+http://%(container_name)s
-    file:///%(some_dir)s
-    ftp://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
-    hsi://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
-    imap://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
-    rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]::/%(module)s/%(some_dir)s
-    rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(relative_path)s
-    rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]//%(absolute_path)s
-    s3://%(other_host)s/%(bucket_name)s[/%(prefix)s]
-    s3+http://%(bucket_name)s[/%(prefix)s]
-    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
-    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
+  cf+http://%(container_name)s
+  file:///%(some_dir)s
+  ftp://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
+  hsi://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
+  imap://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(some_dir)s
+  rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]::/%(module)s/%(some_dir)s
+  rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]/%(relative_path)s
+  rsync://%(user)s[:%(password)s]@%(other_host)s[:%(port)s]//%(absolute_path)s
+  s3://%(other_host)s/%(bucket_name)s[/%(prefix)s]
+  s3+http://%(bucket_name)s[/%(prefix)s]
+  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
+  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
 
 """ % dict
 
     # TRANSL: Header in usage help
     msg = msg + _("Commands:") + """
+<<<<<<< TREE
     cleanup <%(target_url)s>
     collection-status <%(target_url)s>
     full <%(source_dir)s> <%(target_url)s>
@@ -697,6 +1038,20 @@
     except ValueError:
         command_line_error("Received '%s' for %s, need integer" %
                                           (int_string, description.lstrip('-')))
+=======
+  cleanup <%(target_url)s>
+  collection-status <%(target_url)s>
+  full <%(source_dir)s> <%(target_url)s>
+  incr <%(source_dir)s> <%(target_url)s>
+  list-current-files <%(target_url)s>
+  restore <%(target_url)s> <%(source_dir)s>
+  remove-older-than <%(time)s> <%(target_url)s>
+  remove-all-but-n-full <%(count)s> <%(target_url)s>
+  verify <%(target_url)s> <%(source_dir)s>""" % dict
+
+    return msg
+
+>>>>>>> MERGE-SOURCE
 
 def set_archive_dir(dirstring):
     """Check archive dir and set global"""

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2009-11-26 16:32:54 +0000
+++ duplicity/globals.py	2009-12-14 01:53:15 +0000
@@ -88,10 +88,10 @@
 incremental = None
 
 # If set, print the statistics after every backup session
-print_statistics = 1
+print_statistics = True
 
 # If set, use short (< 30 char) filenames for all the remote files.
-short_filenames = 0
+short_filenames = False
 
 # If set, forces a full backup if the last full backup is older than
 # the time specified

=== modified file 'po/duplicity.pot'
--- po/duplicity.pot	2009-11-08 16:12:07 +0000
+++ po/duplicity.pot	2009-12-14 01:53:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Kenneth Loafman <[e-mail]>\n"
-"POT-Creation-Date: 2009-10-29 14:51-0600\n"
+"POT-Creation-Date: 2009-11-30 21:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -230,39 +230,39 @@
 "         backup then restart the backup from the beginning."
 msgstr ""
 
-#: ../duplicity-bin:1157
+#: ../duplicity-bin:1160
 #, python-format
 msgid "Last %s backup left a partial set, restarting."
 msgstr ""
 
-#: ../duplicity-bin:1161
+#: ../duplicity-bin:1164
 #, python-format
 msgid "Cleaning up previous partial %s backup set, restarting."
 msgstr ""
 
-#: ../duplicity-bin:1172
+#: ../duplicity-bin:1175
 msgid "Last full backup date:"
 msgstr ""
 
-#: ../duplicity-bin:1174
+#: ../duplicity-bin:1177
 msgid "Last full backup date: none"
 msgstr ""
 
-#: ../duplicity-bin:1176
+#: ../duplicity-bin:1179
 msgid "Last full backup is too old, forcing full backup"
 msgstr ""
 
-#: ../duplicity-bin:1250
+#: ../duplicity-bin:1253
 #, python-format
 msgid "GPG error detail: %s"
 msgstr ""
 
-#: ../duplicity-bin:1259
+#: ../duplicity-bin:1262
 #, python-format
 msgid "User error detail: %s"
 msgstr ""
 
-#: ../duplicity-bin:1268
+#: ../duplicity-bin:1271
 #, python-format
 msgid "Backend error detail: %s"
 msgstr ""
@@ -303,33 +303,33 @@
 msgid "task execution done (success: %s)"
 msgstr ""
 
-#: ../duplicity/backend.py:370
+#: ../duplicity/backend.py:366
 #, python-format
 msgid "Running '%s'"
 msgstr ""
 
-#: ../duplicity/backend.py:384
+#: ../duplicity/backend.py:380
 #, python-format
 msgid "Running '%s' (attempt #%d)"
 msgid_plural "Running '%s' (attempt #%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/backend.py:389 ../duplicity/backend.py:430
+#: ../duplicity/backend.py:385 ../duplicity/backend.py:426
 #, python-format
 msgid "Running '%s' failed (attempt #%d)"
 msgid_plural "Running '%s' failed (attempt #%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/backend.py:392 ../duplicity/backend.py:433
+#: ../duplicity/backend.py:388 ../duplicity/backend.py:429
 #, python-format
 msgid "Giving up trying to execute '%s' after %d attempt"
 msgid_plural "Giving up trying to execute '%s' after %d attempts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/backend.py:403 ../duplicity/backend.py:420
+#: ../duplicity/backend.py:399 ../duplicity/backend.py:416
 #, python-format
 msgid "Reading results of '%s'"
 msgstr ""
@@ -552,7 +552,7 @@
 "starting at time %s."
 msgstr ""
 
-#: ../duplicity/commandline.py:126
+#: ../duplicity/commandline.py:69
 #, python-format
 msgid ""
 "Warning: Option %s is pending deprecation and will be removed in a future "
@@ -560,179 +560,212 @@
 "Use of default filenames is strongly suggested."
 msgstr ""
 
-#: ../duplicity/commandline.py:177
+#: ../duplicity/commandline.py:182
+msgid "Unable to load gio module"
+msgstr ""
+
+#: ../duplicity/commandline.py:203
 #, python-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:291
-msgid "Unable to load gio module"
-msgstr ""
-
-#: ../duplicity/commandline.py:386
+#. Used in usage help to represent a Unix-style path name. Example:
+#. --archive-dir <path>
+#: ../duplicity/commandline.py:221 ../duplicity/commandline.py:229
+#: ../duplicity/commandline.py:289 ../duplicity/commandline.py:413
+#: ../duplicity/commandline.py:655
+msgid "path"
+msgstr ""
+
+#. Used in usage help to represent an ID for a GnuPG key. Example:
+#. --encrypt-key <gpg_key_id>
+#: ../duplicity/commandline.py:241 ../duplicity/commandline.py:402
+#: ../duplicity/commandline.py:628
+msgid "gpg-key-id"
+msgstr ""
+
+#. Used in usage help to represent a "glob" style pattern for
+#. matching one or more files, as described in the documentation.
+#. Example:
+#. --exclude <shell_pattern>
+#: ../duplicity/commandline.py:249 ../duplicity/commandline.py:328
+#: ../duplicity/commandline.py:678
+msgid "shell_pattern"
+msgstr ""
+
+#. Used in usage help to represent the name of a file. Example:
+#. --log-file <filename>
+#: ../duplicity/commandline.py:255 ../duplicity/commandline.py:262
+#: ../duplicity/commandline.py:267 ../duplicity/commandline.py:330
+#: ../duplicity/commandline.py:332 ../duplicity/commandline.py:343
+#: ../duplicity/commandline.py:624
+msgid "filename"
+msgstr ""
+
+#. Used in usage help to represent a regular expression (regexp).
+#: ../duplicity/commandline.py:274 ../duplicity/commandline.py:334
+msgid "regular_expression"
+msgstr ""
+
+#. Used in usage help to represent a time spec for a previous
+#. point in time, as described in the documentation. Example:
+#. duplicity remove-older-than time [options] target_url
+#: ../duplicity/commandline.py:301 ../duplicity/commandline.py:376
+#: ../duplicity/commandline.py:710
+msgid "time"
+msgstr ""
+
+#. Used in usage help. (Should be consistent with the "Options:"
+#. header.) Example:
+#. duplicity [full|incremental] [options] source_dir target_url
+#: ../duplicity/commandline.py:305 ../duplicity/commandline.py:410
+#: ../duplicity/commandline.py:643
+msgid "options"
+msgstr ""
+
+#: ../duplicity/commandline.py:313
+#, python-format
 msgid ""
-"running in 'ignore errors' mode due to --ignore-errors; please re-consider "
-"if this was not intended"
-msgstr ""
-
-#: ../duplicity/commandline.py:426
+"Running in 'ignore errors' mode due to %s; please re-consider if this was "
+"not intended"
+msgstr ""
+
+#. Used in usage help to represent an imap mailbox
+#: ../duplicity/commandline.py:326
+msgid "imap_mailbox"
+msgstr ""
+
+#: ../duplicity/commandline.py:337
+msgid "file_descriptor"
+msgstr ""
+
+#. Used in usage help (noun)
+#: ../duplicity/commandline.py:348
+msgid "backup name"
+msgstr ""
+
+#. Used in usage help to represent a desired number of
+#. something. Example:
+#. --num-retries <number>
+#: ../duplicity/commandline.py:364 ../duplicity/commandline.py:441
+#: ../duplicity/commandline.py:638
+msgid "number"
+msgstr ""
+
+#. noun
+#: ../duplicity/commandline.py:389 ../duplicity/commandline.py:393
+#: ../duplicity/commandline.py:609
+msgid "command"
+msgstr ""
+
+#. Used in usage help. Example:
+#. --timeout <seconds>
+#: ../duplicity/commandline.py:418 ../duplicity/commandline.py:672
+msgid "seconds"
+msgstr ""
+
+#. abbreviation for "character" (noun)
+#: ../duplicity/commandline.py:424 ../duplicity/commandline.py:606
+msgid "char"
+msgstr ""
+
+#: ../duplicity/commandline.py:572
 #, python-format
 msgid "Using archive dir: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:427
+#: ../duplicity/commandline.py:573
 #, python-format
 msgid "Using backup name: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:434
+#: ../duplicity/commandline.py:580
 #, python-format
 msgid "Command line error: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:435
+#: ../duplicity/commandline.py:581
 msgid "Enter 'duplicity --help' for help screen."
 msgstr ""
 
 #. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other_host[:port]//absolute_path
-#: ../duplicity/commandline.py:448
+#: ../duplicity/commandline.py:594
 msgid "absolute_path"
 msgstr ""
 
 #. Used in usage help. Example:
 #. tahoe://alias/some_dir
-#: ../duplicity/commandline.py:452
+#: ../duplicity/commandline.py:598
 msgid "alias"
 msgstr ""
 
-#. Used in usage help (noun)
-#: ../duplicity/commandline.py:455
-msgid "backup name"
-msgstr ""
-
 #. Used in help to represent a "bucket name" for Amazon Web
 #. Services' Simple Storage Service (S3). Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:460
+#: ../duplicity/commandline.py:603
 msgid "bucket_name"
 msgstr ""
 
-#. abbreviation for "character" (noun)
-#: ../duplicity/commandline.py:463
-msgid "char"
-msgstr ""
-
-#. noun
-#: ../duplicity/commandline.py:466
-msgid "command"
-msgstr ""
-
 #. Used in usage help to represent the name of a container in
 #. Amazon Web Services' Cloudfront. Example:
 #. cf+http://container_name
-#: ../duplicity/commandline.py:471
+#: ../duplicity/commandline.py:614
 msgid "container_name"
 msgstr ""
 
 #. noun
-#: ../duplicity/commandline.py:474
+#: ../duplicity/commandline.py:617
 msgid "count"
 msgstr ""
 
 #. Used in usage help to represent the name of a file directory
-#: ../duplicity/commandline.py:477
+#: ../duplicity/commandline.py:620
 msgid "directory"
 msgstr ""
 
-#. Used in usage help to represent the name of a file. Example:
-#. --log-file <filename>
-#: ../duplicity/commandline.py:481
-msgid "filename"
-msgstr ""
-
-#. Used in usage help to represent an ID for a GnuPG key. Example:
-#. --encrypt-key <gpg_key_id>
-#: ../duplicity/commandline.py:485
-msgid "gpg-key-id"
-msgstr ""
-
 #. Used in usage help, e.g. to represent the name of a code
 #. module. Example:
 #. rsync://user[:password]@other.host[:port]::/module/some_dir
-#: ../duplicity/commandline.py:490
+#: ../duplicity/commandline.py:633
 msgid "module"
 msgstr ""
 
-#. Used in usage help to represent a desired number of
-#. something. Example:
-#. --num-retries <number>
-#: ../duplicity/commandline.py:495
-msgid "number"
-msgstr ""
-
-#. Used in usage help. (Should be consistent with the "Options:"
-#. header.) Example:
-#. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:500
-msgid "options"
-msgstr ""
-
 #. Used in usage help to represent an internet hostname. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:504
+#: ../duplicity/commandline.py:647
 msgid "other.host"
 msgstr ""
 
 #. Used in usage help. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:508
+#: ../duplicity/commandline.py:651
 msgid "password"
 msgstr ""
 
-#. Used in usage help to represent a Unix-style path name. Example:
-#. --archive-dir <path>
-#: ../duplicity/commandline.py:512
-msgid "path"
-msgstr ""
-
 #. Used in usage help to represent a TCP port number. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:516
+#: ../duplicity/commandline.py:659
 msgid "port"
 msgstr ""
 
 #. Used in usage help. This represents a string to be used as a
 #. prefix to names for backup files created by Duplicity. Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:521
+#: ../duplicity/commandline.py:664
 msgid "prefix"
 msgstr ""
 
 #. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other.host[:port]/relative_path
-#: ../duplicity/commandline.py:525
+#: ../duplicity/commandline.py:668
 msgid "relative_path"
 msgstr ""
 
-#. Used in usage help. Example:
-#. --timeout <seconds>
-#: ../duplicity/commandline.py:529
-msgid "seconds"
-msgstr ""
-
-#. Used in usage help to represent a "glob" style pattern for
-#. matching one or more files, as described in the documentation.
-#. Example:
-#. --exclude <shell_pattern>
-#: ../duplicity/commandline.py:535
-msgid "shell_pattern"
-msgstr ""
-
 #. Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. Example:
 #. file:///some_dir
-#: ../duplicity/commandline.py:540
+#: ../duplicity/commandline.py:683
 msgid "some_dir"
 msgstr ""
 
@@ -740,14 +773,14 @@
 #. directory or a Unix-style path to a directory where files will be
 #. coming FROM. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:546
+#: ../duplicity/commandline.py:689
 msgid "source_dir"
 msgstr ""
 
 #. Used in usage help to represent a URL files will be coming
 #. FROM. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:551
+#: ../duplicity/commandline.py:694
 msgid "source_url"
 msgstr ""
 
@@ -755,97 +788,64 @@
 #. directory or a Unix-style path to a directory. where files will be
 #. going TO. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:557
+#: ../duplicity/commandline.py:700
 msgid "target_dir"
 msgstr ""
 
 #. Used in usage help to represent a URL files will be going TO.
 #. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:562
+#: ../duplicity/commandline.py:705
 msgid "target_url"
 msgstr ""
 
-#. Used in usage help to represent a time spec for a previous
-#. point in time, as described in the documentation. Example:
-#. duplicity remove-older-than time [options] target_url
-#: ../duplicity/commandline.py:567
-msgid "time"
-msgstr ""
-
 #. Used in usage help to represent a user name (i.e. login).
 #. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:572
+#: ../duplicity/commandline.py:715
 msgid "user"
 msgstr ""
 
-#: ../duplicity/commandline.py:574
-#, python-format
-msgid "duplicity version %s running on %s."
-msgstr ""
-
-#. Header in usage help
-#: ../duplicity/commandline.py:578
-msgid "Usage:"
-msgstr ""
-
-#. Header in usage help
-#: ../duplicity/commandline.py:591
+#. Header in usage help
+#: ../duplicity/commandline.py:731
 msgid "Backends and their URL formats:"
 msgstr ""
 
 #. Header in usage help
-#: ../duplicity/commandline.py:611
+#: ../duplicity/commandline.py:751
 msgid "Commands:"
 msgstr ""
 
-#. Header in usage help
-#: ../duplicity/commandline.py:625
-msgid "Options:"
-msgstr ""
-
-#. In this portion of the usage instructions, "[ewnid]" indicates which
-#. characters are permitted (e, w, n, i, or d); the brackets imply their own
-#. meaning in regex; i.e., only one of the characters is allowed in an instance.
-#: ../duplicity/commandline.py:680
-msgid ""
-"    Verbosity must be one of: digit [0-9], character [ewnid],\n"
-"    or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
-"    The default is 4 (Notice).  It is strongly recommended\n"
-"    that verbosity level is set at 2 (Warning) or higher.\n"
-msgstr ""
-
-#: ../duplicity/commandline.py:706
+#: ../duplicity/commandline.py:774
 #, python-format
 msgid "Specified archive directory '%s' does not exist, or is not a directory"
 msgstr ""
 
-#: ../duplicity/commandline.py:715
+#: ../duplicity/commandline.py:783
 #, python-format
 msgid ""
 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
 "Received '%s' instead."
 msgstr ""
 
-#: ../duplicity/commandline.py:773
+#: ../duplicity/commandline.py:841
 #, python-format
 msgid ""
 "Restore destination directory %s already exists.\n"
 "Will not overwrite."
 msgstr ""
 
-#: ../duplicity/commandline.py:778
+#: ../duplicity/commandline.py:846
 #, python-format
 msgid "Verify directory %s does not exist"
 msgstr ""
 
-#: ../duplicity/commandline.py:784
+#: ../duplicity/commandline.py:852
 #, python-format
 msgid "Backup source directory %s does not exist."
 msgstr ""
 
-#: ../duplicity/commandline.py:859
+#: ../duplicity/commandline.py:927
 #, python-format
 msgid ""
 "Bad URL '%s'.\n"
@@ -853,7 +853,7 @@
 "\"file:///usr/local\".  See the man page for more information."
 msgstr ""
 
-#: ../duplicity/commandline.py:884
+#: ../duplicity/commandline.py:952
 msgid "Main action: "
 msgstr ""