/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/packaging/update-packaging-branches.sh

  • 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/packaging/update-packaging-branches.sh
9
9
fi
10
10
 
11
11
for DISTRO in $UBUNTU_RELEASES; do
12
 
    if [ -d "$PACKAGE-$DISTRO" ] ; then
13
 
        echo "Updating $PACKAGE-$DISTRO"
14
 
        bzr update $PACKAGE-$DISTRO
15
 
        if [ "$PACKAGE" = "bzr-svn" ] ; then
16
 
            cd $PACKAGE-$DISTRO
17
 
            bzr merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
18
 
            cd ..
19
 
        fi
 
12
    if [ -d "packaging-$DISTRO" ] ; then
 
13
        echo "Updating packaging-$DISTRO"
 
14
        bzr update packaging-$DISTRO
20
15
    else
21
 
        SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
22
 
        if [ "$PACKAGE" = "bzr-svn" ] ; then
23
 
            SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
24
 
        fi
25
 
        echo "Checking out $SRC"
26
 
        bzr co $SRC $PACKAGE-$DISTRO
 
16
        echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
 
17
        bzr co lp:~bzr/bzr/packaging-$DISTRO
27
18
    fi
28
19
done
 
20