diff --git a/rebase.py b/rebase.py index e3b6a09..744ef04 100644 --- a/rebase.py +++ b/rebase.py @@ -258,9 +258,6 @@ def getFile(line): actual_versions = self.filter_versions(all_versions, lambda x: x[1] < date) versions = self.checkin_versions(actual_versions) - if not versions: - print("No proper versions of '%s' file. Check if it is empty." % added) - versions = self.empty_file_versions(actual_versions) if not versions: print("It appears that you may be missing a branch in the includes section of your gitcc config for file '%s'." % added) continue @@ -269,19 +266,6 @@ def getFile(line): def checkin_versions(self, versions): return self.filter_versions_by_type(versions, 'checkinversion') - def empty_file_versions(self, versions): - return self.versions_with_branch(versions) or self.versions_without_branch(versions) - - def versions_with_branch(self, versions): - if len(versions) != 5: - return False - return self.filter_versions_by_type(versions, 'mkbranchversion') - - def versions_without_branch(self, versions): - if len(versions) != 3: - return False - return self.filter_versions(versions, lambda x: x[0] == 'mkelemversion') - def filter_versions_by_type(self, versions, type): def f(s): return s[0] == type and filterBranches(s[2], True)