← 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 at utoronto
  • Date: 2005-09-05 07:10:59 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050905071059-63693b49338a914c
Added merge test

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
    """
484
483
            print patchid
485
484
 
486
485
 
487
 
class cmd_ancestry(Command):
488
 
    """List all revisions merged into this branch."""
489
 
    hidden = True
490
 
    def run(self):
491
 
        b = find_branch('.')
492
 
        for revision_id in b.get_ancestry(b.last_patch()):
493
 
            print revision_id
494
 
 
495
 
 
496
486
class cmd_directories(Command):
497
487
    """Display list of versioned directories in this branch."""
498
488
    def run(self):
955
945
    aliases = ['ci', 'checkin']
956
946
 
957
947
    # TODO: Give better message for -s, --summary, used by tla people
958
 
 
959
 
    # XXX: verbose currently does nothing
960
948
    
961
949
    def run(self, message=None, file=None, verbose=True, selected_list=None,
962
950
            unchanged=False):
986
974
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
987
975
 
988
976
        try:
989
 
            b.commit(message,
 
977
            b.commit(message, verbose=verbose,
990
978
                     specific_files=selected_list,
991
979
                     allow_pointless=unchanged)
992
980
        except PointlessCommit:
1208
1196
        try:
1209
1197
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1210
1198
        except bzrlib.errors.AmbiguousBase, e:
1211
 
            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"
1212
1200
                 "candidates are:\n  "
1213
1201
                 + "\n  ".join(e.bases)
1214
1202
                 + "\n"