← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
794
794
            return None
795
795
 
796
796
        if parent == NULL_ID or parent is None:
797
 
            if to_name != '.':
 
797
            if to_name != u'.':
798
798
                raise SourceRootHasName(self, to_name)
799
799
            else:
800
 
                return '.'
 
800
                return u'.'
801
801
        parent_entry = changeset.entries.get(parent)
802
802
        if parent_entry is None:
803
803
            dir = os.path.dirname(id_map[self.id])
1613
1613
            return None
1614
1614
        directory = self.get_dir(id)
1615
1615
        if directory == '.':
1616
 
            directory = './.'
 
1616
            directory = u'./.'
1617
1617
        if directory is None:
1618
1618
            return NULL_ID
1619
1619
        return self.get_rinventory().get(directory)