py_tasks_melange: comparison scripts/release/release.py

equal deleted inserted replaced

-:12de6d73a908
+:c03995a6a88e
 class Error(error.Error):
 pass
-class SubprocessFailed(Error):
-"""A subprocess returned a non-zero error code."""
 class AbortedByUser(Error):
 """The operation was aborted by the user."""
 class ObstructionError(Error):
 """An unexpected state was encountered by an automated step."""
 class FileAccessError(Error):
 """An error occured while accessing a file."""
-def run(argv, cwd=None, capture=False, split_capture=True, stdin=''):
-"""Run the given command and optionally return its output.
-Note that if you set capture=True, the command's output is
-buffered in memory. Output capture should only be used with
-commands that output small amounts of data. O(kB) is fine, O(MB)
-is starting to push it a little.
-Args:
-argv: A list containing the name of the program to run, followed
-by its argument vector.
-cwd: Run the program from this directory.
-capture: If True, capture the program's stdout stream. If False,
-stdout will output to sys.stdout.
-split_capture: If True, return the captured output as a list of
-lines. Else, return as a single unaltered string.
-stdin: The string to feed to the program's stdin stream.
-Returns:
-If capture is True, a string containing the combined
-stdout/stderr output of the program. If capture is False,
-nothing is returned.
-Raises:
-SubprocessFailed: The subprocess exited with a non-zero exit
-code.
-"""
-print util.colorize('# ' + ' '.join(argv), util.WHITE, bold=True)
-process = subprocess.Popen(argv,
-shell=False,
-cwd=cwd,
-stdin=subprocess.PIPE,
-stdout=(subprocess.PIPE if capture else None),
-stderr=None)
-output, _ = process.communicate(input=stdin)
-if process.returncode != 0:
-raise SubprocessFailed('Process %s failed with output: %s' %
-(argv[0], output))
-if output is not None and split_capture:
-return output.strip().split('\n')
-else:
-return output
 def error(msg):
 """Log an error message."""
 print util.colorize(msg, util.RED, bold=True)
 Args:
 url: The Subversion repository URL to check out.
 depth: The depth of the working copy root.
 """
 assert not self.exists()
-run(['svn', 'checkout', '--depth=' + depth, url, self.path()])
+util.run(['svn', 'checkout', '--depth=' + depth, url, self.path()])
 def update(self, path='', depth=None):
 """Update a working copy path, optionally changing depth.
 Args:
 path: The working copy path to update.
 depth: If set, change the depth of the path before updating.
 """
 assert self.exists()
 if depth is None:
-run(['svn', 'update', self.path(path)])
+util.run(['svn', 'update', self.path(path)])
 else:
-run(['svn', 'update', '--set-depth=' + depth, self.path(path)])
+util.run(['svn', 'update', '--set-depth=' + depth, self.path(path)])
 def revert(self, path=''):
 """Recursively revert a working copy path.
 Note that this command is more zealous than the 'svn revert'
 command, as it will also delete any files which subversion
 does not know about.
 """
-run(['svn', 'revert', '-R', self.path(path)])
+util.run(['svn', 'revert', '-R', self.path(path)])
 unknown, missing = self._unknownAndMissing(path)
 unknown = [os.path.join(self.path(path), p) for p in unknown]
 if unknown:
 # rm -rf makes me uneasy. Verify that all paths to be deleted
 # are within the release working copy.
 for p in unknown:
 assert p.startswith(self.path())
-run(['rm', '-rf', '--'] + unknown)
+util.run(['rm', '-rf', '--'] + unknown)
 def ls(self, dir=''):
 """List the contents of a working copy directory.
 Note that this returns the contents of the directory as seen
 by the server, not constrained by the depth settings of the
 local path.
 """
 assert self.exists()
-return run(['svn', 'ls', self.path(dir)], capture=True)
+return util.run(['svn', 'ls', self.path(dir)], capture=True)
 def copy(self, src, dest):
 """Copy a working copy path.
 The copy is only scheduled for commit, not committed.
 Args:
 src: The source working copy path.
 dst: The destination working copy path.
 """
 assert self.exists()
-run(['svn', 'cp', self.path(src), self.path(dest)])
+util.run(['svn', 'cp', self.path(src), self.path(dest)])
 def propget(self, prop_name, path):
 """Get the value of a property on a working copy path.
 Args:
 prop_name: The property name, eg. 'svn:externals'.
 path: The working copy path on which the property is set.
 """
 assert self.exists()
-return run(['svn', 'propget', prop_name, self.path(path)], capture=True)
+return util.run(['svn', 'propget', prop_name, self.path(path)],
+capture=True)
 def propset(self, prop_name, prop_value, path):
 """Set the value of a property on a working copy path.
 The property change is only scheduled for commit, not committed.
 prop_name: The property name, eg. 'svn:externals'.
 prop_value: The value that should be set.
 path: The working copy path on which to set the property.
 """
 assert self.exists()
-run(['svn', 'propset', prop_name, prop_value, self.path(path)])
+util.run(['svn', 'propset', prop_name, prop_value, self.path(path)])
 def add(self, paths):
 """Schedule working copy paths for addition.
 The paths are only scheduled for addition, not committed.
 Args:
 paths: The list of working copy paths to add.
 """
 assert self.exists()
 paths = [self.path(p) for p in paths]
-run(['svn', 'add'] + paths)
+util.run(['svn', 'add'] + paths)
 def remove(self, paths):
 """Schedule working copy paths for deletion.
 The paths are only scheduled for deletion, not committed.
 Args:
 paths: The list of working copy paths to delete.
 """
 assert self.exists()
 paths = [self.path(p) for p in paths]
-run(['svn', 'rm'] + paths)
+util.run(['svn', 'rm'] + paths)
 def status(self, path=''):
 """Return the status of a working copy path.
 The status returned is the verbatim output of 'svn status' on
 Args:
 path: The path to examine.
 """
 assert self.exists()
-return run(['svn', 'status', self.path(path)], capture=True)
+return util.run(['svn', 'status', self.path(path)], capture=True)
 def addRemove(self, path=''):
 """Perform an "addremove" operation a working copy path.
 An "addremove" runs 'svn status' and schedules all the unknown
 Args:
 message: The commit message to use.
 path: The path to commit.
 """
 assert self.exists()
-run(['svn', 'commit', '-m', message, self.path(path)])
+util.run(['svn', 'commit', '-m', message, self.path(path)])
 @staticmethod
 def export(url, revision, dest_path):
 """Export the contents of a repository to a local path.
 """
 assert os.path.isabs(dest_path)
 if os.path.exists(dest_path):
 raise ObstructionError('Cannot export to obstructed path %s' %
 dest_path)
-run(['svn', 'export', '-r', str(revision), url, dest_path])
+util.run(['svn', 'export', '-r', str(revision), url, dest_path])
 @staticmethod
 def find_tag_rev(url):
 """Return the revision at which a remote tag was created.
 Args:
 url: The repository URL of the tag to examine.
 """
 try:
-output = run(['svn', 'log', '-q', '--stop-on-copy', url],
+output = util.run(['svn', 'log', '-q', '--stop-on-copy', url],
 capture=True)
-except SubprocessFailed:
+except util.SubprocessFailed:
 raise ExpectationFailed('No tag at URL ' + url)
 first_rev_line = output[-2]
 first_rev = int(first_rev_line.split()[0][1:])
 return first_rev
 A string containing the changes extracted from the remote
 repository, in unified diff format suitable for application
 using 'patch'.
 """
 try:
-return run(['svn', 'diff', '-c', str(revision), url],
+return util.run(['svn', 'diff', '-c', str(revision), url],
 capture=True, split_capture=False)
-except SubprocessFailed:
+except util.SubprocessFailed:
 raise ExpectationFailed('Could not get diff for r%d '
 'from remote repository' % revision)
 #
 diff = self.wc.diff(self.upstream_repos + '/trunk', rev)
 if not diff.strip():
 raise ExpectationFailed(
 'Retrieved diff is empty. '
 'Did you accidentally cherry-pick a branch change?')
-run(['patch', '-p0'], cwd=self.wc.path(self.branch_dir), stdin=diff)
+util.run(['patch', '-p0'], cwd=self.wc.path(self.branch_dir),
+stdin=diff)
 self.wc.addRemove(self.branch_dir)
 yaml_path = self.wc.path(self._branchPath('app/app.yaml'))
 out = []
 updated_patchlevel = False

changeset 1827	c03995a6a88e
parent 1826	12de6d73a908
child 1834	0589bf1395c5