← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1861
1861
            "all are called with the url returned from the previous hook."
1862
1862
            "The order is however undefined.", (1, 9), None))
1863
1863
        self.create_hook(HookPoint('automatic_tag_name',
1864
 
            "Called to determine an automatic tag name for a revision."
 
1864
            "Called to determine an automatic tag name for a revision. "
1865
1865
            "automatic_tag_name is called with (branch, revision_id) and "
1866
1866
            "should return a tag name or None if no tag name could be "
1867
1867
            "determined. The first non-None tag name returned will be used.",
1958
1958
        return self.__dict__ == other.__dict__
1959
1959
 
1960
1960
    def __repr__(self):
1961
 
        if self.branch:
1962
 
            return "<%s of %s>" % (self.__class__.__name__, self.branch)
1963
 
        else:
1964
 
            return "<%s of format:%s bzrdir:%s>" % (
1965
 
                self.__class__.__name__, self.branch,
1966
 
                self.format, self.bzrdir)
 
1961
        return "<%s of %s>" % (self.__class__.__name__, self.branch)
1967
1962
 
1968
1963
 
1969
1964
class SwitchHookParams(object):