def _checkoutUpstreamRevision(self, revision): """ Concretely do the checkout of the upstream sources. Use `revision` as the name of the tag to get, or as a date if it starts with a number. Return the last applied changeset. """ from os.path import join, exists, split from time import sleep from vcpx.repository.cvs import CvsEntries, compare_cvs_revs from vcpx.changes import ChangesetEntry if not self.repository.module: raise InvocationError("Must specify a module name") timestamp = None if revision is not None: # If the revision contains a space, assume it really # specify a branch and a timestamp. If it starts with # a digit, assume it's a timestamp. Otherwise, it must # be a branch name if revision[0] in '0123456789' or revision == 'INITIAL': timestamp = revision revision = None elif ' ' in revision: revision, timestamp = revision.split(' ', 1) csets = self.getPendingChangesets(revision) if not csets: raise TargetInitializationFailure( "Something went wrong: there are no changesets since " "revision '%s'" % revision) if timestamp == 'INITIAL': initialcset = csets.next() timestamp = initialcset.date.replace(tzinfo=None).isoformat( sep=' ') else: initialcset = None if not exists(join(self.repository.basedir, 'CVS')): # CVS does not handle "checkout -d multi/level/subdir", so # split the basedir and use it's parentdir as cwd below. parentdir, subdir = split(self.repository.basedir) cmd = self.repository.command("-f", "-q", "-d", self.repository.repository, "checkout", "-d", subdir) if revision: cmd.extend(["-r", revision]) if timestamp: cmd.extend(["-D", "%s UTC" % timestamp]) if self.repository.freeze_keywords: cmd.append('-kk') checkout = ExternalCommand(cwd=parentdir, command=cmd) retry = 0 while True: checkout.execute(self.repository.module) if checkout.exit_status: retry += 1 if retry > 3: break delay = 2**retry self.log.warning( "%s returned status %s, " "retrying in %d seconds...", str(checkout), checkout.exit_status, delay) sleep(retry) else: break if checkout.exit_status: raise TargetInitializationFailure( "%s returned status %s" % (str(checkout), checkout.exit_status)) else: self.log.info("Using existing %s", self.repository.basedir) if self.repository.tag_entries: self.__forceTagOnEachEntry() entries = CvsEntries(self.repository.basedir) youngest_entry = entries.getYoungestEntry() if youngest_entry is None: raise EmptyRepositoriesFoolsMe("The working copy '%s' of the " "CVS repository seems empty, " "don't know how to deal with " "that." % self.repository.basedir) # loop over the changesets and find the last applied, to find # out the actual cvsps revision found = False def already_applied(cs, entries=entries): "Loop over changeset entries to determine if it's already applied." applied = False # applied become True when an entry is DELETED *and* there is # no metainfo for it: thus, a changeset that removes a few entries # very late in history would be assumed as applied. Prevent that # by checking for at least one explicit match on an existing entry. onepositive = False for m in cs.entries: info = entries.getFileInfo(m.name) # If the entry's info exists, compare the on-disk # version with what we have: the revision is already # applied if the former is greater or equal than the # latter. The same if the info does not exist and it's # a delete event. if info: odversion = info.cvs_version applied = compare_cvs_revs(odversion, m.new_revision) >= 0 # If only one "hunk" is not yet applied, the whole # changeset is new. if not applied: break else: onepositive = True elif m.action_kind == ChangesetEntry.DELETED: applied = True return applied and onepositive # We cannot stop at the first not-applied cset, because it may # old enough to trick already_applied(): an entry may have # been moved in the meantime, and thus the getFileInfo() # method would return None, for example... So we really have # to loop over the whole queue. for cset in self.state_file: applied = already_applied(cset) found = found or applied if applied: last = cset if not found and initialcset: found = already_applied(initialcset) if found: last = initialcset if not found: raise TargetInitializationFailure( "Something went wrong: unable to determine the exact upstream " "revision of the checked out tree in '%s'. Either you specified " "the wrong initial timestamp, or you are checking out a " "composition of 'CVS modules' and Tailor does not support them; " "see the option 'trim-module-components' for a possible " "workaround." % self.repository.basedir) else: self.log.info("Working copy up to revision %s", last.revision) return last
def _checkoutUpstreamRevision(self, revision): """ Concretely do the checkout of the upstream sources. Use `revision` as the name of the tag to get, or as a date if it starts with a number. Return the last applied changeset. """ from os.path import join, exists, split from time import sleep from vcpx.repository.cvs import CvsEntries, compare_cvs_revs from vcpx.changes import ChangesetEntry if not self.repository.module: raise InvocationError("Must specify a module name") timestamp = None if revision is not None: # If the revision contains a space, assume it really # specify a branch and a timestamp. If it starts with # a digit, assume it's a timestamp. Otherwise, it must # be a branch name if revision[0] in '0123456789' or revision == 'INITIAL': timestamp = revision revision = None elif ' ' in revision: revision, timestamp = revision.split(' ', 1) csets = self.getPendingChangesets(revision) if not csets: raise TargetInitializationFailure( "Something went wrong: there are no changesets since " "revision '%s'" % revision) if timestamp == 'INITIAL': initialcset = csets.next() timestamp = initialcset.date.replace(tzinfo=None).isoformat(sep=' ') else: initialcset = None if not exists(join(self.repository.basedir, 'CVS')): # CVS does not handle "checkout -d multi/level/subdir", so # split the basedir and use it's parentdir as cwd below. parentdir, subdir = split(self.repository.basedir) cmd = self.repository.command("-f", "-q", "-d", self.repository.repository, "checkout", "-d", subdir) if revision: cmd.extend(["-r", revision]) if timestamp: cmd.extend(["-D", "%s UTC" % timestamp]) if self.repository.freeze_keywords: cmd.append('-kk') checkout = ExternalCommand(cwd=parentdir, command=cmd) retry = 0 while True: checkout.execute(self.repository.module) if checkout.exit_status: retry += 1 if retry>3: break delay = 2**retry self.log.warning("%s returned status %s, " "retrying in %d seconds...", str(checkout), checkout.exit_status, delay) sleep(retry) else: break if checkout.exit_status: raise TargetInitializationFailure( "%s returned status %s" % (str(checkout), checkout.exit_status)) else: self.log.info("Using existing %s", self.repository.basedir) if self.repository.tag_entries: self.__forceTagOnEachEntry() entries = CvsEntries(self.repository.basedir) youngest_entry = entries.getYoungestEntry() if youngest_entry is None: raise EmptyRepositoriesFoolsMe("The working copy '%s' of the " "CVS repository seems empty, " "don't know how to deal with " "that." % self.repository.basedir) # loop over the changesets and find the last applied, to find # out the actual cvsps revision found = False def already_applied(cs, entries=entries): "Loop over changeset entries to determine if it's already applied." applied = False # applied become True when an entry is DELETED *and* there is # no metainfo for it: thus, a changeset that removes a few entries # very late in history would be assumed as applied. Prevent that # by checking for at least one explicit match on an existing entry. onepositive = False for m in cs.entries: info = entries.getFileInfo(m.name) # If the entry's info exists, compare the on-disk # version with what we have: the revision is already # applied if the former is greater or equal than the # latter. The same if the info does not exist and it's # a delete event. if info: odversion = info.cvs_version applied = compare_cvs_revs(odversion, m.new_revision) >= 0 # If only one "hunk" is not yet applied, the whole # changeset is new. if not applied: break else: onepositive = True elif m.action_kind == ChangesetEntry.DELETED: applied = True return applied and onepositive # We cannot stop at the first not-applied cset, because it may # old enough to trick already_applied(): an entry may have # been moved in the meantime, and thus the getFileInfo() # method would return None, for example... So we really have # to loop over the whole queue. for cset in self.state_file: applied = already_applied(cset) found = found or applied if applied: last = cset if not found and initialcset: found = already_applied(initialcset) if found: last = initialcset if not found: raise TargetInitializationFailure( "Something went wrong: unable to determine the exact upstream " "revision of the checked out tree in '%s'. Either you specified " "the wrong initial timestamp, or you are checking out a " "composition of 'CVS modules' and Tailor does not support them; " "see the option 'trim-module-components' for a possible " "workaround." % self.repository.basedir) else: self.log.info("Working copy up to revision %s", last.revision) return last