/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: 2008-12-10 09:33:06 UTC
  • mto: (3941.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3942.
  • Revision ID: v.ladeuil+lp@free.fr-20081210093306-j4l1wiesc76519fy
Make the filter work for paths and file ids.

* bzrlib/tests/test_delta.py:
(TestDeltaShow): Fix failing tests, the previous commit was wrong.
(TestDeltaShow._get_delta): Baah, fix status outputs.
(TestDeltaShow.test_delta_show_short_status_single_file_id_filter):
Test for file id filter.

* bzrlib/delta.py:
(TreeDelta): Rename path_filter to filter and pass it the file id
too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-packaging-branches.sh
4
4
if [ -z "$UBUNTU_RELEASES" ]; then
5
5
    echo "Configure the distro platforms that you want to"
6
6
    echo "build with a line like:"
7
 
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
 
7
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid"'
8
8
    exit 1
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