← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-04-26 10:37:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050426103753-e022129bd6afd29b
- New bzr whoami --email option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
26
26
from trace import mutter, note
27
27
from tree import Tree, EmptyTree, RevisionTree, WorkingTree
28
28
from inventory import InventoryEntry, Inventory
29
 
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
 
29
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, chomp, \
30
30
     format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
31
31
     joinpath, sha_string, file_kind, local_time_offset, appendpath
32
32
from store import ImmutableStore
635
635
        >>> ScratchBranch().revision_history()
636
636
        []
637
637
        """
638
 
        return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
 
638
        return [chomp(l) for l in self.controlfile('revision-history', 'r').readlines()]
639
639
 
640
640
 
641
641
    def revno(self):
768
768
 
769
769
 
770
770
    def rename_one(self, from_rel, to_rel):
771
 
        """Rename one file.
772
 
 
773
 
        This can change the directory or the filename or both.
774
 
         """
775
771
        tree = self.working_tree()
776
772
        inv = tree.inventory
777
773
        if not tree.has_filename(from_rel):