~bzr-pqm/bzr/bzr.dev : revision 828

24

25

NULL_ID = "!NULL"

26

27

class OldFailedTreeOp(Exception):

28

def __init__(self):

29

Exception.__init__(self, "bzr-tree-change contains files from a"

30

" previous failed merge operation.")

27

31

28

def invert_dict(dict):

32

29

newdict = {}

33

30

for (key,value) in dict.iteritems():

829

826

my_sort(target_entries, shortest_to_longest)

830

827

return (source_entries, target_entries)

831

828

832

def rename_to_temp_delete(source_entries, inventory, dir, temp_dir,

833

conflict_handler, reverse):

829

def rename_to_temp_delete(source_entries, inventory, dir, conflict_handler,

830

reverse):

834

831

"""Delete and rename entries as appropriate. Entries are renamed to temp

835

names. A map of id -> temp name (or None, for deletions) is returned.

832

names. A map of id -> temp name is returned.

836

833

837

834

:param source_entries: The entries to rename and delete

838

835

:type source_entries: List of `ChangesetEntry`

845

842

:return: a mapping of id to temporary name

846

843

:rtype: Dictionary

847

844

"""

845

temp_dir = os.path.join(dir, "temp")

848

846

temp_name = {}

849

847

for i in range(len(source_entries)):

850

848

entry = source_entries[i]

851

849

if entry.is_deletion(reverse):

852

850

path = os.path.join(dir, inventory[entry.id])

853

851

entry.apply(path, conflict_handler, reverse)

854

temp_name[entry.id] = None

855

852

856

853

else:

857

to_name = os.path.join(temp_dir, str(i))

854

to_name = temp_dir+"/"+str(i)

858

855

src_path = inventory.get(entry.id)

859

856

if src_path is not None:

860

857

src_path = os.path.join(dir, src_path)

870

867

return temp_name

871

868

872

869

873

def rename_to_new_create(changed_inventory, target_entries, inventory,

874

changeset, dir, conflict_handler, reverse):

870

def rename_to_new_create(temp_name, target_entries, inventory, changeset, dir,

871

conflict_handler, reverse):

875

872

"""Rename entries with temp names to their final names, create new files.

876

873

877

:param changed_inventory: A mapping of id to temporary name

878

:type changed_inventory: Dictionary

874

:param temp_name: A mapping of id to temporary name

875

:type temp_name: Dictionary

879

876

:param target_entries: The entries to apply changes to

880

877

:type target_entries: List of `ChangesetEntry`

881

878

:param changeset: The changeset to apply

886

883

:type reverse: bool

887

884

"""

888

885

for entry in target_entries:

889

new_tree_path = entry.get_new_path(inventory, changeset, reverse)

890

if new_tree_path is None:

886

new_path = entry.get_new_path(inventory, changeset, reverse)

887

if new_path is None:

891

888

continue

892

new_path = os.path.join(dir, new_tree_path)

893

old_path = changed_inventory.get(entry.id)

889

new_path = os.path.join(dir, new_path)

890

old_path = temp_name.get(entry.id)

894

891

if os.path.exists(new_path):

895

892

if conflict_handler.target_exists(entry, new_path, old_path) == \

896

893

"skip":

897

894

continue

898

895

if entry.is_creation(reverse):

899

896

entry.apply(new_path, conflict_handler, reverse)

900

changed_inventory[entry.id] = new_tree_path

901

897

else:

902

898

if old_path is None:

903

899

continue

904

900

try:

905

901

os.rename(old_path, new_path)

906

changed_inventory[entry.id] = new_tree_path

907

902

except OSError, e:

908

903

raise Exception ("%s is missing" % new_path)

909

904

1011

1006

Exception.__init__(self, msg)

1012

1007

self.filename = filename

1013

1008

1014

class NewContentsConflict(Exception):

1015

def __init__(self, filename):

1016

msg = "Conflicting contents for new file %s" % (filename)

1017

Exception.__init__(self, msg)

1018

1019

1020

class MissingForMerge(Exception):

1021

def __init__(self, filename):

1022

msg = "The file %s was modified, but does not exist in this tree"\

1023

% (filename)

1024

Exception.__init__(self, msg)

1025

1026

1027

1009

class ExceptionConflictHandler(object):

1028

1010

def __init__(self, dir):

1029

1011

self.dir = dir

1084

1066

def missing_for_rename(self, filename):

1085

1067

raise MissingForRename(filename)

1086

1068

1087

def missing_for_merge(self, file_id, inventory):

1088

raise MissingForMerge(inventory.other.get_path(file_id))

1089

1090

def new_contents_conflict(self, filename, other_contents):

1091

raise NewContentsConflict(filename)

1092

1093

1069

def finalize():

1094

1070

pass

1095

1071

1110

1086

"""

1111

1087

if conflict_handler is None:

1112

1088

conflict_handler = ExceptionConflictHandler(dir)

1113

temp_dir = os.path.join(dir, "bzr-tree-change")

1114

try:

1115

os.mkdir(temp_dir)

1116

except OSError, e:

1117

if e.errno == errno.EEXIST:

1118

try:

1119

os.rmdir(temp_dir)

1120

except OSError, e:

1121

if e.errno == errno.ENOTEMPTY:

1122

raise OldFailedTreeOp()

1123

os.mkdir(temp_dir)

1124

else:

1125

raise

1089

temp_dir = dir+"/temp"

1090

os.mkdir(temp_dir)

1126

1091

1127

1092

#apply changes that don't affect filenames

1128

1093

for entry in changeset.entries.itervalues():

1137

1102

(source_entries, target_entries) = get_rename_entries(changeset, inventory,

1138

1103

reverse)

1139

1104

1140

changed_inventory = rename_to_temp_delete(source_entries, inventory, dir,

1141

temp_dir, conflict_handler,

1142

reverse)

1105

temp_name = rename_to_temp_delete(source_entries, inventory, dir,

1106

conflict_handler, reverse)

1143

1107

1144

rename_to_new_create(changed_inventory, target_entries, inventory,

1145

changeset, dir, conflict_handler, reverse)

1108

rename_to_new_create(temp_name, target_entries, inventory, changeset, dir,

1109

conflict_handler, reverse)

1146

1110

os.rmdir(temp_dir)

1147

return changed_inventory

1111

r_inventory = invert_dict(inventory)

1112

new_entries, removed_entries = get_inventory_change(inventory,

1113

r_inventory, changeset, reverse)

1114

new_inventory = {}

1115

for path, file_id in new_entries.iteritems():

1116

new_inventory[file_id] = path

1117

for file_id in removed_entries:

1118

new_inventory[file_id] = None

1119

return new_inventory

1148

1120

1149

1121

1150

1122

def apply_changeset_tree(cset, tree, reverse=False):

1161

1133

def get_inventory_change(inventory, new_inventory, cset, reverse=False):

1162

1134

new_entries = {}

1163

1135

remove_entries = []

1136

r_inventory = invert_dict(inventory)

1137

r_new_inventory = invert_dict(new_inventory)

1164

1138

for entry in cset.entries.itervalues():

1165

1139

if entry.needs_rename():

1166

new_path = entry.get_new_path(inventory, cset)

1167

if new_path is None:

1168

remove_entries.append(entry.id)

1140

old_path = r_inventory.get(entry.id)

1141

if old_path is not None:

1142

remove_entries.append(old_path)

1169

1143

else:

1170

new_entries[new_path] = entry.id

1144

new_path = entry.get_new_path(inventory, cset)

1145

if new_path is not None:

1146

new_entries[new_path] = entry.id

1171

1147

return new_entries, remove_entries

1172

1148

1173

1149

1541

1517

return self.inventory.get(id)

1542

1518

1543

1519

def get_name(self, id):

1544

path = self.get_path(id)

1545

if path is None:

1546

return None

1547

else:

1548

return os.path.basename(path)

1520

return os.path.basename(self.get_path(id))

1549

1521

1550

1522

def get_dir(self, id):

1551

1523

path = self.get_path(id)

1552

1524

if path == "":

1553

1525

return None

1554

if path is None:

1555

return None

1556

1526

return os.path.dirname(path)

1557

1527

1558

1528

def get_parent(self, id):

1559

if self.get_path(id) is None:

1560

return None

1561

1529

directory = self.get_dir(id)

1562

1530

if directory == '.':

1563

1531

directory = './.'