/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/branch.py

  • Committer: Martin Pool
  • Date: 2007-08-14 09:44:20 UTC
  • mto: This revision was merged to the branch mainline in revision 2722.
  • Revision ID: mbp@sourcefrog.net-20070814094420-ct7ogmwjoz528i1k
Start setting the default format to dirstate-tags

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
376
376
        """Print `file` to stdout."""
377
377
        raise NotImplementedError(self.print_file)
378
378
 
 
379
    @deprecated_method(zero_ninetyone)
379
380
    def append_revision(self, *revision_ids):
 
381
        """Append the specified revisions to the branch's revision history.
 
382
 
 
383
        Rather than calling this, please use set_last_revision_info(), which
 
384
        takes just the new tip revision.
 
385
        """
380
386
        raise NotImplementedError(self.append_revision)
381
387
 
382
388
    def set_revision_history(self, rev_history):
1265
1271
 
1266
1272
# formats which have no format string are not discoverable
1267
1273
# and not independently creatable, so are not registered.
1268
 
__default_format = BzrBranchFormat6()
1269
 
BranchFormat.register_format(__default_format)
 
1274
__format5 = BzrBranchFormat5()
 
1275
__format6 = BzrBranchFormat6()
 
1276
BranchFormat.register_format(__format5)
1270
1277
BranchFormat.register_format(BranchReferenceFormat())
1271
 
BranchFormat.register_format(BzrBranchFormat5())
1272
 
BranchFormat.set_default_format(__default_format)
 
1278
BranchFormat.register_format(__format6)
 
1279
BranchFormat.set_default_format(__format6)
1273
1280
_legacy_formats = [BzrBranchFormat4(),
1274
1281
                   ]
1275
1282
 
1367
1374
        """See Branch.print_file."""
1368
1375
        return self.repository.print_file(file, revision_id)
1369
1376
 
 
1377
    @deprecated_method(zero_ninetyone)
1370
1378
    @needs_write_lock
1371
1379
    def append_revision(self, *revision_ids):
1372
1380
        """See Branch.append_revision."""
2000
2008
            self._check_history_violation(last_revision)
2001
2009
        self._write_last_revision_info(len(history), last_revision)
2002
2010
 
 
2011
    @deprecated_method(zero_ninetyone)
2003
2012
    @needs_write_lock
2004
2013
    def append_revision(self, *revision_ids):
2005
2014
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]