← 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 13:48:32 UTC
  • mfrom: (1185.3.4)
  • mto: (1185.1.16)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050912134832-c23db11dc63170b6
Merged from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
62
62
    directory is shown.  Otherwise, only the status of the specified
63
63
    files or directories is reported.  If a directory is given, status
64
64
    is reported for everything inside that directory.
 
65
    """
65
66
 
66
 
    If a revision is specified, the changes since that revision are shown.
67
 
    """
68
67
    takes_args = ['file*']
69
 
    takes_options = ['all', 'show-ids', 'revision']
 
68
    takes_options = ['all', 'show-ids']
70
69
    aliases = ['st', 'stat']
71
70
    
72
71
    def run(self, all=False, show_ids=False, file_list=None):
92
91
    takes_args = ['revision_id']
93
92
    
94
93
    def run(self, revision_id):
95
 
        from bzrlib.xml import pack_xml
96
 
        pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
 
94
        b = find_branch('.')
 
95
        sys.stdout.write(b.get_revision_xml_file(revision_id).read())
97
96
 
98
97
 
99
98
class cmd_revno(Command):
103
102
    def run(self):
104
103
        print find_branch('.').revno()
105
104
 
 
105
 
106
106
class cmd_revision_info(Command):
107
107
    """Show revision number and revision id for a given revision identifier.
108
108
    """
144
144
    Therefore simply saying 'bzr add' will version all files that
145
145
    are currently unknown.
146
146
 
147
 
    TODO: Perhaps adding a file whose directly is not versioned should
148
 
    recursively add that parent, rather than giving an error?
 
147
    Adding a file whose parent directory is not versioned will
 
148
    implicitly add the parent, and so on up to the root. This means
 
149
    you should never need to explictly add a directory, they'll just
 
150
    get added when you add a file in the directory.
149
151
    """
150
152
    takes_args = ['file*']
151
153
    takes_options = ['verbose', 'no-recurse']
535
537
    examples:
536
538
        bzr diff
537
539
        bzr diff -r1
538
 
        bzr diff -r1:2
 
540
        bzr diff -r1..2
539
541
    """
540
542
    
541
543
    takes_args = ['file*']
1196
1198
        try:
1197
1199
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1198
1200
        except bzrlib.errors.AmbiguousBase, e:
1199
 
            m = ("sorry, bzr can't determine the write merge base yet\n"
 
1201
            m = ("sorry, bzr can't determine the right merge base yet\n"
1200
1202
                 "candidates are:\n  "
1201
1203
                 + "\n  ".join(e.bases)
1202
1204
                 + "\n"