← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-06-15 05:36:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060615053634-4fd52ba691855659
Clean up many exception classes.

Errors indicating a user error are now shown with is_user_error on the
exception; use this rather than hardcoding a list of exceptions that should be
handled this way.

Exceptions now inherit from BzrNewException where possible to use consistent
formatting method.

Remove rather obsolete docstring test on Branch.missing_revisions.

Remove dead code from find_merge_base.


Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1937
1937
        base_rev_id = common_ancestor(last1, last2, source)
1938
1938
 
1939
1939
        print 'merge base is revision %s' % base_rev_id
1940
 
        
1941
 
        return
1942
 
 
1943
 
        if base_revno is None:
1944
 
            raise bzrlib.errors.UnrelatedBranches()
1945
 
 
1946
 
        print ' r%-6d in %s' % (base_revno, branch)
1947
 
 
1948
 
        other_revno = branch2.revision_id_to_revno(base_revid)
1949
 
        
1950
 
        print ' r%-6d in %s' % (other_revno, other)
1951
 
 
1952
1940
 
1953
1941
 
1954
1942
class cmd_merge(Command):