← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:15:02 UTC
  • mfrom: (1092.2.28)
  • Revision ID: robertc@robertcollins.net-20051003011502-f579a509a136b774
merge from baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
70
70
    # relative to a revision, or between revisions
71
71
 
72
72
    takes_args = ['file*']
73
 
    takes_options = ['all', 'show-ids', 'revision']
 
73
    takes_options = ['all', 'show-ids']
74
74
    aliases = ['st', 'stat']
75
75
    
76
76
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
556
556
        bzr commit -m 'imported project'
557
557
    """
558
558
    def run(self):
559
 
        from bzrlib.branch import Branch
560
559
        Branch.initialize('.')
561
560
 
562
561
 
1247
1246
                if None in revision:
1248
1247
                    raise BzrCommandError(
1249
1248
                        "Merge doesn't permit that revision specifier.")
1250
 
                from bzrlib.branch import Branch
1251
1249
                b = Branch.open(branch)
1252
1250
 
1253
1251
                base = [branch, revision[0].in_history(b).revno]
1278
1276
 
1279
1277
    def run(self, revision=None, no_backup=False, file_list=None):
1280
1278
        from bzrlib.merge import merge
1281
 
        from bzrlib.branch import Branch
1282
1279
        from bzrlib.commands import parse_spec
1283
1280
 
1284
1281
        if file_list is not None: