/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 contrib/upload-bzr.dev

  • 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:
contrib/upload-bzr.dev
 
1
#! /bin/sh -ex
 
2
 
 
3
# example of how to upload a bzr tree using rsync
 
4
 
 
5
# --include-from is used to make sure that only versioned files and
 
6
# control files are copied.  We use includes/excludes rather than
 
7
# --files-from so that we can delete any files from the destination
 
8
# that are no longer present on the source.
 
9
 
 
10
cd ~/work/bzr 
 
11
 
 
12
# note: don't use -a because that can mess up the permissions
 
13
 
 
14
chmod a+rX `bzr inventory`
 
15
 
 
16
bzr inventory | 
 
17
rsync -rltv                                                         \
 
18
    .                                                               \
 
19
    escudero.ubuntu.com:/srv/www.bazaar-ng.org/rsync/bzr/bzr.dev/   \
 
20
    --include .bzr                                                  \
 
21
    --include '.bzr/**'                                             \
 
22
    --exclude-from .rsyncexclude                                    \
 
23
    --exclude-from .bzrignore                                       \
 
24
    --include-from -                                                \
 
25
    --exclude \*                                                    \
 
26
    --exclude '.*'                                                  \
 
27
    --delete-excluded --delete                                      \