← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2005-09-12 02:53:07 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050912025307-8c21544e8db1cbdb
added all_descendants and node_distances, exception when root doesn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
92
92
    takes_args = ['revision_id']
93
93
    
94
94
    def run(self, revision_id):
95
 
        b = find_branch('.')
96
 
        sys.stdout.write(b.get_revision_xml_file(revision_id).read())
 
95
        from bzrlib.xml import pack_xml
 
96
        pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
97
97
 
98
98
 
99
99
class cmd_revno(Command):
103
103
    def run(self):
104
104
        print find_branch('.').revno()
105
105
 
106
 
 
107
106
class cmd_revision_info(Command):
108
107
    """Show revision number and revision id for a given revision identifier.
109
108
    """
536
535
    examples:
537
536
        bzr diff
538
537
        bzr diff -r1
539
 
        bzr diff -r1..2
 
538
        bzr diff -r1:2
540
539
    """
541
540
    
542
541
    takes_args = ['file*']
1197
1196
        try:
1198
1197
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1199
1198
        except bzrlib.errors.AmbiguousBase, e:
1200
 
            m = ("sorry, bzr can't determine the right merge base yet\n"
 
1199
            m = ("sorry, bzr can't determine the write merge base yet\n"
1201
1200
                 "candidates are:\n  "
1202
1201
                 + "\n  ".join(e.bases)
1203
1202
                 + "\n"