...
 
Commits (3)
Subproject commit c1bf766e8c01ee1899259161dc603454fb2ea8f4
Subproject commit db63406a778b2e5896bf4217cdf1aa54f1bd7af6
......@@ -396,16 +396,6 @@ class BusinessTemplateWorkingCopy(BusinessTemplateFolder):
removed_set = set()
prefix_length = len(os.path.join(self.path, ''))
for dirpath, dirnames, filenames in os.walk(self.path):
# Do not remove hidden files and folders.
# This is important as we primarily use ERP5 VCS for Business Templates
# and sometimes they can be in form of git submodule. Removing `.git`
# leads to the case where we want to check from parent repo (i.e. erp5)
# if there is an existence of gitsubmodule and then update it explicitly.
# This ends up taking an extra effort and conflict as the new `.git`
# might have conflicting history depending on when we re-init/udpate
# the submodule
filenames = [f for f in filenames if not f[0] == '.']
dirnames[:] = [d for d in dirnames if not d[0] == '.']
dirpath = dirpath[prefix_length:]
for i in xrange(len(dirnames) - 1, -1, -1):
d = dirnames[i]
......@@ -417,10 +407,17 @@ class BusinessTemplateWorkingCopy(BusinessTemplateFolder):
removed_set.add(d)
del dirnames[i]
for f in filenames:
f = os.path.join(dirpath, f)
if f not in self.file_set:
os.remove(os.path.join(self.path, f))
removed_set.add(f)
# Do not remove hidden files
# This is important as we primarily use ERP5 VCS for Business Templates
# and sometimes they can be in form of git submodule.
# In case of submodule, `.git` is a file pointing to the directory
# in its parent repo <parent_repo>/.git/modules/<submodule>, hence we
# do not want it to be removed
if f[0] != '.':
f = os.path.join(dirpath, f)
if f not in self.file_set:
os.remove(os.path.join(self.path, f))
removed_set.add(f)
return self.file_set, removed_set
class File(object):
......