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

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
    ROOT_ID,
37
37
    )
38
38
from bzrlib.foreign import (
39
 
    ForeignVcs, 
40
 
    VcsMappingRegistry, 
 
39
    ForeignVcs,
 
40
    VcsMappingRegistry,
41
41
    ForeignRevision,
42
42
    )
43
43
from bzrlib.plugins.git.hg import (
88
88
 
89
89
def squash_revision(target_repo, rev):
90
90
    """Remove characters that can't be stored from a revision, if necessary.
91
 
    
 
91
 
92
92
    :param target_repo: Repository in which the revision will be stored
93
93
    :param rev: Revision object, will be modified in-place
94
94
    """
229
229
        if 'author-timezone' in rev.properties:
230
230
            commit.author_timezone = int(rev.properties['author-timezone'])
231
231
        else:
232
 
            commit.author_timezone = commit.commit_timezone 
 
232
            commit.author_timezone = commit.commit_timezone
233
233
        commit.message = self._encode_commit_message(rev, rev.message)
234
234
        return commit
235
235
 
439
439
        cur = ""
440
440
    tree = Tree()
441
441
 
442
 
    # stack contains the set of trees that we haven't 
 
442
    # stack contains the set of trees that we haven't
443
443
    # finished constructing
444
444
    for path, entry in inventory.iter_entries():
445
445
        while stack and not path.startswith(osutils.pathjoin(cur, "")):