andialbrecht / hgsvn / changeset / 79ede2c76304

@@ -75,8 +75,7 @@ def main():
     if options.local_only:
         target_svn_url = os.path.abspath(target_svn_url)
         local_repo = target_svn_url
 #    else:
 #        target_svn_url = actual_svn_url
     # e.g. u'/branches/xmpp-subprotocols-2178-2'
     svn_path = actual_svn_url[len(repos_url):]
     # e.g. 'xmpp-subprotocols-2178-2'
@@ -99,6 +98,12 @@ def main():
             nlocal_repo = os.path.abspath(local_repo)
             print "%s must be a SVN checkout for --local-only" % nlocal_repo
             sys.exit(1)
         elif options.local_only and is_svn_dir:
             status = get_svn_status(local_repo, quiet=True)
             if status:
                 print ("There are uncommitted changes. Either commit them or put "
                        "them aside before running hgimportsvn.")
                 sys.exit(1)
     else:
         os.mkdir(local_repo)
     fixup_hgsvn_dir(local_repo)

@@ -23,7 +23,7 @@ except ImportError:
 svn_log_args = ['log', '--xml', '-v']
 svn_info_args = ['info', '--xml']
 svn_checkout_args = ['checkout', '-q']
-svn_status_args = ['status', '--xml', '-v', '--ignore-externals']
+svn_status_args = ['status', '--xml', '--ignore-externals']
 _identity_table = "".join(map(chr, range(256)))
 _forbidden_xml_chars = "".join(
@@ -174,13 +174,17 @@ def run_svn_log(svn_url_or_wc, rev_start
     xml_string = run_svn(svn_log_args + args)
     return parse_svn_log_xml(xml_string)
-def get_svn_status(svn_wc):
+def get_svn_status(svn_wc, quiet=False):
     """
     Get SVN status information about the given working copy.
     """
     # Ensure proper stripping by canonicalizing the path
     svn_wc = os.path.abspath(svn_wc)
     args = [svn_wc]
     if quiet:
         args += ['-q']
     else:
         args += ['-v']
     xml_string = run_svn(svn_status_args + args)
     return parse_svn_status_xml(xml_string, svn_wc)