bookmarks: Move context menu controller into ui/bookmarks directory.

bookmarks: Move context menu controller into ui/bookmarks directory.

Only 'git mv', change in ifdef guards, #include and gypi changes, no functional changes.

BUG=144783
R=sky@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=159288

[tfarina, 2012-09-27 18:51:37]

Ready to look.

Thanks.

[sky, 2012-09-27 23:18:39]

Don't use git mv. You need to use svn otherwise you're going to lose
history. You've already lost history moving other files with git (
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/ash/launche...
)

On Thu, Sep 27, 2012 at 11:51 AM,  <tfarina@chromium.org> wrote:
> Reviewers: sky,
>
> Message:
> Ready to look.
>
> Thanks.
>
> Description:
> bookmarks: Move context menu controller into ui/bookmarks directory.
>
> Only 'git mv', change in ifdef guards, #include and gypi changes, no
> functional
> changes.
>
> BUG=144783
> R=sky@chromium.org
>
> Please review this at http://codereview.chromium.org/10977060/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>   D chrome/browser/bookmarks/bookmark_context_menu_controller.h
>   D chrome/browser/bookmarks/bookmark_context_menu_controller.cc
>   D chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
>   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
>   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
>   A +
> chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
>   M chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
>   M chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
>   M chrome/chrome_browser.gypi
>   M chrome/chrome_browser_ui.gypi
>   M chrome/chrome_tests.gypi
>
>

[tfarina, 2012-09-27 23:35:25]

On Thursday, September 27, 2012, Scott Violet wrote:

> Don't use git mv. You need to use svn otherwise you're going to lose
> history. You've already lost history moving other files with git (
>
>
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/ash/launche...
> )

The history is not lost in any way. Git preservers it. Try git blame -C -C
path/to/file and you will see what I mean.
giit log --follow works too.


> On Thu, Sep 27, 2012 at 11:51 AM,  <tfarina@chromium.org <javascript:;>>
> wrote:
> > Reviewers: sky,
> >
> > Message:
> > Ready to look.
> >
> > Thanks.
> >
> > Description:
> > bookmarks: Move context menu controller into ui/bookmarks directory.
> >
> > Only 'git mv', change in ifdef guards, #include and gypi changes, no
> > functional
> > changes.
> >
> > BUG=144783
> > R=sky@chromium.org <javascript:;>
> >
> > Please review this at http://codereview.chromium.org/10977060/
> >
> > SVN Base: svn://svn.chromium.org/chrome/trunk/src
> >
> > Affected files:
> >   D chrome/browser/bookmarks/bookmark_context_menu_controller.h
> >   D chrome/browser/bookmarks/bookmark_context_menu_controller.cc
> >   D chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
> >   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
> >   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
> >   A +
> > chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
> >   M chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
> >   M chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
> >   M chrome/chrome_browser.gypi
> >   M chrome/chrome_browser_ui.gypi
> >   M chrome/chrome_tests.gypi
> >
> >
>


-- 
Thiago

[sky, 2012-09-27 23:56:10]

On Thu, Sep 27, 2012 at 4:35 PM, Thiago Farina <tfarina@chromium.org> wrote:
>
>
> On Thursday, September 27, 2012, Scott Violet wrote:
>>
>> Don't use git mv. You need to use svn otherwise you're going to lose
>> history. You've already lost history moving other files with git (
>>
>>
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/ash/launche...
>> )
>
> The history is not lost in any way. Git preservers it. Try git blame -C -C
> path/to/file and you will see what I mean.
> giit log --follow works too.

The problem is that our tools are not yet git based. As you can see by
clicking on the page I sent you the svn history, the one we care
about, has been lost.

  -Scott

>
>>
>> On Thu, Sep 27, 2012 at 11:51 AM,  <tfarina@chromium.org> wrote:
>> > Reviewers: sky,
>> >
>> > Message:
>> > Ready to look.
>> >
>> > Thanks.
>> >
>> > Description:
>> > bookmarks: Move context menu controller into ui/bookmarks directory.
>> >
>> > Only 'git mv', change in ifdef guards, #include and gypi changes, no
>> > functional
>> > changes.
>> >
>> > BUG=144783
>> > R=sky@chromium.org
>> >
>> > Please review this at http://codereview.chromium.org/10977060/
>> >
>> > SVN Base: svn://svn.chromium.org/chrome/trunk/src
>> >
>> > Affected files:
>> >   D chrome/browser/bookmarks/bookmark_context_menu_controller.h
>> >   D chrome/browser/bookmarks/bookmark_context_menu_controller.cc
>> >   D
>> > chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
>> >   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
>> >   A + chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
>> >   A +
>> > chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
>> >   M chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
>> >   M chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
>> >   M chrome/chrome_browser.gypi
>> >   M chrome/chrome_browser_ui.gypi
>> >   M chrome/chrome_tests.gypi
>> >
>> >
>
>
>
> --
> Thiago

[tfarina, 2012-09-28 00:28:49]

Marc, is there a way to land this without "losing" the svn history? May be
trough git svn dcommit? May be trough cq? Is it possible to apply this change in
a svn checkout? If so, Scott, would you mind doing that and landing this to me?

Some people suggested doing a copy and rebase later.

https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/chromium-d...

https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/chromium-d...

I think it isn't fair to require me to checkout a svn tree if git is prompted
and has a supported workflow. Even though  svn being the official scm tool.

But if it is *really* necessary, I'll do, although that will *cost* me days and
a *big* learn curve, because  my muscles are trained with/for git.

[M-A Ruel, 2012-09-28 00:54:12]

On 2012/09/28 00:28:49, tfarina wrote:
> Marc, is there a way to land this without "losing" the svn history?

Scott, if this CL is committed through the CQ, it will not loose the history. As
a matter of fact, it would lose history only if it was uploaded from svn because
svn diff are incomplete.

You can verify this with the raw diff;
http://codereview.chromium.org/download/issue10977060_4001_12.diff

The CQ understands the git diff dialect and process the header accordingly. e.g.
"""
rename from chrome/browser/bookmarks/bookmark_context_menu_controller.h
rename to chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
"""

and it emulate the corresponding svn commands.

[sky, 2012-09-28 15:01:29]

LGTM - please version this does not lose history. If it does, revert it.

[commit-bot: I haz the power, 2012-09-28 15:34:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/10977060/4001

[commit-bot: I haz the power, 2012-09-28 15:34:10]

Failed to apply patch for chrome/chrome_browser_ui.gypi:
While running patch -p1 --forward --force;
patching file chrome/chrome_browser_ui.gypi
Hunk #2 FAILED at 2347.
1 out of 2 hunks FAILED -- saving rejects to file
chrome/chrome_browser_ui.gypi.rej

[commit-bot: I haz the power, 2012-09-28 15:42:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/10977060/16009

[commit-bot: I haz the power, 2012-09-28 18:01:22]

Change committed as 159288