Add --progress to git submodule commands in x.py #56933

clarfonthey · 2018-12-17T22:17:57Z

This is a relatively new flag, but it means that git will indicate the progress of the update as it would with regular clones. This is especially helpful as some of the submodules are really big and it's difficult to tell if it's hanging or still updating.

rust-highfive · 2018-12-17T22:18:07Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

nikomatsakis · 2018-12-19T16:36:35Z

cc @rust-lang/infra -- I have no strong opinion about this. When was this flag added? Are we concerned about compatibility with older git installations? Maybe this can cause problems with non-interactive runs?

r? @Mark-Simulacrum to assign someone appropriate =)

Mark-Simulacrum · 2018-12-19T19:29:06Z

I personally think we can probably just go ahead and do this -- if we get bug reports then we can revert the PR. AFAICT, the option is present in the git version packaged with Ubuntu 18.04 (latest LTS) so in that regard I'd expect it to be fairly widely available.

@bors r+ rollup

bors · 2018-12-19T19:29:07Z

📌 Commit 6130fc8 has been approved by Mark-Simulacrum

clarfonthey · 2018-12-19T21:24:30Z

Did some digging and this was added in git 2.18.0, which was released around the end of June. The latest version is 2.20.0, so, this was two versions ago.

This isn't really to change the decision, but considering how I looked this up, I figured I'd mention it for good measure.

Mark-Simulacrum · 2018-12-19T21:32:50Z

I thought so too, but it seemed to work for me on git 2.17... so it feels like perhaps that information is misleading. I thought I'd noted it in my comment but I think I forgot to do so.

clarfonthey · 2018-12-19T21:52:23Z

Oh, I appear to be mistaken… the flag was added to git submodule add in 2.18.0, but to git submodule update in 2.11.0. We should have nothing to worry about, then.

…lacrum Add --progress to git submodule commands in x.py This is a relatively new flag, but it means that git will indicate the progress of the update as it would with regular clones. This is especially helpful as some of the submodules are really big and it's difficult to tell if it's hanging or still updating.

@ghost

Rollup of 20 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56842 (Add unstable VecDeque::rotate_{left|right}) - #56869 (Reduce search-index.js size) - #56887 (Disable field reordering for repr(int).) - #56892 (rustc: Update Clang used to build LLVM on Linux) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56917 (Simplify MIR generation for logical operations) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56941 (deny intra-doc link resolution failures in libstd) - #56964 (Remove `TokenStream::JointTree`.) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) Failed merges: r? @ghost

@ghost

Rollup of 20 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56842 (Add unstable VecDeque::rotate_{left|right}) - #56869 (Reduce search-index.js size) - #56887 (Disable field reordering for repr(int).) - #56892 (rustc: Update Clang used to build LLVM on Linux) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56917 (Simplify MIR generation for logical operations) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56941 (deny intra-doc link resolution failures in libstd) - #56964 (Remove `TokenStream::JointTree`.) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) Failed merges: r? @ghost

…lacrum Add --progress to git submodule commands in x.py This is a relatively new flag, but it means that git will indicate the progress of the update as it would with regular clones. This is especially helpful as some of the submodules are really big and it's difficult to tell if it's hanging or still updating.

Rollup of 25 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56936 (rename div_euc -> div_euclid, and mod_euc -> rem_euclid) - #56941 (deny intra-doc link resolution failures in libstd) - #56945 (Fix rustdoc-js tests) - #56967 (Replace current crate's searchIndex when regenerating) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) - #57011 (rustdoc: add new CLI flag to load static files from a different location) - #57027 (Optimize away a move) - #57034 (Inline tweaks) - #57039 (Update migrate warning wording.) - #57040 (Fix feature gate to point to 1.32.0 for `path_from_str`) - #57049 (Stabilize #[repr(packed(N))]) - #57050 (Fixed typo in HashMap documentation) - #57052 (Fix stabilization version numbers (exhaustive_integer_patterns + macro_literal_matcher))

glaubitz · 2018-12-23T12:56:44Z

I think this has caused a regression in Debian:

glaubitz@epyc:..rust/rust-m68k> ./x.py build
Updating only changed submodules
Updating submodule src/llvm
usage: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
   or: git submodule [--quiet] init [--] [<path>...]
   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
   or: git submodule [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
   or: git submodule [--quiet] foreach [--recursive] <command>
   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
failed to run: git submodule -q sync --progress src/llvm
Build completed unsuccessfully in 0:00:00
glaubitz@epyc:..rust/rust-m68k>

Has it been verified that this flag already works with the git version in Debian and Ubuntu?

Edit: The manpage for git-submodule mentions --progress, but I am still getting that error messsage. Odd.

pietroalbini · 2018-12-23T12:59:00Z

This indeed doesn't work with Ubuntu 16.04's git (git 2.7.4).

glaubitz · 2018-12-23T13:01:11Z

And reverting 6130fc8 fixes it for me. I'm on Debian unstable with git 2.20.1.

matthiaskrgr · 2018-12-23T13:22:01Z

#57082 will revert back to a working state until this is sorted out.

nrc · 2019-01-11T01:33:55Z

I have an older version of Git on my build server (because updating Linux is a shit show) and this breaks my build :-( There's an easy work around for me, so it doesn't need to be backed out, but we might consider users with older Git.

Mark-Simulacrum · 2019-01-11T04:35:11Z

I think this has already been reverted? If Ubuntu 16.04 as the previous LTS has turned out to be too old I think a revert is warranted myself.

nrc · 2019-01-11T05:07:32Z

No, it was partially reverted. I have 16.10, and that seems to be too old to have --progress

froydnj · 2019-04-25T20:22:47Z

@Mark-Simulacrum are you still willing to revert this? The patch was only partially reverted in #57082, and I ran into #57080 today (Ubuntu 16.04 LTS).

Mark-Simulacrum · 2019-04-26T01:24:09Z

Yes, I think either reverting or rerunning if the git command fails makes sense.

clarfonthey · 2019-04-26T02:56:54Z

I think that rerunning if it fails is probably best considering how the lack of progress makes it incredibly difficult to see how long the command is going to take, or what part it's hanging on.

rust-highfive assigned nikomatsakis Dec 17, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2018

Add --progress to git submodule commands

6130fc8

clarfonthey force-pushed the xpy_progress branch from 3a0a626 to 6130fc8 Compare December 17, 2018 22:19

clarfonthey changed the title ~~Add --progress to git submodule update in x.py~~ Add --progress to git submodule commands in x.py Dec 17, 2018

rust-highfive assigned Mark-Simulacrum and unassigned nikomatsakis Dec 19, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2018

pietroalbini mentioned this pull request Dec 20, 2018

Rollup of 19 pull requests #57005

Closed

Mark-Simulacrum mentioned this pull request Dec 21, 2018

Rollup of 22 pull requests #57022

Closed

pietroalbini mentioned this pull request Dec 21, 2018

Rollup of 20 pull requests #57025

Closed

Centril mentioned this pull request Dec 22, 2018

Rollup of 41 pull requests #57058

Closed

kennytm mentioned this pull request Dec 22, 2018

Rollup of 25 pull requests #57063

Merged

bors merged commit 6130fc8 into rust-lang:master Dec 23, 2018

matthiaskrgr mentioned this pull request Dec 23, 2018

x.py build no longer works with outdated submodules #57080

Closed

clarfonthey deleted the xpy_progress branch December 23, 2018 19:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add --progress to git submodule commands in x.py #56933

Add --progress to git submodule commands in x.py #56933

clarfonthey commented Dec 17, 2018

rust-highfive commented Dec 17, 2018

nikomatsakis commented Dec 19, 2018

Mark-Simulacrum commented Dec 19, 2018

bors commented Dec 19, 2018

clarfonthey commented Dec 19, 2018

Mark-Simulacrum commented Dec 19, 2018

clarfonthey commented Dec 19, 2018

glaubitz commented Dec 23, 2018 •

edited

Loading

pietroalbini commented Dec 23, 2018 •

edited

Loading

glaubitz commented Dec 23, 2018

matthiaskrgr commented Dec 23, 2018

nrc commented Jan 11, 2019

Mark-Simulacrum commented Jan 11, 2019

nrc commented Jan 11, 2019

froydnj commented Apr 25, 2019

Mark-Simulacrum commented Apr 26, 2019

clarfonthey commented Apr 26, 2019

Add --progress to git submodule commands in x.py #56933

Add --progress to git submodule commands in x.py #56933

Conversation

clarfonthey commented Dec 17, 2018

rust-highfive commented Dec 17, 2018

nikomatsakis commented Dec 19, 2018

Mark-Simulacrum commented Dec 19, 2018

bors commented Dec 19, 2018

clarfonthey commented Dec 19, 2018

Mark-Simulacrum commented Dec 19, 2018

clarfonthey commented Dec 19, 2018

glaubitz commented Dec 23, 2018 • edited Loading

pietroalbini commented Dec 23, 2018 • edited Loading

glaubitz commented Dec 23, 2018

matthiaskrgr commented Dec 23, 2018

nrc commented Jan 11, 2019

Mark-Simulacrum commented Jan 11, 2019

nrc commented Jan 11, 2019

froydnj commented Apr 25, 2019

Mark-Simulacrum commented Apr 26, 2019

clarfonthey commented Apr 26, 2019

glaubitz commented Dec 23, 2018 •

edited

Loading

pietroalbini commented Dec 23, 2018 •

edited

Loading