← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rename_map.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/rename_map.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
19
from cStringIO import StringIO
19
20
 
23
24
    trace,
24
25
)
25
26
from bzrlib.ui import ui_factory
26
 
 
 
27
from bzrlib.i18n import gettext
27
28
 
28
29
class RenameMap(object):
29
30
    """Determine a mapping of renames."""
65
66
        try:
66
67
            for num, (file_id, contents) in enumerate(
67
68
                tree.iter_files_bytes(desired_files)):
68
 
                task.update('Calculating hashes', num, len(file_ids))
 
69
                task.update(gettext('Calculating hashes'), num, len(file_ids))
69
70
                s = StringIO()
70
71
                s.writelines(contents)
71
72
                s.seek(0)
103
104
        task = ui_factory.nested_progress_bar()
104
105
        try:
105
106
            for num, path in enumerate(paths):
106
 
                task.update('Determining hash hits', num, len(paths))
 
107
                task.update(gettext('Determining hash hits'), num, len(paths))
107
108
                hits = self.hitcounts(self.tree.get_file_lines(None,
108
109
                                                               path=path))
109
110
                all_hits.extend((v, path, k) for k, v in hits.items())
238
239
            pp.next_phase()
239
240
            delta = rn._make_inventory_delta(matches)
240
241
            for old, new, file_id, entry in delta:
241
 
                trace.note("%s => %s", old, new)
 
242
                trace.note( gettext("{0} => {1}").format(old, new) )
242
243
            if not dry_run:
243
244
                tree.add(required_parents)
244
245
                tree.apply_inventory_delta(delta)