/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 bzrlib/weave.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
69
69
from copy import copy
70
70
from cStringIO import StringIO
71
71
import os
 
72
import time
 
73
import warnings
72
74
 
73
75
from bzrlib.lazy_import import lazy_import
74
76
lazy_import(globals(), """
77
79
from bzrlib import (
78
80
    errors,
79
81
    osutils,
 
82
    progress,
80
83
    )
81
84
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
82
85
        RevisionAlreadyPresent,
83
86
        RevisionNotPresent,
84
87
        UnavailableRepresentation,
 
88
        WeaveRevisionAlreadyPresent,
 
89
        WeaveRevisionNotPresent,
85
90
        )
86
91
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
87
92
import bzrlib.patiencediff