← Back to branch summary

~ubuntu-branches/ubuntu/natty/pysvn/natty

« back to all changes in this revision

Viewing changes to Source/pysvn_client_cmd_copy.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2009-02-23 20:08:08 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20090223200808-t946skprxzf6vjqx
Tags: 1.6.3-0ubuntu1
New upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/pysvn_client_cmd_copy.cpp
1
1
//
2
2
// ====================================================================
3
 
// Copyright (c) 2003-2008 Barry A Scott.  All rights reserved.
 
3
// Copyright (c) 2003-2009 Barry A Scott.  All rights reserved.
4
4
//
5
5
// This software is licensed as described in the file LICENSE.txt,
6
6
// which you should have received as part of this distribution.
62
62
 
63
63
            type_error_message = "expecting string for 1st tuple value in sources list";
64
64
            Py::String py_src_url_or_path( tuple_src_rev_pegrev[0] );
65
 
            if( py_src_url_or_path.isUnicode() )
66
 
            {
67
 
                Py::String utf8( py_src_url_or_path.encode( name_utf8 ) );
68
 
                src_url_or_path = py_src_url_or_path.as_std_string();
69
 
            }
70
 
            else
71
 
            {
72
 
                src_url_or_path = py_src_url_or_path.as_std_string();
73
 
            }
 
65
            src_url_or_path = py_src_url_or_path.as_std_string( name_utf8 );
74
66
            std::string norm_src_url_or_path( svnNormalisedIfPath( src_url_or_path, pool ) );
75
67
            bool is_url = is_svn_url( norm_src_url_or_path );
76
68
 
323
315
            Py::String py_src_url_or_path( list_all_sources[ index ] );
324
316
 
325
317
            std::string src_url_or_path;
326
 
            if( py_src_url_or_path.isUnicode() )
327
 
            {
328
 
                Py::String utf8( py_src_url_or_path.encode( name_utf8 ) );
329
 
                src_url_or_path = py_src_url_or_path.as_std_string();
330
 
            }
331
 
            else
332
 
            {
333
 
                src_url_or_path = py_src_url_or_path.as_std_string();
334
 
            }
335
 
 
 
318
            src_url_or_path = py_src_url_or_path.as_std_string( name_utf8 );
336
319
            std::string norm_src_url_or_path( svnNormalisedIfPath( src_url_or_path, pool ) );
337
320
 
338
321
            const char *src_path_copy = apr_pstrdup( pool, norm_src_url_or_path.c_str() );