Refactoring: Merge TryJob and Build class and move Build class to buildbot module.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 21 matching lines @@
 import logging
 import optparse
 import re
 import sys
 import time
 import traceback
 import urllib2
 
 from webkitpy.common.checkout.baselineoptimizer import BaselineOptimizer
 from webkitpy.common.memoized import memoized
+from webkitpy.common.net.buildbot import Build
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.layout_tests.controllers.test_result_writer import baseline_name
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, BASELINE_SUFFIX_LIST, SKIP
 from webkitpy.layout_tests.port import factory
 from webkitpy.tool.commands.command import Command
 
 
 _log = logging.getLogger(__name__)
 
 
-class Build(object):
-    """Represents a combination of builder and build number.
-
-    If build number is None, this represents the latest build
-    for a given builder.
-
-    TODO(qyearsley): Move this somewhere else; note it's very similar to TryJob,
-    and it seems like it might belong in the buildbot module.
-    TODO(qyearsley): Make this a subclass of namedtuple so that __hash__,
-    __eq__ and __cmp__ don't need to be explicitly added.
-    """
-    def __init__(self, builder_name, build_number=None):
-        self.builder_name = builder_name
-        self.build_number = build_number
-
-    # Having __hash__ and __eq__ allow instances of this class to be used
-    # as keys in dictionaries.
-    def __hash__(self):
-        return hash((self.builder_name, self.build_number))
-
-    def __eq__(self, other):
-        return (self.builder_name, self.build_number) == (other.builder_name, other.build_number)
-
-    def __cmp__(self, other):
-        return cmp((self.builder_name, self.build_number), (other.builder_name, other.build_number))
-
-
 class AbstractRebaseliningCommand(Command):
     """Base class for rebaseline-related commands."""
     # Not overriding execute() - pylint: disable=abstract-method
 
     no_optimize_option = optparse.make_option('--no-optimize', dest='optimize', action='store_false', default=True,
                                               help=('Do not optimize/de-dup the expectations after rebaselining (default is to de-dup automatically). '
                                                     'You can use "webkit-patch optimize-baselines" to optimize separately.'))
 
     platform_options = factory.platform_options(use_globs=True)
 
@@ skipping 886 matching lines @@
                     issue_already_closed = tool.executive.run_command(
                         ['git', 'config', 'branch.%s.rietveldissue' % rebaseline_branch_name],
                         return_exit_code=True)
                     if not issue_already_closed:
                         self._run_git_cl_command(options, ['set_close'])
 
                 tool.scm().ensure_cleanly_tracking_remote_master()
                 if old_branch_name_or_ref:
                     tool.scm().checkout_branch(old_branch_name_or_ref)
                 tool.scm().delete_branch(rebaseline_branch_name)