def _applyChangeset(self, changeset): from os.path import join, exists, split from os import listdir from shutil import rmtree from time import sleep from vcpx.repository.cvs import CvsEntries, compare_cvs_revs entries = CvsEntries(self.repository.basedir) # Collect added and deleted directories addeddirs = [] deleteddirs = [] # Group entries at the same revision reventries = {} for e in changeset.entries: if e.action_kind == e.UPDATED: info = entries.getFileInfo(e.name) if not info: self.log.debug('promoting "%s" to ADDED at ' 'revision %s', e.name, e.new_revision) e.action_kind = e.ADDED for dir in self.__createParentCVSDirectories( changeset, e.name): addeddirs.append((e, dir)) elif info.cvs_version == e.new_revision: self.log.debug( 'skipping "%s" since it is already ' 'at revision %s', e.name, e.new_revision) continue elif e.action_kind == e.DELETED: if not exists(join(self.repository.basedir, e.name)): self.log.debug( 'skipping "%s" since it is already ' 'deleted', e.name) entrydir = split(e.name)[0] if self.__maybeDeleteDirectory(entrydir, changeset): deleteddirs.append(entrydir) continue elif e.action_kind == e.ADDED: if e.new_revision is None: # This is a new directory entry, there is no need to update it continue else: for dir in self.__createParentCVSDirectories( changeset, e.name): addeddirs.append((e, dir)) # If this is a directory (CVS does not version directories, # and thus new_revision is always None for them), and it's # going to be deleted, do not execute a 'cvs update', that # in some cases does not do what one would expect. Instead, # remove it with everything it contains (that should be # just a single "CVS" subdir, btw) if e.action_kind == e.DELETED and e.new_revision is None: assert CvsEntries( join(self.repository.basedir, e.name)).isEmpty(), '%s should be empty' % e.name rmtree(join(self.repository.basedir, e.name)) else: names = reventries.setdefault(e.new_revision, []) names.append(e.name) if e.action_kind == e.DELETED: entrydir = split(e.name)[0] if self.__maybeDeleteDirectory(entrydir, changeset): deleteddirs.append(entrydir) revs = reventries.keys() revs.sort(compare_cvs_revs) cmd = self.repository.command("-f", "-d", "%(repository)s", "-q", "update", "-d", "-r", "%(revision)s") if self.repository.freeze_keywords: cmd.append('-kk') cvsup = ExternalCommand(cwd=self.repository.basedir, command=cmd) for rev in revs: names = reventries[rev] retry = 0 while True: cvsup.execute(names, repository=self.repository.repository, revision=rev) if cvsup.exit_status: retry += 1 if retry > 3: break delay = 2**retry self.log.warning( "%s returned status %s, " "retrying in %d seconds...", str(cvsup), cvsup.exit_status, delay) sleep(retry) else: break if cvsup.exit_status: raise ChangesetApplicationFailure( "%s returned status %s" % (str(cvsup), cvsup.exit_status)) self.log.debug("%s updated to %s", ','.join(names), e.new_revision) # Fake up ADD and DEL events for the directories implicitly # added/removed, so that the replayer gets their name. for entry, path in addeddirs: entry = changeset.addEntry(path, None, before=entry) entry.action_kind = entry.ADDED self.log.info("registering new %s directory", entry.name) for path in deleteddirs: deldir = changeset.addEntry(path, None) deldir.action_kind = deldir.DELETED self.log.info("registering %s directory deletion", path) # Make sure all files are present on disk: CVS update does not # create them nor reports an error if the files have been # completely removed from the cvs repository. So loop over the # entries and verify the presence of added/changed ones. for entry in changeset.entries: if (entry.action_kind in (entry.ADDED, entry.UPDATED) and not exists(join(self.repository.basedir, entry.name))): self.log.warning( "Ignoring entry %s, CVS source no " "longer knows about it.", entry.name) changeset.entries.remove(entry)
def _applyChangeset(self, changeset): from os.path import join, exists, split from os import listdir from shutil import rmtree from time import sleep from vcpx.repository.cvs import CvsEntries, compare_cvs_revs entries = CvsEntries(self.repository.basedir) # Collect added and deleted directories addeddirs = [] deleteddirs = [] # Group entries at the same revision reventries = {} for e in changeset.entries: if e.action_kind == e.UPDATED: info = entries.getFileInfo(e.name) if not info: self.log.debug('promoting "%s" to ADDED at ' 'revision %s', e.name, e.new_revision) e.action_kind = e.ADDED for dir in self.__createParentCVSDirectories(changeset, e.name): addeddirs.append((e, dir)) elif info.cvs_version == e.new_revision: self.log.debug('skipping "%s" since it is already ' 'at revision %s', e.name, e.new_revision) continue elif e.action_kind == e.DELETED: if not exists(join(self.repository.basedir, e.name)): self.log.debug('skipping "%s" since it is already ' 'deleted', e.name) entrydir = split(e.name)[0] if self.__maybeDeleteDirectory(entrydir, changeset): deleteddirs.append(entrydir) continue elif e.action_kind == e.ADDED: if e.new_revision is None: # This is a new directory entry, there is no need to update it continue else: for dir in self.__createParentCVSDirectories(changeset, e.name): addeddirs.append((e, dir)) # If this is a directory (CVS does not version directories, # and thus new_revision is always None for them), and it's # going to be deleted, do not execute a 'cvs update', that # in some cases does not do what one would expect. Instead, # remove it with everything it contains (that should be # just a single "CVS" subdir, btw) if e.action_kind == e.DELETED and e.new_revision is None: assert CvsEntries(join(self.repository.basedir, e.name)).isEmpty(), '%s should be empty' % e.name rmtree(join(self.repository.basedir, e.name)) else: names = reventries.setdefault(e.new_revision, []) names.append(e.name) if e.action_kind == e.DELETED: entrydir = split(e.name)[0] if self.__maybeDeleteDirectory(entrydir, changeset): deleteddirs.append(entrydir) revs = reventries.keys() revs.sort(compare_cvs_revs) cmd = self.repository.command("-f", "-d", "%(repository)s", "-q", "update", "-d", "-r", "%(revision)s") if self.repository.freeze_keywords: cmd.append('-kk') cvsup = ExternalCommand(cwd=self.repository.basedir, command=cmd) for rev in revs: names = reventries[rev] retry = 0 while True: cvsup.execute(names, repository=self.repository.repository, revision=rev) if cvsup.exit_status: retry += 1 if retry>3: break delay = 2**retry self.log.warning("%s returned status %s, " "retrying in %d seconds...", str(cvsup), cvsup.exit_status, delay) sleep(retry) else: break if cvsup.exit_status: raise ChangesetApplicationFailure( "%s returned status %s" % (str(cvsup), cvsup.exit_status)) self.log.debug("%s updated to %s", ','.join(names), e.new_revision) # Fake up ADD and DEL events for the directories implicitly # added/removed, so that the replayer gets their name. for entry,path in addeddirs: entry = changeset.addEntry(path, None, before=entry) entry.action_kind = entry.ADDED self.log.info("registering new %s directory", entry.name) for path in deleteddirs: deldir = changeset.addEntry(path, None) deldir.action_kind = deldir.DELETED self.log.info("registering %s directory deletion", path) # Make sure all files are present on disk: CVS update does not # create them nor reports an error if the files have been # completely removed from the cvs repository. So loop over the # entries and verify the presence of added/changed ones. for entry in changeset.entries: if (entry.action_kind in (entry.ADDED, entry.UPDATED) and not exists(join(self.repository.basedir, entry.name))): self.log.warning("Ignoring entry %s, CVS source no " "longer knows about it.", entry.name) changeset.entries.remove(entry)