/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-control.sh

  • Committer: Vincent Ladeuil
  • Date: 2009-10-06 14:40:37 UTC
  • mto: (4728.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4731.
  • Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
Simplify mutable_tree.has_changes() and update call sites.

* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.

* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.

* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.

* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.

* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().

* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.

* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-control.sh
 
1
#!/bin/bash
 
2
 
 
3
if [ -z "$UBUNTU_RELEASES" ]; then
 
4
    echo "Configure the distro platforms that you want to"
 
5
    echo "build with a line like:"
 
6
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
 
7
    exit 1
 
8
fi
 
9
 
 
10
OLD_VERSION=$1
 
11
NEW_VERSION=$2
 
12
NEXT_VERSION=$3
 
13
if [ -z "$OLD_VERSION" -o -z "$NEW_VERSION" -o -z "$NEXT_VERSION" ]; then
 
14
    echo "Missing version"
 
15
    echo "You want something like:"
 
16
    echo "  update-control.sh 1.5 1.6 1.7"
 
17
    exit
 
18
fi
 
19
 
 
20
if [ "$PACKAGE" = "bzr" ]; then
 
21
    continue
 
22
fi
 
23
for DISTRO in $UBUNTU_RELEASES; do
 
24
    PPAVERSION="$VERSION~${DISTRO}1"
 
25
    (
 
26
        echo "Updating control for $DISTRO"
 
27
        cd "$PACKAGE-$DISTRO" &&
 
28
            sed -i -e "s/$NEW_VERSION~/$NEXT_VERSION~/;s/$OLD_VERSION~/$NEW_VERSION~/" control &&
 
29
            bzr commit -m "New upstream release: $PPAVERSION, update control"
 
30
    )
 
31
done