← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/util/_bencode_py.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-22 14:18:17 UTC
  • mto: (5190.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100422141817-izoao20264ivkauo
Explain that the uncommitted changes are not processed when
issuing the warning.

* bzrlib/mutabletree.py:
(MutableTree.check_changed_or_out_of_date): Use diferent 'more'
arguments depending on whether we issue a warning or an error.

* bzrlib/send.py:
(send): Add the more_warnings argument when calling
check_changed_or_out_of_date.

* bzrlib/foreign.py:
(cmd_dpush.run): Add the more_warnings argument when calling
check_changed_or_out_of_date.

* bzrlib/builtins.py:
(cmd_push.run): Add the more_warnings argument when calling
check_changed_or_out_of_date.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/_bencode_py.py
86
86
        return (r, f + 1)
87
87
 
88
88
    def bdecode(self, x):
 
89
        if type(x) != str:
 
90
            raise TypeError
89
91
        try:
90
92
            r, l = self.decode_func[x[0]](x, 0)
91
93
        except (IndexError, KeyError):
152
154
        encode_int(int(x), r)
153
155
    encode_func[BooleanType] = encode_bool
154
156
 
 
157
from bzrlib._static_tuple_py import StaticTuple
 
158
encode_func[StaticTuple] = encode_list
 
159
try:
 
160
    from bzrlib._static_tuple_c import StaticTuple
 
161
except ImportError:
 
162
    pass
 
163
else:
 
164
    encode_func[StaticTuple] = encode_list
 
165
 
155
166
 
156
167
def bencode(x):
157
168
    r = []