← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-20 14:28:59 UTC
  • mfrom: (2625.6.3 bzr.email_message)
  • mto: This revision was merged to the branch mainline in revision 2640.
  • Revision ID: john@arbash-meinel.com-20070720142859-a24s0khul0yw91bh
(Adeodato Simó) EmailMessage class, allowing much nicer access to Email object than stdlib

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
34
34
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
35
35
                            delete_any)
36
36
from bzrlib.progress import DummyProgress, ProgressPhase
37
 
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen
 
37
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen, \
 
38
        zero_nineteen
38
39
from bzrlib.trace import mutter, warning
39
40
from bzrlib import tree
40
41
import bzrlib.ui
1424
1425
        working_tree.unlock()
1425
1426
 
1426
1427
 
 
1428
@deprecated_function(zero_nineteen)
1427
1429
def change_entry(tt, file_id, working_tree, target_tree, 
1428
1430
                 trans_id_file_id, backups, trans_id, by_parent):
1429
1431
    """Replace a file_id's contents with those from a target tree."""
 
1432
    if file_id is None and target_tree is None:
 
1433
        # skip the logic altogether in the deprecation test
 
1434
        return
1430
1435
    e_trans_id = trans_id_file_id(file_id)
1431
1436
    entry = target_tree.inventory[file_id]
1432
1437
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry,