# HG changeset patch # User Eugene Ostroukhov # Date 1276036453 25200 # Node ID c1c74d169148f6431c840305ca4cb1051ff649df # Parent dceb3fa1892747d6f6f39bd35e2d6d115913b6ba Removed unnecessary patches diff -r dceb3fa18927 -r c1c74d169148 chrome-dev-tools-patches/doc --- a/chrome-dev-tools-patches/doc Tue Jun 08 15:33:30 2010 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -hg import [OPTION]... PATCH... - -aliases: patch - -import an ordered set of patches - - Import a list of patches and commit them individually (unless --no-commit - is specified). - - If there are outstanding changes in the working directory, import will - abort unless given the -f/--force flag. - - You can import a patch straight from a mail message. Even patches as - attachments work (to use the body part, it must have type text/plain or - text/x-patch). From and Subject headers of email message are used as - default committer and commit message. All text/plain body parts before - first diff are added to commit message. - - If the imported patch was generated by hg export, user and description - from patch override values from message headers and body. Values given on - command line with -m/--message and -u/--user override these. - - If --exact is specified, import will set the working directory to the - parent of each patch before applying it, and will abort if the resulting - changeset has a different ID than the one recorded in the patch. This may - happen due to character set problems or other deficiencies in the text - patch format. - - With -s/--similarity, hg will attempt to discover renames and copies in - the patch in the same way as 'addremove'. - - To read a patch from standard input, use "-" as the patch name. If a URL - is specified, the patch will be downloaded from it. See 'hg help dates' - for a list of formats valid for -d/--date. - -options: - - -p --strip directory strip option for patch. This has the same - meaning as the corresponding patch option (default: 1) - -b --base base path - -f --force skip check for outstanding uncommitted changes - --no-commit don't commit, just update the working directory - --exact apply patch to the nodes from which it was generated - --import-branch use any branch information in patch (implied by --exact) - -m --message use as commit message - -l --logfile read commit message from - -d --date record datecode as commit date - -u --user record the specified user as committer - -s --similarity guess renamed files by similarity (0<=s<=100) - -global options: - -R --repository repository root directory or name of overlay bundle file - --cwd change working directory - -y --noninteractive do not prompt, assume 'yes' for any required answers - -q --quiet suppress output - -v --verbose enable additional output - --config set/override config option - --debug enable debugging output - --debugger start debugger - --encoding set the charset encoding (default: cp1251) - --encodingmode set the charset encoding mode (default: strict) - --traceback always print a traceback on exception - --time time how long the command takes - --profile print command execution profile - --version output version information and exit - -h --help display help and exit diff -r dceb3fa18927 -r c1c74d169148 chrome-dev-tools-patches/stack-line-numbers-patch.txt --- a/chrome-dev-tools-patches/stack-line-numbers-patch.txt Tue Jun 08 15:33:30 2010 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -Index: src/org/chromium/debug/core/model/DebugTargetImpl.java -=================================================================== ---- src/org/chromium/debug/core/model/DebugTargetImpl.java (revision 307) -+++ src/org/chromium/debug/core/model/DebugTargetImpl.java (working copy) -@@ -474,6 +474,10 @@ - public WorkspaceBridge.JsLabelProvider getLabelProvider() { - return workspaceBridgeFactory.getLabelProvider(); - } -+ -+ public int getLineNumber(CallFrame stackFrame) { -+ return workspaceRelations.getLineNumber(stackFrame); -+ } - - private static class ListenerBlock { - private volatile boolean isBlocked = true; -Index: src/org/chromium/debug/core/model/StackFrame.java -=================================================================== ---- src/org/chromium/debug/core/model/StackFrame.java (revision 307) -+++ src/org/chromium/debug/core/model/StackFrame.java (working copy) -@@ -194,8 +194,7 @@ - } - - public int getLineNumber() throws DebugException { -- // convert 0-based to 1-based -- return stackFrame.getLineNumber() + 1; -+ return getDebugTarget().getLineNumber(stackFrame); - } - - public int getCharStart() throws DebugException { -Index: src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java -=================================================================== ---- src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java (revision 307) -+++ src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java (working copy) -@@ -230,6 +230,11 @@ - } - }; - -+ public int getLineNumber(CallFrame stackFrame) { -+ // convert 0-based to 1-based -+ return stackFrame.getLineNumber() + 1; -+ } -+ - /** - * This very simple source locator works because we provide our own source files. - * We'll have to try harder, once we link with resource js files. -@@ -282,4 +287,5 @@ - return name; - } - }; -+ - } -Index: src/org/chromium/debug/core/model/WorkspaceBridge.java -=================================================================== ---- src/org/chromium/debug/core/model/WorkspaceBridge.java (revision 307) -+++ src/org/chromium/debug/core/model/WorkspaceBridge.java (working copy) -@@ -7,6 +7,7 @@ - import java.util.Collection; - - import org.chromium.sdk.Breakpoint; -+import org.chromium.sdk.CallFrame; - import org.chromium.sdk.JavascriptVm; - import org.chromium.sdk.Script; - import org.eclipse.core.resources.IFile; -@@ -86,6 +87,12 @@ - BreakpointHandler getBreakpointHandler(); - - /** -+ * Returns editor line number for the provided call stack frame applying all required -+ * editor-specific translations. -+ */ -+ int getLineNumber(CallFrame stackFrame); -+ -+ /** - * Breakpoint-related aspect of {@link WorkspaceBridge} interface. - */ - interface BreakpointHandler extends IBreakpointListener {