M41 branch is here!

[Jochen Eisinger]

Hey all,

we branched for M41. Details:

Branch number: 2272

Branched chromium at rev: 310958

Branched blink at rev: 188177

V8 branch: 4.1

Skia branch: chrome/m41

best

-jochen

[Philip Jägenstedt]

Thanks Jochen, this is very helpful!

If possible, making these announcements a part of the process would be
nice. We use the stabilization branches at Opera, and I sometimes need
to wait for a branch point to pass, like in the "Intent to Remove:
hspace/vspace attributes on table."

Philip

> To unsubscribe from this group and stop receiving emails from it, send an
> email to blink-dev+...@chromium.org.

[Yoav Weiss]

+1 to making such branch announcement a regular thing :)

[Thiago Farina]

On Thu, Jan 15, 2015 at 7:05 AM, Jochen Eisinger <joc...@chromium.org> wrote:

Hey all,

we branched for M41. Details:

Branch number: 2272

Branched chromium at rev: 310958

This looks like the 'Cr-Commit-Position'. With sha1 it is easier to see which commit this rev is referring to. Maybe in the next announce you can use the sha1 instead? Or both?

+1 for making this a regular thing too!

--

Thiago Farina

[Jochen Eisinger]

I plan to send such an announcement (or make sure it's being send) every milestone now.

best

-jochen

[PhistucK]

Both of them is surely better than only the SHA1 or hash.

☆PhistucK

To unsubscribe from this group and stop receiving emails from it, send an email to blink-dev+...@chromium.org.

[James Robinson]

On Thu, Jan 15, 2015 at 7:59 AM, Thiago Farina <tfa...@chromium.org> wrote:

On Thu, Jan 15, 2015 at 7:05 AM, Jochen Eisinger <joc...@chromium.org> wrote:

Hey all,

we branched for M41. Details:

Branch number: 2272

Branched chromium at rev: 310958

This looks like the 'Cr-Commit-Position'. With sha1 it is easier to see which commit this rev is referring to. Maybe in the next announce you can use the sha1 instead? Or both?

https://crrev.com/310958 tells you this

Or if you want an API here: https://apis-explorer.appspot.com/apis-explorer/?base=https://cr-rev.appspot.com/_ah/api#p/crrev/v1/

you could build a chrome extension on top of that if you wanted.

- James

[Jakob Kummerow]

Or simply look at omahaproxy.appspot.com for any build with the given branch number (2272 in this case).

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev

[Matt Giuca]

Please don't stop giving Cr-Commit-Positions (anywhere). I argued hard to have Cr-Commit-Position in the first place and it makes version management (like bisecting, bug diagnosis, merging, etc) immeasurably easier. So please, use commit position wherever you can when describing versions, like when you report a bug from ToT.

A hash is only useful when specifically using the Git tool. A commit position can be used for activities outside of Git like checking whether a commit made it into the branch, without having to use tools to do so.

[Thiago Farina]

On Thu, Jan 15, 2015 at 10:39 PM, Matt Giuca <mgi...@chromium.org> wrote:

Please don't stop giving Cr-Commit-Positions (anywhere). I argued hard to have Cr-Commit-Position in the first place and it makes version management (like bisecting, bug diagnosis, merging, etc) immeasurably easier. So please, use commit position wherever you can when describing versions, like when you report a bug from ToT.

A hash is only useful when specifically using the Git tool. A commit position can be used for activities outside of Git like checking whether a commit made it into the branch, without having to use tools to do so.

With the hash you can figure out it easily:

$ git show sha1

And the commit message will show you the commit position.

On other hand you can't do the same with Cr-Commit-Position in hand without navigating to crrev.com/ for example (I didn't know it was possible to do that until recently).

So since we are in the Git world, I think we should favorable its tools rather than some other custom alternatives.

I think there can be arguments both ways.

--

Thiago Farina

[Steve Kobes]

Could we write a git extension that looks up a commit by its Cr-Commit-Position?

[Noel Gordon]

On 16 January 2015 at 12:44, Steve Kobes <sko...@chromium.org> wrote:

Could we write a git extension that looks up a commit by its Cr-Commit-Position?

Maybe, or even bash if it's available 

% git log -1 $(git rev-parse :/#310958)

~noel

[Steve Kobes]

On Thu, Jan 15, 2015 at 6:39 PM, Noel Gordon <no...@chromium.org> wrote:

% git log -1 $(git rev-parse :/#310958)

Thanks, I was hoping there was already a one-liner for it. :)

[Noel Gordon]

:) The rev-parse leader :/ makes the command grep-ish.  You could increase accurary for example with:

% git log -1 $(git rev-parse :/ads/master.*#310958)

~noel

[Stefan Zager]

On Thu Jan 15 2015 at 5:44:25 PM Steve Kobes <sko...@chromium.org> wrote:

Could we write a git extension that looks up a commit by its Cr-Commit-Position?

I created a 'git crrev-parse' command by putting this in a file called 'git-crrev-parse' which is in my $PATH:

#!/bin/bash

while [ -n "$1" ]; do

  if [[ "$1" = "Cr-Commit-Position:" ]] && [[ "$2" =~ .*@\{#[0-9][0-9]*\} ]]; then

    commit_pos="$2"

    shift

  else

    commit_pos="${1#*Cr-Commit-Position: }"

  fi

  ref="${commit_pos%@\{#*\}}"

  if [ "$ref" = "$commit_pos" -o -z "$ref" ]; then

    ref="refs/heads/master"

  fi

  ref="${ref/refs\/heads/refs\/remotes\/origin}"

  ref="${ref/refs\/branch-heads/refs\/remotes\/branch-heads}"

  num="${commit_pos#*@\{\#}"

  num="${num%\}}"

  

  if [ -z "$ref" -o -z "$num" ]; then

    git rev-parse "$1"

  else

    git rev-list -n 1 --grep="$commit_pos" "$ref"

  fi

  shift

done

It accepts any of these input formats:

$ git crrev-parse Cr-Commit-Position: refs/heads/master@{#311769}

$ git crrev-parse '    Cr-Commit-Position: refs/heads/master@{#311769}'

$ git crrev-parse 'Cr-Commit-Position: refs/heads/master@{#311769}'

$ git crrev-parse refs/heads/master@{#311769}

It also works for branches (assuming you have branches in your local checkout):

$ git crrev-parse Cr-Commit-Position: refs/branch-heads/2278@{#2}

If you don't specify a branch, refs/heads/master is assumed:

$ git crrev-parse @{#311769}

$ git crrev-parse #311769

$ git crrev-parse 311769

If people think this is useful, I will commit it to depot_tools.

[Steve Kobes]

Yes, it is useful :)

Bikeshedding suggestions:

- call it "git crrev" (faster to type)

- display the entire commit by default, like "git show", and have a flag to print only the hash.

[Matt Giuca]

Splitting this discussion into a separate thread (see quoted part for context).

Yeah, it sounds very useful -- thanks Stefan!

For some more bike-shedding:

• I think you should do both or neither of Steve's suggestions; that is: if it only prints the hash, it should be called crrev-parse (by analogy with rev-parse; it's immediately obvious what it should do, and if someone wants to shorten it they can make an alias). If it does a "git show" then it should be called crrev, to avoid confusion with rev-parse.
• I like Steve's suggestions, but printing the full diff will be a bit noisy. Prefer for it to behave like git show --quiet (show the commit message and metadata but not the diff).

[Stefan Zager]

On Sun Jan 18 2015 at 3:05:27 PM Matt Giuca <mgi...@chromium.org> wrote:

Splitting this discussion into a separate thread (see quoted part for context).

Yeah, it sounds very useful -- thanks Stefan!

For some more bike-shedding:

• I think you should do both or neither of Steve's suggestions; that is: if it only prints the hash, it should be called crrev-parse (by analogy with rev-parse; it's immediately obvious what it should do, and if someone wants to shorten it they can make an alias). If it does a "git show" then it should be called crrev, to avoid confusion with rev-parse.

I committed the script to depot_tools as git-crrev-parse.  Its behavior is analogous to git-rev-parse, i.e., it just prints an unadorned git hash. 

[Thiago Farina]

I'm trying this. I want to get the sha1 for https://src.chromium.org/viewvc/chrome?revision=285367&view=revision

$ git crrev-parse 285367

fatal: ambiguous argument 'refs\/remotes\/origin/master': unknown revision or path not in the working tree.

Use '--' to separate paths from revisions

What is the correct command line for this?

--

Thiago Farina

[Stefan Zager]

On Thu Feb 12 2015 at 10:02:33 AM Thiago Farina <tfa...@chromium.org> wrote:

I'm trying this. I want to get the sha1 for https://src.chromium.org/viewvc/chrome?revision=285367&view=revision

$ git crrev-parse 285367

fatal: ambiguous argument 'refs\/remotes\/origin/master': unknown revision or path not in the working tree.

Use '--' to separate paths from revisions

What is the correct command line for this?

git crrev-parse doesn't work for pre-git-migration commits.  For that, you have to use the old 'git svn find-rev' command (which depends on your checkout having the old git-svn setup):

$ git svn find-rev r285367

3ffa36ac334638a691f804b468d2d359feba2de8

[Scott Graham]

Maybe it doesn't work on old revs? It fails to run on Windows, so not sure. It looks like it's expecting a more complex incantation from the comments at the top of depot_tools/git-crrev-parse.

Perhaps because that rev is old you need to use the git-on-svn version: `git svn find-rev r285367` which prints 3ffa36ac334638a691f804b468d2d359feba2de8.

[Steve Kobes]

If you don't have git-svn set up you can do

$ git log --grep=@285367

[Thiago Farina]

Aha! find-rev works for me. Probably time to add a new alias (find-sha1?).

After asking I went to `git log --author=brettw@ -- /path/to/file' to find that commit. Ick :(

--

Thiago Farina

[Daniel Bratell]

On Thu, 12 Feb 2015 19:24:22 +0100, Thiago Farina <tfa...@chromium.org> wrote:

On Thu, Feb 12, 2015 at 4:12 PM, Stefan Zager <sza...@chromium.org> wrote:

On Thu Feb 12 2015 at 10:02:33 AM Thiago Farina <tfa...@chromium.org> wrote:

I'm trying this. I want to get the sha1 for https://src.chromium.org/viewvc/chrome?revision=285367&view=revision

$ git crrev-parse 285367

fatal: ambiguous argument 'refs\/remotes\/origin/master': unknown revision or path not in the working tree.

Use '--' to separate paths from revisions

What is the correct command line for this?

git crrev-parse doesn't work for pre-git-migration commits.  For that, you have to use the old 'git svn find-rev' command (which depends on your checkout having the old git-svn setup):

$ git svn find-rev r285367

3ffa36ac334638a691f804b468d2d359feba2de8

Aha! find-rev works for me. Probably time to add a new alias (find-sha1?).

git svn find-rev shouldn't be encouraged since it requires configuring git-svn and is crazily slow, especially so on Windows (it seems to spawn a billion perl processes and process creation is a heavy high level operation in Windows).

This is fast:

  git log --all --grep @r285367 --format=oneline

Small risk of finding unrelated commits but I can't remember that ever happening to me.

/Daniel