Bug 64751 - webkit-patch apply-attachment does not work when not called from the root of the checkout
Summary: webkit-patch apply-attachment does not work when not called from the root of ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Eric Seidel (no email)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-18 13:48 PDT by Eric Seidel (no email)
Modified: 2011-07-18 14:17 PDT (History)
1 user (show)

See Also:


Attachments
Patch (43.37 KB, patch)
2011-07-18 13:51 PDT, Eric Seidel (no email)
abarth: review+
abarth: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2011-07-18 13:48:08 PDT
webkit-patch apply-attachment does not work when not called from the root of the checkout
Comment 1 Eric Seidel (no email) 2011-07-18 13:51:07 PDT
Created attachment 101201 [details]
Patch
Comment 2 Adam Barth 2011-07-18 14:00:00 PDT
Comment on attachment 101201 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=101201&action=review

> Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py:137
> -        expected_stderr = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release']\n"
> +        expected_stderr = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock\n"

Can you rename /mock to /checkout-root?  It's not obvious that what it is.

> Tools/Scripts/webkitpy/tool/servers/gardeningserver.py:64
> -            self.server.tool.executive.run_and_throw_if_fail(update_webkit_command, quiet=True)
> +            self.server.tool.executive.run_and_throw_if_fail(update_webkit_command, quiet=True, cwd=self.server.tool.scm().checkout_root)

Its kind of lame that this is copy/pasted everywhere.  Can't we have that be the default somehow?

> Tools/Scripts/webkitpy/tool/steps/preparechangelog.py:76
> -            self._tool.executive.run_and_throw_if_fail(args, self._options.quiet)
> +            self._tool.executive.run_and_throw_if_fail(args, self._options.quiet, cwd=self._tool.scm().checkout_root)

Does this do the right thing if -d is specified?  I guess _changed_files will make it work right.
Comment 3 Eric Seidel (no email) 2011-07-18 14:17:01 PDT
Committed r91210: <http://trac.webkit.org/changeset/91210>