New issue
Advanced search Search tips

Issue 710322 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Apr 2017
Cc:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug

Blocking:
issue 676588



Sign in to add a comment

[Errno 2] No such file or directory: '.git/info/attributes' in blink_rename_merge_helper

Project Member Reported by alancutter@chromium.org, Apr 11 2017

Issue description

Hit error while attempting to rebase https://codereview.chromium.org/2809063002.


$ git co +animateCustomVarReferences 
Checking out files: 100% (15862/15862), done.
Switched to branch '+animateCustomVarReferences'
Your branch and 'origin/master' have diverged,
and have 2 and 774 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)


$ git show cff45fb322cbdf2badb6ededde0106161bbfb13e > tools/blink_rename_merge_helper/run2.py


$ python tools/blink_rename_merge_helper/run2.py -C out/release --prepare                               
Checking for updates...
Copying gs://chromium-blink-rename/COMPONENTS...
Downloading to temp gzip filename /tmp/tmpb1us5S/COMPONENTS_.gztmp
Downloading file:///tmp/tmpb1us5S/COMPONENTS:                    336 B/336 B    
The current platform doesn't match "darwin", skipping.
0> Downloading staging/pylib.tar.gz...
0> Extracting 9 entries from staging/pylib.tar.gz to staging/pylib
Success!
Downloading 1 files took 12.237233 second(s)
The current platform doesn't match "darwin", skipping.
0> Downloading staging/lib.tar.gz...
0> Extracting 110 entries from staging/lib.tar.gz to staging/lib
Success!
Downloading 1 files took 13.971253 second(s)
The current platform doesn't match "win32", skipping.
0> Downloading staging/bin.tar.gz...
0> Extracting 2 entries from staging/bin.tar.gz to staging/bin
Success!
Downloading 1 files took 9.362016 second(s)
The current platform doesn't match "darwin", skipping.
The current platform doesn't match "win32", skipping.
0> Downloading staging/data.tar.gz...
0> Extracting 3 entries from staging/data.tar.gz to staging/data
Success!
Downloading 1 files took 7.560402 second(s)
INFO: current branch: refs/heads/+animateCustomVarReferences
INFO: tracking branch: refs/remotes/origin/master
WARNING: there are 2 commits in branch that are not upstream.
         Squashing into one commit is required to continue.
Automatically squash into one commit [Y/n]? 
[detached HEAD c5ed35291f96] git squash commit for +animateCustomVarReferences.
 Date: Thu Mar 23 18:22:13 2017 +1100
 7 files changed, 148 insertions(+), 94 deletions(-)
Successfully rebased and updated refs/heads/+animateCustomVarReferences.
First, rewinding head to replay your work on top of it...
Applying: git squash commit for +animateCustomVarReferences.
Syncing projects: 100% (102/102), done.                                    

<gclient sync...>

ninja: Entering directory `out/release'
[1/1] Regenerating ninja files
[2236/2236] CXX obj/third_party/WebKit/Source/core/animation/animation/CSSInterpolationType.o
Processed 3 files with rewrite_to_chrome_style tool (0 failures) [100.00%]
INFO: dumping raw edits to /tmp/tmpb8PCyl
Applied 3667 edits (0 errors) to 7 files [100.00%]
Skipped patch 'chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java'.

<Many skipped patches...>

Skipped patch 'third_party/WebKit/public/platform/WebInputEvent.h'.
INFO: saving changed files to /tmp/tmpQ8dLsZ
Saving third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
Saving third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
Saving third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
Saving third_party/WebKit/Source/core/animation/css/CSSAnimations.h
Saving third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
Saving third_party/WebKit/Source/core/css/resolver/StyleResolver.h
Saving third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
HEAD is now at 1f2d69d629fa git squash commit for +animateCustomVarReferences.
INFO: finished preparing branch refs/heads/+animateCustomVarReferences


$ git status
On branch +animateCustomVarReferences
Your branch and 'origin/master' have diverged,
and have 1 and 362 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        tools/blink_rename_merge_helper/run2.py

nothing added to commit but untracked files present (use "git add" to track)


$ python tools/blink_rename_merge_helper/run2.py --update
Checking for updates...
Copying gs://chromium-blink-rename/COMPONENTS...
Downloading to temp gzip filename /tmp/tmpwUwlSL/COMPONENTS_.gztmp
Downloading file:///tmp/tmpwUwlSL/COMPONENTS:                    336 B/336 B    
The current platform doesn't match "darwin", skipping.
0> File staging/pylib.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.000727 second(s)
The current platform doesn't match "darwin", skipping.
0> File staging/lib.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.001790 second(s)
The current platform doesn't match "win32", skipping.
0> File staging/bin.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.041955 second(s)
The current platform doesn't match "darwin", skipping.
The current platform doesn't match "win32", skipping.
0> File staging/data.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.002651 second(s)
INFO: current branch: refs/heads/+animateCustomVarReferences
INFO: tracking branch: refs/remotes/origin/master
Traceback (most recent call last):
  File "tools/blink_rename_merge_helper/run2.py", line 160, in <module>
    sys.exit(main())
  File "tools/blink_rename_merge_helper/run2.py", line 156, in main
    driver.run()
  File "/usr/local/google/home/alancutter/repos/chromium/src/tools/blink_rename_merge_helper/staging/pylib/blink_rename_merge_helper/driver.py", line 478, in run
    _update_branch(current_branch, tracking_branch, not args.merge)
  File "/usr/local/google/home/alancutter/repos/chromium/src/tools/blink_rename_merge_helper/staging/pylib/blink_rename_merge_helper/driver.py", line 421, in _update_branch
    with _MergeTool():
  File "/usr/local/google/home/alancutter/repos/chromium/src/tools/blink_rename_merge_helper/staging/pylib/blink_rename_merge_helper/driver.py", line 41, in __enter__
    with open(_GIT_ATTRIBUTES_PATH, 'r+') as attributes_file:
IOError: [Errno 2] No such file or directory: '.git/info/attributes'

 
$ python tools/blink_rename_merge_helper/run2.py --update
Checking for updates...
Copying gs://chromium-blink-rename/COMPONENTS...
Downloading to temp gzip filename /tmp/tmp6rNRGB/COMPONENTS_.gztmp
Downloading file:///tmp/tmp6rNRGB/COMPONENTS:                    333 B/333 B    
The current platform doesn't match "darwin", skipping.
0> Downloading staging/pylib.tar.gz...
0> Removed staging/pylib...
0> Extracting 9 entries from staging/pylib.tar.gz to staging/pylib
Success!
Downloading 1 files took 7.915906 second(s)
The current platform doesn't match "darwin", skipping.
0> File staging/lib.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.003767 second(s)
The current platform doesn't match "win32", skipping.
0> File staging/bin.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.039064 second(s)
The current platform doesn't match "darwin", skipping.
The current platform doesn't match "win32", skipping.
0> File staging/data.tar.gz exists and SHA1 matches. Skipping.
Success!
Downloading 1 files took 0.001650 second(s)
INFO: current branch: refs/heads/+animateCustomVarReferences
INFO: tracking branch: refs/remotes/origin/master
First, rewinding head to replay your work on top of it...
Applying: git squash commit for +animateCustomVarReferences.
Using index info to reconstruct a base tree...
M       third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
M       third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
M       third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
M       third_party/WebKit/Source/core/animation/css/CSSAnimations.h
M       third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
M       third_party/WebKit/Source/core/css/resolver/StyleResolver.h
M       third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
Falling back to patching base and 3-way merge...
Using pre-recorded conflict resolution for  third_party/WebKit/Source/core/css/resolver/StyleResolverSta
te.h
Using pre-recorded conflict resolution for  third_party/WebKit/Source/core/css/resolver/StyleResolver.h
Using pre-recorded conflict resolution for  third_party/WebKit/Source/core/css/resolver/StyleResolver.cp
p
Using pre-recorded conflict resolution for  third_party/WebKit/Source/core/animation/css/CSSAnimations.c
pp
Using pre-recorded conflict resolution for  third_party/WebKit/Source/core/animation/css/CSSAnimationUpd
ate.h
Auto-merging third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
Auto-merging third_party/WebKit/Source/core/css/resolver/StyleResolver.h
Auto-merging third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
Auto-merging third_party/WebKit/Source/core/animation/css/CSSAnimations.h
CONFLICT (content): Merge conflict in third_party/WebKit/Source/core/animation/css/CSSAnimations.h
Auto-merging third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
Auto-merging third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
Auto-merging third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
CONFLICT (content): Merge conflict in third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
error: Failed to merge in the changes.
Patch failed at 0001 git squash commit for +animateCustomVarReferences.
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

ERROR: failed to update. Please resolve any remaining conflicts 
       manually.
INFO: updated branch refs/heads/+animateCustomVarReferences




The diff in the tree at this stage looks to be undoing the rename.
Example:
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h b/third_party/WebKit/Sour
ce/core/animation/css/CSSAnimationUpdate.h
index f49cb086570c..c5885db10f0c 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
@@ -26,28 +26,28 @@ class NewCSSAnimation {
 
  public:
   NewCSSAnimation(AtomicString name,
-                  size_t name_index,
+                  size_t nameIndex,
                   const InertEffect& effect,
                   Timing timing,
-                  StyleRuleKeyframes* style_rule)
+                  StyleRuleKeyframes* styleRule)
       : name(name),
-        name_index(name_index),
+        nameIndex(nameIndex),
         effect(effect),
         timing(timing),
-        style_rule(style_rule),
-        style_rule_version(this->style_rule->Version()) {}
+        styleRule(styleRule),
+        styleRuleVersion(this->styleRule->version()) {}
 
   DEFINE_INLINE_TRACE() {
-    visitor->Trace(effect);
-    visitor->Trace(style_rule);
+    visitor->trace(effect);
+    visitor->trace(styleRule);
   }
 
   AtomicString name;
-  size_t name_index;
+  size_t nameIndex;
   Member<const InertEffect> effect;
   Timing timing;
-  Member<StyleRuleKeyframes> style_rule;
-  unsigned style_rule_version;
+  Member<StyleRuleKeyframes> styleRule;
+  unsigned styleRuleVersion;
 };
 
 class UpdatedCSSAnimation {


Comment 2 by dcheng@chromium.org, Apr 11 2017

Cc: lukasza@chromium.org
Very odd, since my attempt to rebase the same CL didn't have similar issues: https://codereview.chromium.org/2808673004

(Though there are still a few problems: notably calculateAnimationActiveInterpolations isn't named correctly, but I think that's because it's in a !DCHECK_IS_ON() block...)
Uploaded /tmp/tmpQ8dLsZ/.
tmpQ8dLsZ.zip
43.7 KB Download
Status: Fixed (was: Assigned)
Seems to be working now.

Comment 5 by dcheng@chromium.org, Apr 12 2017

Blocking: 675877

Comment 6 by dcheng@chromium.org, Apr 12 2017

Blocking: -675877 676588

Sign in to add a comment