← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
42
42
    ui,
43
43
    urlutils,
44
44
    )
45
 
from bzrlib.i18n import gettext
46
45
""")
47
46
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
48
47
                           ReusingTransform, CantMoveRoot,
1727
1726
        child_pb = ui.ui_factory.nested_progress_bar()
1728
1727
        try:
1729
1728
            if precomputed_delta is None:
1730
 
                child_pb.update(gettext('Apply phase'), 0, 2)
 
1729
                child_pb.update('Apply phase', 0, 2)
1731
1730
                inventory_delta = self._generate_inventory_delta()
1732
1731
                offset = 1
1733
1732
            else:
1738
1737
            else:
1739
1738
                mover = _mover
1740
1739
            try:
1741
 
                child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
 
1740
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
1742
1741
                self._apply_removals(mover)
1743
 
                child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
 
1742
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
1744
1743
                modified_paths = self._apply_insertions(mover)
1745
1744
            except:
1746
1745
                mover.rollback()
1766
1765
        try:
1767
1766
            for num, trans_id in enumerate(self._removed_id):
1768
1767
                if (num % 10) == 0:
1769
 
                    child_pb.update(gettext('removing file'), num, total_entries)
 
1768
                    child_pb.update('removing file', num, total_entries)
1770
1769
                if trans_id == self._new_root:
1771
1770
                    file_id = self._tree.get_root_id()
1772
1771
                else:
1784
1783
            final_kinds = {}
1785
1784
            for num, (path, trans_id) in enumerate(new_paths):
1786
1785
                if (num % 10) == 0:
1787
 
                    child_pb.update(gettext('adding file'),
 
1786
                    child_pb.update('adding file',
1788
1787
                                    num + len(self._removed_id), total_entries)
1789
1788
                file_id = new_path_file_ids[trans_id]
1790
1789
                if file_id is None:
1834
1833
                # do not attempt to move root into a subdirectory of itself.
1835
1834
                if path == '':
1836
1835
                    continue
1837
 
                child_pb.update(gettext('removing file'), num, len(tree_paths))
 
1836
                child_pb.update('removing file', num, len(tree_paths))
1838
1837
                full_path = self._tree.abspath(path)
1839
1838
                if trans_id in self._removed_contents:
1840
1839
                    delete_path = os.path.join(self._deletiondir, trans_id)
1869
1868
        try:
1870
1869
            for num, (path, trans_id) in enumerate(new_paths):
1871
1870
                if (num % 10) == 0:
1872
 
                    child_pb.update(gettext('adding file'), num, len(new_paths))
 
1871
                    child_pb.update('adding file', num, len(new_paths))
1873
1872
                full_path = self._tree.abspath(path)
1874
1873
                if trans_id in self._needs_rename:
1875
1874
                    try:
2584
2583
                    existing_files.update(f[0] for f in files)
2585
2584
            for num, (tree_path, entry) in \
2586
2585
                enumerate(tree.inventory.iter_entries_by_dir()):
2587
 
                pb.update(gettext("Building tree"), num - len(deferred_contents), total)
 
2586
                pb.update("Building tree", num - len(deferred_contents), total)
2588
2587
                if entry.parent_id is None:
2589
2588
                    continue
2590
2589
                reparent = False
2674
2673
                new_desired_files.append((file_id,
2675
2674
                    (trans_id, tree_path, text_sha1)))
2676
2675
                continue
2677
 
            pb.update(gettext('Adding file contents'), count + offset, total)
 
2676
            pb.update('Adding file contents', count + offset, total)
2678
2677
            if hardlink:
2679
2678
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2680
2679
                                   trans_id)
2701
2700
            contents = filtered_output_bytes(contents, filters,
2702
2701
                ContentFilterContext(tree_path, tree))
2703
2702
        tt.create_file(contents, trans_id, sha1=text_sha1)
2704
 
        pb.update(gettext('Adding file contents'), count + offset, total)
 
2703
        pb.update('Adding file contents', count + offset, total)
2705
2704
 
2706
2705
 
2707
2706
def _reparent_children(tt, old_parent, new_parent):
3048
3047
    pb = ui.ui_factory.nested_progress_bar()
3049
3048
    try:
3050
3049
        for n in range(10):
3051
 
            pb.update(gettext('Resolution pass'), n+1, 10)
 
3050
            pb.update('Resolution pass', n+1, 10)
3052
3051
            conflicts = tt.find_conflicts()
3053
3052
            if len(conflicts) == 0:
3054
3053
                return new_conflicts