josh sync stdarch

[maurer]

Sync PR to support #148951 generated via josh-proxy

[rustbot]

stdarch is developed in its own repository. If possible, consider making this change to rust-lang/stdarch instead.

cc @Amanieu, @folkertdev, @sayantn

[rustbot]

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[rustbot]

⚠️ Warning ⚠️

• The following commits have merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

  • 2788686
  • 2922cbd
  • 485ea04
  • 57436fe
  • 5914877
  • 7f3fcb3
  • 849ace0
  • 84c44c4
  • 8dc0761
  • b851387
  • c610b1d
  • d84c695
  • ff78b84

  You can start a rebase with the following commands:

  $ # rebase
  $ git pull --rebase https://github.com/rust-lang/rust.git main
  $ git push --force-with-lease
  

[folkertdev]

You'll likely need to sync the other way first for this to work smoothly.

[maurer]

Ah, OK. I'll try doing a pull first before the push then. New to the josh tool.

[folkertdev]

Also you'll need to enable the avx10_target_feature feature over here (in a separate commit):

rust/library/core/src/lib.rs

Line 207 in 07bdbae

#![feature(x86_amx_intrinsics)]

[folkertdev]

Hmm I'm getting

> rustc-josh-sync pull
Updating/installing josh-proxy binary...
josh up and running
previous upstream base: 8401398e1f14a24670ee1a3203713dc2f0f8b3a8
new upstream base: 07bdbaedc63094281483c40a88a1a8f2f8ffadc5
original local HEAD: 50134e10cbd2f81a068259d7796aff2471aae7c1
incoming ref: b477f55437c0afb0690197326bd65e6cba95521f
Merge made by the 'ort' strategy.
Only empty changes were pulled. Rolling back.
Reverting HEAD to 50134e10cbd2f81a068259d7796aff2471aae7c1
Nothing to pull

did you perform the push from the latest stdarch/main commit (we switched branch names)?

[maurer]

I ran (with HEAD at upstream/main)

git push "http://localhost:40960/maurer/rust.git:/library/stdarch.git" "HEAD:refs/heads/remove-tme-josh"

because rustc-josh-sync push reliably gives me

Error: cannot perform push

Caused by:
    Command `cd "/usr/local/google/home/mmaurer/github/stdarch" && "git" "push" "http://localhost:42042/maurer/rust.git:/library/stdarch.git" "HEAD:remove-tme-josh7"` failed with exit code Some(1). STDOUT:
    
    STDERR:
    error: The destination you provided is not a full refname (i.e.,
    starting with "refs/"). We tried to guess what you meant by:
    
    - Looking for a ref that matches 'remove-tme-josh7' on the remote side.
    - Checking if the <src> being pushed ('HEAD')
      is a ref in "refs/{heads,tags}/". If so we add a corresponding
      refs/{heads,tags}/ prefix on the remote side.
    
    Neither worked, so we gave up. You must fully qualify the ref.
    hint: The <src> part of the refspec is a commit object.
    hint: Did you mean to create a new branch by pushing to
    hint: 'HEAD:refs/heads/remove-tme-josh7'?
    error: failed to push some refs to 'http://localhost:42042/maurer/rust.git:/library/stdarch.git'

[folkertdev]

I propose we try to merge #149118 instead so we don't need to deal with the merge commits here

[maurer]

Great, I'll rebase on top of that instead

[folkertdev]

and cc @Kobzol, hopefully we can make the Josh process smoother than this? I remember getting this error (it's in our Zulip conversion) but it apparently disappeared when I synchronized everything.

The fix may be your equivealent of specifying the path to the rust repo explicitly, e.g. RUSTC_GIT=/path/to/rust rustc-josh-sync push ...

[maurer]

Closed in favor of #149118

[maurer]

The fix may be your equivealent of specifying the path to the rust repo explicitly, e.g. RUSTC_GIT=/path/to/rust rustc-josh-sync push ...

I tried the command with and without a reference rustc checkout, to the same error.

[Kobzol]

I think that this error was related to using SSH authentication? josh-sync mostly supports HTTPS pushes, for SSH some additional setup might be needed (https://github.com/rust-lang/josh-sync?tab=readme-ov-file#git-peculiarities).

Also, why was the branch named remove-tme-josh7, with the 7 at the end? Looks a bit weird, did you have a branch with the same name locally?

[maurer]

I had a 7 at the end because I had tried 6 times previously with different configurations, and josh-sync is unhappy if the branch already exists.

I had set the instead-of rewrite, that was required for branch creation to work at all.

[Kobzol]

I wonder if this is a difference caused by the git version. So just adding "refs/heads/" fixed this for you? I can easily add this to josh-sync.

[Kobzol]

Can you please try if this version of josh-sync helps?