/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: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/ostools.py
21
21
import shutil
22
22
import sys
23
23
 
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
24
 
32
25
def main(argv=None):
33
26
    if argv is None:
48
41
            return 1
49
42
 
50
43
        todir = argv.pop()
51
 
        retcode = makedir(todir)
52
 
        if retcode:
53
 
            return retcode
 
44
        if not os.path.exists(todir):
 
45
            os.makedirs(todir)
 
46
        if not os.path.isdir(todir):
 
47
            print "Error: Destination is not a directory"
 
48
            return 2
54
49
 
55
50
        files = []
56
51
        for possible_glob in argv:
69
64
            return 1
70
65
 
71
66
        todir = argv.pop()
72
 
        retcode = makedir(todir)
73
 
        if retcode:
74
 
            return retcode
 
67
        if not os.path.exists(todir):
 
68
            os.makedirs(todir)
 
69
        if not os.path.isdir(todir):
 
70
            print "Error: Destination is not a directory"
 
71
            return 2
75
72
 
76
73
        files = []
77
74
        for possible_glob in argv:
81
78
            relative_path = src
82
79
            dest = os.path.join(todir, relative_path)
83
80
            dest_dir = os.path.dirname(dest)
84
 
            retcode = makedir(dest_dir)
85
 
            if retcode:
86
 
                return retcode
 
81
            if not os.path.isdir(dest_dir):
 
82
                os.makedirs(dest_dir)
87
83
            shutil.copy(src, dest)
88
84
            print "Copied:", src, "=>", dest
89
85
 
110
106
 
111
107
        return 0
112
108
 
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
109
    print "Usage error"
133
110
    print __doc__
134
111
    return 1