/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2008-07-01 03:38:35 UTC
  • mfrom: (3514 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3515.
  • Revision ID: robertc@robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
Merge bzr.dev, fixing minor skew.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
134
134
    
135
135
    Note that --short or -S gives status flags for each item, similar
136
136
    to Subversion's status command. To get output similar to svn -q,
137
 
    use bzr -SV.
 
137
    use bzr status -SV.
138
138
 
139
139
    If no arguments are specified, the status of the entire working
140
140
    directory is shown.  Otherwise, only the status of the specified
2200
2200
                raise errors.BzrCommandError("%r is not present in revision %s"
2201
2201
                                                % (filename, revision_id))
2202
2202
            else:
2203
 
                rev_tree.print_file(old_file_id)
 
2203
                content = rev_tree.get_file_text(old_file_id)
2204
2204
        elif cur_file_id is not None:
2205
 
            rev_tree.print_file(cur_file_id)
 
2205
            content = rev_tree.get_file_text(cur_file_id)
2206
2206
        elif old_file_id is not None:
2207
 
            rev_tree.print_file(old_file_id)
 
2207
            content = rev_tree.get_file_text(old_file_id)
2208
2208
        else:
2209
2209
            raise errors.BzrCommandError("%r is not present in revision %s" %
2210
2210
                                         (filename, revision_id))
 
2211
        self.outf.write(content)
2211
2212
 
2212
2213
 
2213
2214
class cmd_local_time_offset(Command):
3355
3356
        shellcomplete.shellcomplete(context)
3356
3357
 
3357
3358
 
3358
 
class cmd_fetch(Command):
3359
 
    """Copy in history from another branch but don't merge it.
3360
 
 
3361
 
    This is an internal method used for pull and merge.
3362
 
    """
3363
 
    hidden = True
3364
 
    takes_args = ['from_branch', 'to_branch']
3365
 
    def run(self, from_branch, to_branch):
3366
 
        from bzrlib.fetch import Fetcher
3367
 
        from_b = Branch.open(from_branch)
3368
 
        to_b = Branch.open(to_branch)
3369
 
        Fetcher(to_b, from_b)
3370
 
 
3371
 
 
3372
3359
class cmd_missing(Command):
3373
3360
    """Show unmerged/unpulled revisions between two branches.
3374
3361