← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
25
25
        bzrdir,
26
26
        cache_utf8,
27
27
        config as _mod_config,
 
28
        controldir,
28
29
        debug,
29
30
        errors,
30
31
        lockdir,
64
65
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
65
66
 
66
67
 
67
 
class Branch(bzrdir.ControlComponent):
 
68
class Branch(controldir.ControlComponent):
68
69
    """Branch holding a history of revisions.
69
70
 
70
71
    :ivar base:
3102
3103
    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3103
3104
    """
3104
3105
 
 
3106
    @deprecated_method(deprecated_in((2, 3, 0)))
3105
3107
    def __int__(self):
3106
 
        # DEPRECATED: pull used to return the change in revno
 
3108
        """Return the relative change in revno.
 
3109
 
 
3110
        :deprecated: Use `new_revno` and `old_revno` instead.
 
3111
        """
3107
3112
        return self.new_revno - self.old_revno
3108
3113
 
3109
3114
    def report(self, to_file):
3134
3139
        target, otherwise it will be None.
3135
3140
    """
3136
3141
 
 
3142
    @deprecated_method(deprecated_in((2, 3, 0)))
3137
3143
    def __int__(self):
3138
 
        # DEPRECATED: push used to return the change in revno
 
3144
        """Return the relative change in revno.
 
3145
 
 
3146
        :deprecated: Use `new_revno` and `old_revno` instead.
 
3147
        """
3139
3148
        return self.new_revno - self.old_revno
3140
3149
 
3141
3150
    def report(self, to_file):