/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/win32/ostools.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/ostools.py
9
9
    ostools.py copytodir FILES... DIR
10
10
                    copy files to specified directory
11
11
 
12
 
    ostools.py copytree FILES... DIR
13
 
                    copy files to specified directory keeping relative paths
14
 
 
15
12
    ostools.py remove [FILES...] [DIRS...]
16
13
                    remove files or directories (recursive)
17
14
"""
21
18
import shutil
22
19
import sys
23
20
 
24
 
def makedir(dirname):
25
 
    if not os.path.exists(dirname):
26
 
        os.makedirs(dirname)
27
 
    if not os.path.isdir(dirname):
28
 
        print "Error: Destination is not a directory", dirname
29
 
        return 2
30
 
    return 0
31
21
 
32
22
def main(argv=None):
33
23
    if argv is None:
48
38
            return 1
49
39
 
50
40
        todir = argv.pop()
51
 
        retcode = makedir(todir)
52
 
        if retcode:
53
 
            return retcode
 
41
        if not os.path.exists(todir):
 
42
            os.makedirs(todir)
 
43
        if not os.path.isdir(todir):
 
44
            print "Error: Destination is not a directory"
 
45
            return 2
54
46
 
55
47
        files = []
56
48
        for possible_glob in argv:
63
55
 
64
56
        return 0
65
57
 
66
 
    if cmd == 'copytree':
67
 
        if len(argv) < 2:
68
 
            print "Usage:  ostools.py copytree FILES... DIR"
69
 
            return 1
70
 
 
71
 
        todir = argv.pop()
72
 
        retcode = makedir(todir)
73
 
        if retcode:
74
 
            return retcode
75
 
 
76
 
        files = []
77
 
        for possible_glob in argv:
78
 
            files += glob.glob(possible_glob)
79
 
 
80
 
        for src in files:
81
 
            relative_path = src
82
 
            dest = os.path.join(todir, relative_path)
83
 
            dest_dir = os.path.dirname(dest)
84
 
            retcode = makedir(dest_dir)
85
 
            if retcode:
86
 
                return retcode
87
 
            shutil.copy(src, dest)
88
 
            print "Copied:", src, "=>", dest
89
 
 
90
 
        return 0
91
 
 
92
58
    if cmd == 'remove':
93
59
        if len(argv) == 0:
94
60
            print "Usage:  ostools.py remove [FILES...] [DIRS...]"
110
76
 
111
77
        return 0
112
78
 
113
 
    if cmd == "basename":
114
 
        if len(argv) == 0:
115
 
            print "Usage:  ostools.py basename [PATH | URL]"
116
 
            return 1
117
 
 
118
 
        for path in argv:
119
 
            print os.path.basename(path)
120
 
        return 0
121
 
 
122
 
    if cmd == 'makedir':
123
 
        if len(argv) == 0:
124
 
            print "Usage:  ostools.py makedir DIR"
125
 
            return 1
126
 
 
127
 
        retcode = makedir(argv.pop())
128
 
        if retcode:
129
 
            return retcode
130
 
        return 0
131
 
 
132
79
    print "Usage error"
133
80
    print __doc__
134
81
    return 1