/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 bzrlib/workingtree.py

  • Committer: Steffen Eichenberg
  • Date: 2006-11-07 15:09:00 UTC
  • mto: (2206.1.1 bzr.enhanced_move)
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: scameronde@googlemail.com-20061107150900-80887acd23f7b691
fixed the most obvious bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1063
1063
            from_entry = inv[from_id]
1064
1064
            from_parent_id = from_entry.parent_id
1065
1065
            to_rel = pathjoin(to_dir, from_tail)
1066
 
            rename_entry = _RenameEntry(from_rel=from_rel, from_id=from_id,
1067
 
                                        from_tail=from_tail,
1068
 
                                        from_parent_id=from_parent_id,
1069
 
                                        to_rel=to_rel, to_tail=to_tail,
1070
 
                                        to_parent_id=to_parent_id)
 
1066
            rename_entry = WorkingTree._RenameEntry(from_rel=from_rel, 
 
1067
                                         from_id=from_id,
 
1068
                                         from_tail=from_tail,
 
1069
                                         from_parent_id=from_parent_id,
 
1070
                                         to_rel=to_rel, to_tail=from_tail,
 
1071
                                         to_parent_id=to_dir_id)
1071
1072
            rename_entries.append(rename_entry)
1072
1073
            rename_tuples.append((from_rel, to_rel))
1073
1074
 
1225
1226
        from_parent_id = from_entry.parent_id
1226
1227
        to_dir, to_tail = os.path.split(to_rel)
1227
1228
        to_dir_id = inv.path2id(to_dir)
1228
 
        rename_entry = _RenameEntry(from_rel=from_rel, from_id=from_id,
1229
 
                                    from_tail=from_tail,
1230
 
                                    from_parent_id=from_parent_id,
1231
 
                                    to_rel=to_rel, to_tail=to_tail,
1232
 
                                    to_parent_id=to_parent_id)
 
1229
        rename_entry = WorkingTree._RenameEntry(from_rel=from_rel, 
 
1230
                                     from_id=from_id,
 
1231
                                     from_tail=from_tail,
 
1232
                                     from_parent_id=from_parent_id,
 
1233
                                     to_rel=to_rel, to_tail=to_tail,
 
1234
                                     to_parent_id=to_dir_id)
1233
1235
        rename_entries.append(rename_entry)
1234
1236
 
1235
1237
        # determine which move mode to use. checks also for movability
1254
1256
        self._write_inventory(inv)
1255
1257
 
1256
1258
    class _RenameEntry(object):
1257
 
        def _init_(self, from_rel, from_id, from_tail, from_parent_id,
1258
 
                   to_rel, to_tail, to_parent_id):
 
1259
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
 
1260
                     to_rel, to_tail, to_parent_id):
1259
1261
            self.from_rel = from_rel
1260
1262
            self.from_id = from_id
1261
1263
            self.from_tail = from_tail