← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2010-08-31 08:25:15 UTC
  • mfrom: (5247.7.1 catch-them-all)
  • mto: This revision was merged to the branch mainline in revision 5400.
  • Revision ID: v.ladeuil+lp@free.fr-20100831082515-an9mtdmhalo7xaq0
Merge catch-them-all into more-ignored-exceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1522
1522
     * an open routine.
1523
1523
 
1524
1524
    Formats are placed in an dict by their format string for reference
1525
 
    during branch opening. It's not required that these be instances, they
 
1525
    during branch opening. Its not required that these be instances, they
1526
1526
    can be classes themselves with class methods - it simply depends on
1527
1527
    whether state is needed for a given format or not.
1528
1528
 
1819
1819
            "with a bzrlib.branch.PullResult object and only runs in the "
1820
1820
            "bzr client.", (0, 15), None))
1821
1821
        self.create_hook(HookPoint('pre_commit',
1822
 
            "Called after a commit is calculated but before it is "
 
1822
            "Called after a commit is calculated but before it is is "
1823
1823
            "completed. pre_commit is called with (local, master, old_revno, "
1824
1824
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1825
1825
            "). old_revid is NULL_REVISION for the first commit to a branch, "
3103
3103
    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3104
3104
    """
3105
3105
 
3106
 
    @deprecated_method(deprecated_in((2, 3, 0)))
3107
3106
    def __int__(self):
3108
 
        """Return the relative change in revno.
3109
 
 
3110
 
        :deprecated: Use `new_revno` and `old_revno` instead.
3111
 
        """
 
3107
        # DEPRECATED: pull used to return the change in revno
3112
3108
        return self.new_revno - self.old_revno
3113
3109
 
3114
3110
    def report(self, to_file):
3139
3135
        target, otherwise it will be None.
3140
3136
    """
3141
3137
 
3142
 
    @deprecated_method(deprecated_in((2, 3, 0)))
3143
3138
    def __int__(self):
3144
 
        """Return the relative change in revno.
3145
 
 
3146
 
        :deprecated: Use `new_revno` and `old_revno` instead.
3147
 
        """
 
3139
        # DEPRECATED: push used to return the change in revno
3148
3140
        return self.new_revno - self.old_revno
3149
3141
 
3150
3142
    def report(self, to_file):
3480
3472
                # push into the master from the source branch.
3481
3473
                self.source._basic_push(master_branch, overwrite, stop_revision)
3482
3474
                # and push into the target branch from the source. Note that we
3483
 
                # push from the source branch again, because it's considered the
 
3475
                # push from the source branch again, because its considered the
3484
3476
                # highest bandwidth repository.
3485
3477
                result = self.source._basic_push(self.target, overwrite,
3486
3478
                    stop_revision)