diff --git a/cli/build.rs b/cli/build.rs index 2d626380f30..c4f35a92034 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; use std::process::Command; diff --git a/cli/examples/custom-backend/main.rs b/cli/examples/custom-backend/main.rs index 08145d69bd5..ab7d5e9eb31 100644 --- a/cli/examples/custom-backend/main.rs +++ b/cli/examples/custom-backend/main.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::any::Any; use std::io::Read; diff --git a/cli/examples/custom-command/main.rs b/cli/examples/custom-command/main.rs index bdcf657491b..9dffecbdcc1 100644 --- a/cli/examples/custom-command/main.rs +++ b/cli/examples/custom-command/main.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write as _; diff --git a/cli/examples/custom-global-flag/main.rs b/cli/examples/custom-global-flag/main.rs index c557fe8bb44..50d134b64f9 100644 --- a/cli/examples/custom-global-flag/main.rs +++ b/cli/examples/custom-global-flag/main.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write as _; diff --git a/cli/examples/custom-working-copy/main.rs b/cli/examples/custom-working-copy/main.rs index 4f3ef0098cd..c4cfee2494d 100644 --- a/cli/examples/custom-working-copy/main.rs +++ b/cli/examples/custom-working-copy/main.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::any::Any; use std::path::{Path, PathBuf}; diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs index d9e0b3c5c54..ebda6d16468 100644 --- a/cli/src/cli_util.rs +++ b/cli/src/cli_util.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use core::fmt; use std::collections::{HashMap, HashSet}; diff --git a/cli/src/commands/abandon.rs b/cli/src/commands/abandon.rs index 2b3f8ab512c..7f10f5f660a 100644 --- a/cli/src/commands/abandon.rs +++ b/cli/src/commands/abandon.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/backout.rs b/cli/src/commands/backout.rs index abfd009b1cc..98214bf1e1c 100644 --- a/cli/src/commands/backout.rs +++ b/cli/src/commands/backout.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::object_id::ObjectId; use jj_lib::rewrite::back_out_commit; diff --git a/cli/src/commands/bench.rs b/cli/src/commands/bench.rs index 49b3c6ab7ef..405c15dddf7 100644 --- a/cli/src/commands/bench.rs +++ b/cli/src/commands/bench.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fmt::Debug; use std::io; diff --git a/cli/src/commands/branch.rs b/cli/src/commands/branch.rs index 570da5d78ae..a44b692b186 100644 --- a/cli/src/commands/branch.rs +++ b/cli/src/commands/branch.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashSet; use std::fmt; diff --git a/cli/src/commands/cat.rs b/cli/src/commands/cat.rs index 840b6960f54..6768936eaca 100644 --- a/cli/src/commands/cat.rs +++ b/cli/src/commands/cat.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/checkout.rs b/cli/src/commands/checkout.rs index 7d446faedcd..6dc5e69a473 100644 --- a/cli/src/commands/checkout.rs +++ b/cli/src/commands/checkout.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::object_id::ObjectId; use tracing::instrument; diff --git a/cli/src/commands/chmod.rs b/cli/src/commands/chmod.rs index 6c91a427fe9..20b844e7343 100644 --- a/cli/src/commands/chmod.rs +++ b/cli/src/commands/chmod.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::backend::TreeValue; diff --git a/cli/src/commands/commit.rs b/cli/src/commands/commit.rs index 458e8593b39..9c5e1d52638 100644 --- a/cli/src/commands/commit.rs +++ b/cli/src/commands/commit.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::object_id::ObjectId; use jj_lib::repo::Repo; diff --git a/cli/src/commands/config.rs b/cli/src/commands/config.rs index 3ed0efbca56..cb230e55f34 100644 --- a/cli/src/commands/config.rs +++ b/cli/src/commands/config.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/debug.rs b/cli/src/commands/debug.rs index f458b17f18e..11df78572ce 100644 --- a/cli/src/commands/debug.rs +++ b/cli/src/commands/debug.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::any::Any; use std::fmt::Debug; diff --git a/cli/src/commands/describe.rs b/cli/src/commands/describe.rs index c6d15eb16b8..442eb0376be 100644 --- a/cli/src/commands/describe.rs +++ b/cli/src/commands/describe.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::{self, Read, Write}; diff --git a/cli/src/commands/diff.rs b/cli/src/commands/diff.rs index 1a1706e426c..08e80b30ca9 100644 --- a/cli/src/commands/diff.rs +++ b/cli/src/commands/diff.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::rewrite::merge_commit_trees; use tracing::instrument; diff --git a/cli/src/commands/diffedit.rs b/cli/src/commands/diffedit.rs index d077237fd9e..625d80400ae 100644 --- a/cli/src/commands/diffedit.rs +++ b/cli/src/commands/diffedit.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/duplicate.rs b/cli/src/commands/duplicate.rs index 703bdd95977..23c9d237d17 100644 --- a/cli/src/commands/duplicate.rs +++ b/cli/src/commands/duplicate.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/edit.rs b/cli/src/commands/edit.rs index f48aecb0483..405b92c267a 100644 --- a/cli/src/commands/edit.rs +++ b/cli/src/commands/edit.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/files.rs b/cli/src/commands/files.rs index bbc3df4b8f8..6b8c1c01735 100644 --- a/cli/src/commands/files.rs +++ b/cli/src/commands/files.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/git.rs b/cli/src/commands/git.rs index 3c6990ea431..3298d067e5c 100644 --- a/cli/src/commands/git.rs +++ b/cli/src/commands/git.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashSet; use std::io::Write; diff --git a/cli/src/commands/init.rs b/cli/src/commands/init.rs index 9230b68cb54..e44d41996d9 100644 --- a/cli/src/commands/init.rs +++ b/cli/src/commands/init.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/interdiff.rs b/cli/src/commands/interdiff.rs index b83f5f3b691..c4f99c1df68 100644 --- a/cli/src/commands/interdiff.rs +++ b/cli/src/commands/interdiff.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use clap::ArgGroup; use jj_lib::rewrite::rebase_to_dest_parent; diff --git a/cli/src/commands/log.rs b/cli/src/commands/log.rs index 864b9b3c137..2126deeffce 100644 --- a/cli/src/commands/log.rs +++ b/cli/src/commands/log.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::backend::CommitId; diff --git a/cli/src/commands/merge.rs b/cli/src/commands/merge.rs index f1e1b7c4cd2..f260902d467 100644 --- a/cli/src/commands/merge.rs +++ b/cli/src/commands/merge.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use tracing::instrument; diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 6acca1c5c83..41e30b5f82b 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 mod abandon; mod backout; diff --git a/cli/src/commands/move.rs b/cli/src/commands/move.rs index 59e18bb6103..19ca6dcf12a 100644 --- a/cli/src/commands/move.rs +++ b/cli/src/commands/move.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use clap::ArgGroup; use jj_lib::object_id::ObjectId; diff --git a/cli/src/commands/new.rs b/cli/src/commands/new.rs index e17657996b5..26972c4eb7a 100644 --- a/cli/src/commands/new.rs +++ b/cli/src/commands/new.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/next.rs b/cli/src/commands/next.rs index ead6ecbf945..98bc8f17c32 100644 --- a/cli/src/commands/next.rs +++ b/cli/src/commands/next.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/obslog.rs b/cli/src/commands/obslog.rs index fccd1131f6d..41aeff2acd8 100644 --- a/cli/src/commands/obslog.rs +++ b/cli/src/commands/obslog.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::commit::Commit; use jj_lib::dag_walk::topo_order_reverse; diff --git a/cli/src/commands/operation.rs b/cli/src/commands/operation.rs index 829e14d5141..f054c936161 100644 --- a/cli/src/commands/operation.rs +++ b/cli/src/commands/operation.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write as _; use std::slice; diff --git a/cli/src/commands/prev.rs b/cli/src/commands/prev.rs index 2da2fadf2e6..de79535a2b5 100644 --- a/cli/src/commands/prev.rs +++ b/cli/src/commands/prev.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::repo::Repo; diff --git a/cli/src/commands/rebase.rs b/cli/src/commands/rebase.rs index dabda339891..440797ea380 100644 --- a/cli/src/commands/rebase.rs +++ b/cli/src/commands/rebase.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashMap; use std::io::Write; diff --git a/cli/src/commands/resolve.rs b/cli/src/commands/resolve.rs index 9f4260a5158..8f54b97a386 100644 --- a/cli/src/commands/resolve.rs +++ b/cli/src/commands/resolve.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::BTreeMap; use std::io::Write; diff --git a/cli/src/commands/restore.rs b/cli/src/commands/restore.rs index f9d11bdb6fb..5fda40a6fb4 100644 --- a/cli/src/commands/restore.rs +++ b/cli/src/commands/restore.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/root.rs b/cli/src/commands/root.rs index 54794f7a268..408531bbd8b 100644 --- a/cli/src/commands/root.rs +++ b/cli/src/commands/root.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use tracing::instrument; diff --git a/cli/src/commands/run.rs b/cli/src/commands/run.rs index 82f28c5aacd..087dbc91280 100644 --- a/cli/src/commands/run.rs +++ b/cli/src/commands/run.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! This file contains the internal implementation of `run`. diff --git a/cli/src/commands/show.rs b/cli/src/commands/show.rs index 082d8c64f00..fdab0d6dc62 100644 --- a/cli/src/commands/show.rs +++ b/cli/src/commands/show.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::matchers::EverythingMatcher; use tracing::instrument; diff --git a/cli/src/commands/sparse.rs b/cli/src/commands/sparse.rs index bf313789f2d..68105a8f65b 100644 --- a/cli/src/commands/sparse.rs +++ b/cli/src/commands/sparse.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashSet; use std::fmt::Write as _; diff --git a/cli/src/commands/split.rs b/cli/src/commands/split.rs index 7b1563a7617..2cbdec7b168 100644 --- a/cli/src/commands/split.rs +++ b/cli/src/commands/split.rs @@ -1,16 +1,6 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 + use std::io::Write; use jj_lib::object_id::ObjectId; diff --git a/cli/src/commands/squash.rs b/cli/src/commands/squash.rs index c91624ed8f7..ec3269a0a93 100644 --- a/cli/src/commands/squash.rs +++ b/cli/src/commands/squash.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use clap::parser::ValueSource; use jj_lib::object_id::ObjectId; diff --git a/cli/src/commands/status.rs b/cli/src/commands/status.rs index 32bfd644f1e..8298e2bdf08 100644 --- a/cli/src/commands/status.rs +++ b/cli/src/commands/status.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::matchers::EverythingMatcher; diff --git a/cli/src/commands/tag.rs b/cli/src/commands/tag.rs index 1dd7afc6a7a..95a4309c8d8 100644 --- a/cli/src/commands/tag.rs +++ b/cli/src/commands/tag.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::str_util::StringPattern; diff --git a/cli/src/commands/unsquash.rs b/cli/src/commands/unsquash.rs index 113ef3ba8df..3354438b8ff 100644 --- a/cli/src/commands/unsquash.rs +++ b/cli/src/commands/unsquash.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::matchers::EverythingMatcher; use jj_lib::object_id::ObjectId; diff --git a/cli/src/commands/untrack.rs b/cli/src/commands/untrack.rs index 0f1fc6561d2..5885f0998c5 100644 --- a/cli/src/commands/untrack.rs +++ b/cli/src/commands/untrack.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/util.rs b/cli/src/commands/util.rs index c4d6e3426cd..801dde1e740 100644 --- a/cli/src/commands/util.rs +++ b/cli/src/commands/util.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; use std::slice; diff --git a/cli/src/commands/version.rs b/cli/src/commands/version.rs index f182d561d75..f1d3048bbf9 100644 --- a/cli/src/commands/version.rs +++ b/cli/src/commands/version.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/src/commands/workspace.rs b/cli/src/commands/workspace.rs index 5158ab8241f..fe179a419d7 100644 --- a/cli/src/commands/workspace.rs +++ b/cli/src/commands/workspace.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fmt::Debug; use std::fs; diff --git a/cli/src/commit_templater.rs b/cli/src/commit_templater.rs index 50e28ecc8f6..452238401e7 100644 --- a/cli/src/commit_templater.rs +++ b/cli/src/commit_templater.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cmp::max; use std::collections::HashMap; diff --git a/cli/src/config.rs b/cli/src/config.rs index 453d7dabedf..b3f73aeb3e6 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::borrow::Cow; use std::collections::{HashMap, HashSet}; diff --git a/cli/src/diff_util.rs b/cli/src/diff_util.rs index 52ded4013bc..45bb3f7db66 100644 --- a/cli/src/diff_util.rs +++ b/cli/src/diff_util.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cmp::max; use std::collections::VecDeque; diff --git a/cli/src/formatter.rs b/cli/src/formatter.rs index a215f87fa29..9b4293fd10e 100644 --- a/cli/src/formatter.rs +++ b/cli/src/formatter.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::borrow::BorrowMut; use std::collections::HashMap; diff --git a/cli/src/git_util.rs b/cli/src/git_util.rs index df0b467e037..f0ede4a4240 100644 --- a/cli/src/git_util.rs +++ b/cli/src/git_util.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Git utilities shared by various commands. diff --git a/cli/src/graphlog.rs b/cli/src/graphlog.rs index 74daa1c2983..b7f665f8760 100644 --- a/cli/src/graphlog.rs +++ b/cli/src/graphlog.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::hash::Hash; use std::io; diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 32bb24a92de..029bc6f984c 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![deny(unused_must_use)] diff --git a/cli/src/main.rs b/cli/src/main.rs index 8b2b2943d8c..b13fe4b1d5a 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_cli::cli_util::CliRunner; diff --git a/cli/src/merge_tools/mod.rs b/cli/src/merge_tools/mod.rs index 4f4ae0eaf41..590cc56375c 100644 --- a/cli/src/merge_tools/mod.rs +++ b/cli/src/merge_tools/mod.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 mod builtin; mod external; diff --git a/cli/src/operation_templater.rs b/cli/src/operation_templater.rs index 0b1384f155d..bc0aaad7392 100644 --- a/cli/src/operation_templater.rs +++ b/cli/src/operation_templater.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io; diff --git a/cli/src/template.pest b/cli/src/template.pest index b40f71a6adf..6685b1890cc 100644 --- a/cli/src/template.pest +++ b/cli/src/template.pest @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 // Example: // "commit: " ++ short(commit_id) ++ "\n" diff --git a/cli/src/template_builder.rs b/cli/src/template_builder.rs index 13933158b61..fe3a7a798b2 100644 --- a/cli/src/template_builder.rs +++ b/cli/src/template_builder.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashMap; diff --git a/cli/src/template_parser.rs b/cli/src/template_parser.rs index 61fbb865e5b..c3724337084 100644 --- a/cli/src/template_parser.rs +++ b/cli/src/template_parser.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashMap; use std::num::ParseIntError; diff --git a/cli/src/templater.rs b/cli/src/templater.rs index 623692e6dee..34f0d151455 100644 --- a/cli/src/templater.rs +++ b/cli/src/templater.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cell::RefCell; use std::io; diff --git a/cli/src/text_util.rs b/cli/src/text_util.rs index cefcd1b143c..27cb42a33a6 100644 --- a/cli/src/text_util.rs +++ b/cli/src/text_util.rs @@ -1,16 +1,5 @@ -// Copyright 2022-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::borrow::Cow; use std::{cmp, io}; diff --git a/cli/src/ui.rs b/cli/src/ui.rs index d7d19a4a4dc..a5e55a25194 100644 --- a/cli/src/ui.rs +++ b/cli/src/ui.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::{IsTerminal as _, Stderr, StderrLock, Stdout, StdoutLock, Write}; use std::process::{Child, ChildStdin, Stdio}; diff --git a/cli/testing/fake-diff-editor.rs b/cli/testing/fake-diff-editor.rs index c76e17f56a0..3e41877f36d 100644 --- a/cli/testing/fake-diff-editor.rs +++ b/cli/testing/fake-diff-editor.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashSet; use std::path::{Path, PathBuf}; diff --git a/cli/testing/fake-editor.rs b/cli/testing/fake-editor.rs index caa3f473dd2..a7b71a37fc8 100644 --- a/cli/testing/fake-editor.rs +++ b/cli/testing/fake-editor.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::PathBuf; use std::process::exit; diff --git a/cli/tests/common/mod.rs b/cli/tests/common/mod.rs index 6197fae5049..5d95fe6b283 100644 --- a/cli/tests/common/mod.rs +++ b/cli/tests/common/mod.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cell::RefCell; use std::collections::HashMap; diff --git a/cli/tests/test_abandon_command.rs b/cli/tests/test_abandon_command.rs index 840899814e2..b632d0f64fc 100644 --- a/cli/tests/test_abandon_command.rs +++ b/cli/tests/test_abandon_command.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_alias.rs b/cli/tests/test_alias.rs index 712e25f9134..60fa51db9d2 100644 --- a/cli/tests/test_alias.rs +++ b/cli/tests/test_alias.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fs; diff --git a/cli/tests/test_branch_command.rs b/cli/tests/test_branch_command.rs index e957e6d6676..85739c3249e 100644 --- a/cli/tests/test_branch_command.rs +++ b/cli/tests/test_branch_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_builtin_aliases.rs b/cli/tests/test_builtin_aliases.rs index b8c1c847762..a87c766591d 100644 --- a/cli/tests/test_builtin_aliases.rs +++ b/cli/tests/test_builtin_aliases.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::PathBuf; diff --git a/cli/tests/test_cat_command.rs b/cli/tests/test_cat_command.rs index 8c093bbb6c1..b9d89b80037 100644 --- a/cli/tests/test_cat_command.rs +++ b/cli/tests/test_cat_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_checkout.rs b/cli/tests/test_checkout.rs index b52e065a0d8..a5fdad04a7f 100644 --- a/cli/tests/test_checkout.rs +++ b/cli/tests/test_checkout.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_chmod_command.rs b/cli/tests/test_chmod_command.rs index ac4fbeb2667..04ffadc21e0 100644 --- a/cli/tests/test_chmod_command.rs +++ b/cli/tests/test_chmod_command.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_commit_command.rs b/cli/tests/test_commit_command.rs index 233859e9981..833b4df9ab2 100644 --- a/cli/tests/test_commit_command.rs +++ b/cli/tests/test_commit_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_commit_template.rs b/cli/tests/test_commit_template.rs index 13eda0c4fac..29d8baca4b3 100644 --- a/cli/tests/test_commit_template.rs +++ b/cli/tests/test_commit_template.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use regex::Regex; diff --git a/cli/tests/test_concurrent_operations.rs b/cli/tests/test_concurrent_operations.rs index 12136e3e8ff..cf8f57d3a29 100644 --- a/cli/tests/test_concurrent_operations.rs +++ b/cli/tests/test_concurrent_operations.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_config_command.rs b/cli/tests/test_config_command.rs index 483c70ad7a7..2d452757a01 100644 --- a/cli/tests/test_config_command.rs +++ b/cli/tests/test_config_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use insta::assert_snapshot; use itertools::Itertools; diff --git a/cli/tests/test_debug_command.rs b/cli/tests/test_debug_command.rs index 636dc659a35..a9f334fb8c9 100644 --- a/cli/tests/test_debug_command.rs +++ b/cli/tests/test_debug_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use insta::assert_snapshot; use regex::Regex; diff --git a/cli/tests/test_describe_command.rs b/cli/tests/test_describe_command.rs index 1a6fc112694..cfbbe30b822 100644 --- a/cli/tests/test_describe_command.rs +++ b/cli/tests/test_describe_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::{get_stderr_string, TestEnvironment}; diff --git a/cli/tests/test_diff_command.rs b/cli/tests/test_diff_command.rs index 93063b0b065..c6096f3b956 100644 --- a/cli/tests/test_diff_command.rs +++ b/cli/tests/test_diff_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; diff --git a/cli/tests/test_diffedit_command.rs b/cli/tests/test_diffedit_command.rs index 3c7b93790af..b1268ee2bb1 100644 --- a/cli/tests/test_diffedit_command.rs +++ b/cli/tests/test_diffedit_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::{escaped_fake_diff_editor_path, TestEnvironment}; diff --git a/cli/tests/test_duplicate_command.rs b/cli/tests/test_duplicate_command.rs index efce45ed55f..d41c1e343f5 100644 --- a/cli/tests/test_duplicate_command.rs +++ b/cli/tests/test_duplicate_command.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_edit_command.rs b/cli/tests/test_edit_command.rs index 89adb32ef71..b3897e4e51a 100644 --- a/cli/tests/test_edit_command.rs +++ b/cli/tests/test_edit_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_generate_md_cli_help.rs b/cli/tests/test_generate_md_cli_help.rs index a752a09ef28..4d4cd1a7bcc 100644 --- a/cli/tests/test_generate_md_cli_help.rs +++ b/cli/tests/test_generate_md_cli_help.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use insta::assert_snapshot; diff --git a/cli/tests/test_git_clone.rs b/cli/tests/test_git_clone.rs index dbf756459cc..ab99bf639a4 100644 --- a/cli/tests/test_git_clone.rs +++ b/cli/tests/test_git_clone.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::{self, Path, PathBuf}; diff --git a/cli/tests/test_git_colocated.rs b/cli/tests/test_git_colocated.rs index d59bbf459cb..2900227dd84 100644 --- a/cli/tests/test_git_colocated.rs +++ b/cli/tests/test_git_colocated.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_git_fetch.rs b/cli/tests/test_git_fetch.rs index 7b45f8faf13..fa8166cf408 100644 --- a/cli/tests/test_git_fetch.rs +++ b/cli/tests/test_git_fetch.rs @@ -1,17 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -use std::path::Path; +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_git_import_export.rs b/cli/tests/test_git_import_export.rs index 74953d0f2e3..89a07fdaa6a 100644 --- a/cli/tests/test_git_import_export.rs +++ b/cli/tests/test_git_import_export.rs @@ -1,17 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -use std::path::Path; +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools as _; use jj_lib::backend::CommitId; diff --git a/cli/tests/test_git_init.rs b/cli/tests/test_git_init.rs index 6b587dcaa56..6e69d0e153b 100644 --- a/cli/tests/test_git_init.rs +++ b/cli/tests/test_git_init.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fmt::Write as _; use std::path::{Path, PathBuf}; diff --git a/cli/tests/test_git_push.rs b/cli/tests/test_git_push.rs index 8fedaf6a440..dfcd622cc68 100644 --- a/cli/tests/test_git_push.rs +++ b/cli/tests/test_git_push.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::PathBuf; diff --git a/cli/tests/test_git_remotes.rs b/cli/tests/test_git_remotes.rs index cf8dc5a3a8d..9439d27cf38 100644 --- a/cli/tests/test_git_remotes.rs +++ b/cli/tests/test_git_remotes.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fs; diff --git a/cli/tests/test_git_submodule.rs b/cli/tests/test_git_submodule.rs index a09da75acd3..f34cecb0a79 100644 --- a/cli/tests/test_git_submodule.rs +++ b/cli/tests/test_git_submodule.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_gitignores.rs b/cli/tests/test_gitignores.rs index 486a8e68885..e2f4edfe1ef 100644 --- a/cli/tests/test_gitignores.rs +++ b/cli/tests/test_gitignores.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs index 4d7e10fac86..3e98a9d8dea 100644 --- a/cli/tests/test_global_opts.rs +++ b/cli/tests/test_global_opts.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::ffi::OsString; diff --git a/cli/tests/test_immutable_commits.rs b/cli/tests/test_immutable_commits.rs index 66dfb0e7d84..9802b404234 100644 --- a/cli/tests/test_immutable_commits.rs +++ b/cli/tests/test_immutable_commits.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_init_command.rs b/cli/tests/test_init_command.rs index fd8921eb005..beafe396766 100644 --- a/cli/tests/test_init_command.rs +++ b/cli/tests/test_init_command.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::{Path, PathBuf}; diff --git a/cli/tests/test_interdiff_command.rs b/cli/tests/test_interdiff_command.rs index 67257be9127..630776f276b 100644 --- a/cli/tests/test_interdiff_command.rs +++ b/cli/tests/test_interdiff_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_log_command.rs b/cli/tests/test_log_command.rs index 6721d29efbb..621d594b63d 100644 --- a/cli/tests/test_log_command.rs +++ b/cli/tests/test_log_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::{get_stdout_string, TestEnvironment}; diff --git a/cli/tests/test_move_command.rs b/cli/tests/test_move_command.rs index 24a635658e8..f55a7cec2e5 100644 --- a/cli/tests/test_move_command.rs +++ b/cli/tests/test_move_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_new_command.rs b/cli/tests/test_new_command.rs index 635ed6ff886..fdc9b68f505 100644 --- a/cli/tests/test_new_command.rs +++ b/cli/tests/test_new_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_next_prev_commands.rs b/cli/tests/test_next_prev_commands.rs index c42c8829538..217391833de 100644 --- a/cli/tests/test_next_prev_commands.rs +++ b/cli/tests/test_next_prev_commands.rs @@ -1,17 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::{get_stderr_string, get_stdout_string, TestEnvironment}; diff --git a/cli/tests/test_obslog_command.rs b/cli/tests/test_obslog_command.rs index 296918b0554..d83feb353fa 100644 --- a/cli/tests/test_obslog_command.rs +++ b/cli/tests/test_obslog_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::{get_stdout_string, TestEnvironment}; diff --git a/cli/tests/test_operations.rs b/cli/tests/test_operations.rs index f77e691d83d..c194441556a 100644 --- a/cli/tests/test_operations.rs +++ b/cli/tests/test_operations.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_rebase_command.rs b/cli/tests/test_rebase_command.rs index bab00951377..f59675a9b31 100644 --- a/cli/tests/test_rebase_command.rs +++ b/cli/tests/test_rebase_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_repo_change_report.rs b/cli/tests/test_repo_change_report.rs index d8ea91bd8b5..a0e232f3575 100644 --- a/cli/tests/test_repo_change_report.rs +++ b/cli/tests/test_repo_change_report.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_resolve_command.rs b/cli/tests/test_resolve_command.rs index a95656cd7f9..219ca3ca1e7 100644 --- a/cli/tests/test_resolve_command.rs +++ b/cli/tests/test_resolve_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_restore_command.rs b/cli/tests/test_restore_command.rs index c3d8792ed3f..abc24423c99 100644 --- a/cli/tests/test_restore_command.rs +++ b/cli/tests/test_restore_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_revset_output.rs b/cli/tests/test_revset_output.rs index f87a240d019..a720875bf5c 100644 --- a/cli/tests/test_revset_output.rs +++ b/cli/tests/test_revset_output.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_root.rs b/cli/tests/test_root.rs index 352d73c73cd..fb7da329912 100644 --- a/cli/tests/test_root.rs +++ b/cli/tests/test_root.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_shell_completion.rs b/cli/tests/test_shell_completion.rs index 1314bd80770..7cc17abea81 100644 --- a/cli/tests/test_shell_completion.rs +++ b/cli/tests/test_shell_completion.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use insta::assert_snapshot; diff --git a/cli/tests/test_show_command.rs b/cli/tests/test_show_command.rs index 8cee1a4be11..16fce19610a 100644 --- a/cli/tests/test_show_command.rs +++ b/cli/tests/test_show_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use regex::Regex; diff --git a/cli/tests/test_sparse_command.rs b/cli/tests/test_sparse_command.rs index b40fd66ef55..c6f2adfa3eb 100644 --- a/cli/tests/test_sparse_command.rs +++ b/cli/tests/test_sparse_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Write; diff --git a/cli/tests/test_split_command.rs b/cli/tests/test_split_command.rs index 65b0c64e2ca..9b9169f935f 100644 --- a/cli/tests/test_split_command.rs +++ b/cli/tests/test_split_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_squash_command.rs b/cli/tests/test_squash_command.rs index a37b09ed9e5..ad29f913c6c 100644 --- a/cli/tests/test_squash_command.rs +++ b/cli/tests/test_squash_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_status_command.rs b/cli/tests/test_status_command.rs index 574dda0712e..5034f200233 100644 --- a/cli/tests/test_status_command.rs +++ b/cli/tests/test_status_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_tag_command.rs b/cli/tests/test_tag_command.rs index 407c5cf9522..960b10c41e2 100644 --- a/cli/tests/test_tag_command.rs +++ b/cli/tests/test_tag_command.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_templater.rs b/cli/tests/test_templater.rs index 8d9090cf3c4..d43706c0319 100644 --- a/cli/tests/test_templater.rs +++ b/cli/tests/test_templater.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_tree_level_conflicts.rs b/cli/tests/test_tree_level_conflicts.rs index 8480a7099f0..2d5c978fe82 100644 --- a/cli/tests/test_tree_level_conflicts.rs +++ b/cli/tests/test_tree_level_conflicts.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_undo.rs b/cli/tests/test_undo.rs index 12e7b9a2be9..b59a15c9e90 100644 --- a/cli/tests/test_undo.rs +++ b/cli/tests/test_undo.rs @@ -1,17 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -use std::path::Path; +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_unsquash_command.rs b/cli/tests/test_unsquash_command.rs index a6b160625c2..fed88751d6b 100644 --- a/cli/tests/test_unsquash_command.rs +++ b/cli/tests/test_unsquash_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/cli/tests/test_untrack_command.rs b/cli/tests/test_untrack_command.rs index 78804b59cca..f5a7e7705bf 100644 --- a/cli/tests/test_untrack_command.rs +++ b/cli/tests/test_untrack_command.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::PathBuf; diff --git a/cli/tests/test_util_command.rs b/cli/tests/test_util_command.rs index 93b3c664ab1..447b9037a4c 100644 --- a/cli/tests/test_util_command.rs +++ b/cli/tests/test_util_command.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use insta::assert_snapshot; diff --git a/cli/tests/test_working_copy.rs b/cli/tests/test_working_copy.rs index e54437b28b1..e35aa7bcba1 100644 --- a/cli/tests/test_working_copy.rs +++ b/cli/tests/test_working_copy.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use crate::common::TestEnvironment; diff --git a/cli/tests/test_workspaces.rs b/cli/tests/test_workspaces.rs index 45ae5379c06..94cc943c882 100644 --- a/cli/tests/test_workspaces.rs +++ b/cli/tests/test_workspaces.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/lib/gen-protos/src/main.rs b/lib/gen-protos/src/main.rs index c9b8d4f0177..5943b695c56 100644 --- a/lib/gen-protos/src/main.rs +++ b/lib/gen-protos/src/main.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::io::Result; use std::path::Path; diff --git a/lib/src/backend.rs b/lib/src/backend.rs index 76779804b34..cfab0aaf2f4 100644 --- a/lib/src/backend.rs +++ b/lib/src/backend.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/commit.rs b/lib/src/commit.rs index 65e2e1379da..a19969bf96c 100644 --- a/lib/src/commit.rs +++ b/lib/src/commit.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/commit_builder.rs b/lib/src/commit_builder.rs index 7a6ea1d2bbf..41582bf30f1 100644 --- a/lib/src/commit_builder.rs +++ b/lib/src/commit_builder.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs index e9627d7859a..d60a9892fe7 100644 --- a/lib/src/conflicts.rs +++ b/lib/src/conflicts.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/dag_walk.rs b/lib/src/dag_walk.rs index c773fafe34b..5a4d064a94e 100644 --- a/lib/src/dag_walk.rs +++ b/lib/src/dag_walk.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! General-purpose DAG algorithms. diff --git a/lib/src/default_index/composite.rs b/lib/src/default_index/composite.rs index 176bad80f19..9d5f1b53bff 100644 --- a/lib/src/default_index/composite.rs +++ b/lib/src/default_index/composite.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/entry.rs b/lib/src/default_index/entry.rs index ae9ed5084df..7c0dea0f3b0 100644 --- a/lib/src/default_index/entry.rs +++ b/lib/src/default_index/entry.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/mod.rs b/lib/src/default_index/mod.rs index 1b94ac970bd..844a9b53a69 100644 --- a/lib/src/default_index/mod.rs +++ b/lib/src/default_index/mod.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/mutable.rs b/lib/src/default_index/mutable.rs index c1ce030145c..810b82bbcfa 100644 --- a/lib/src/default_index/mutable.rs +++ b/lib/src/default_index/mutable.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/readonly.rs b/lib/src/default_index/readonly.rs index 1ff1041a948..f2612a1b1fd 100644 --- a/lib/src/default_index/readonly.rs +++ b/lib/src/default_index/readonly.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/rev_walk.rs b/lib/src/default_index/rev_walk.rs index 77723f92c35..65746b798fc 100644 --- a/lib/src/default_index/rev_walk.rs +++ b/lib/src/default_index/rev_walk.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/revset_engine.rs b/lib/src/default_index/revset_engine.rs index 15de39cd038..8d622b7f9d6 100644 --- a/lib/src/default_index/revset_engine.rs +++ b/lib/src/default_index/revset_engine.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/revset_graph_iterator.rs b/lib/src/default_index/revset_graph_iterator.rs index 7d02bc58abd..2b197f75977 100644 --- a/lib/src/default_index/revset_graph_iterator.rs +++ b/lib/src/default_index/revset_graph_iterator.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_index/store.rs b/lib/src/default_index/store.rs index 0ac974176f6..2902cf8dfd1 100644 --- a/lib/src/default_index/store.rs +++ b/lib/src/default_index/store.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/default_submodule_store.rs b/lib/src/default_submodule_store.rs index e15000fc22b..a286fa9fbe1 100644 --- a/lib/src/default_submodule_store.rs +++ b/lib/src/default_submodule_store.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/diff.rs b/lib/src/diff.rs index d67dd535a77..9148ffd299a 100644 --- a/lib/src/diff.rs +++ b/lib/src/diff.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/file_util.rs b/lib/src/file_util.rs index d92b9f4e75d..6b9b37388e1 100644 --- a/lib/src/file_util.rs +++ b/lib/src/file_util.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/files.rs b/lib/src/files.rs index 62346c65ff0..0a492a239f3 100644 --- a/lib/src/files.rs +++ b/lib/src/files.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/fmt_util.rs b/lib/src/fmt_util.rs index 492a841add1..a41f4e09678 100644 --- a/lib/src/fmt_util.rs +++ b/lib/src/fmt_util.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Common formatting helpers diff --git a/lib/src/fsmonitor.rs b/lib/src/fsmonitor.rs index 38dfdd99e16..f3623c4275e 100644 --- a/lib/src/fsmonitor.rs +++ b/lib/src/fsmonitor.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Interfaces with a filesystem monitor tool to efficiently query for //! filesystem updates, without having to crawl the entire working copy. This is diff --git a/lib/src/git.rs b/lib/src/git.rs index d38636731d6..6b1e59849bf 100644 --- a/lib/src/git.rs +++ b/lib/src/git.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/git_backend.rs b/lib/src/git_backend.rs index 1e63a7b4660..383609a3e5d 100644 --- a/lib/src/git_backend.rs +++ b/lib/src/git_backend.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/gitignore.rs b/lib/src/gitignore.rs index a6ecebc75f1..a6cd80d6fbd 100644 --- a/lib/src/gitignore.rs +++ b/lib/src/gitignore.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/hex_util.rs b/lib/src/hex_util.rs index 5a1611e4a2f..174bd3e58b9 100644 --- a/lib/src/hex_util.rs +++ b/lib/src/hex_util.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/id_prefix.rs b/lib/src/id_prefix.rs index e0fe7daa17a..9afef99bea7 100644 --- a/lib/src/id_prefix.rs +++ b/lib/src/id_prefix.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/index.rs b/lib/src/index.rs index 1b787d32071..af424ad147e 100644 --- a/lib/src/index.rs +++ b/lib/src/index.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 2340a3bb1a1..b2eff08d847 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Jujutsu version control system. diff --git a/lib/src/local_backend.rs b/lib/src/local_backend.rs index 52555d45f17..6d97a20dd23 100644 --- a/lib/src/local_backend.rs +++ b/lib/src/local_backend.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/local_working_copy.rs b/lib/src/local_working_copy.rs index 35949ad2211..9167488c18b 100644 --- a/lib/src/local_working_copy.rs +++ b/lib/src/local_working_copy.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/lock.rs b/lib/src/lock.rs index bf7b0e9d275..63466755eac 100644 --- a/lib/src/lock.rs +++ b/lib/src/lock.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/lock/fallback.rs b/lib/src/lock/fallback.rs index 154549c619a..3b3d8a59873 100644 --- a/lib/src/lock/fallback.rs +++ b/lib/src/lock/fallback.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fs::{File, OpenOptions}; use std::path::PathBuf; diff --git a/lib/src/lock/unix.rs b/lib/src/lock/unix.rs index 1f65e3a02b4..f0e261848d1 100644 --- a/lib/src/lock/unix.rs +++ b/lib/src/lock/unix.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/matchers.rs b/lib/src/matchers.rs index e87911e6512..d8589b63101 100644 --- a/lib/src/matchers.rs +++ b/lib/src/matchers.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(dead_code, missing_docs)] diff --git a/lib/src/merge.rs b/lib/src/merge.rs index 435102bce78..01ec410ea6e 100644 --- a/lib/src/merge.rs +++ b/lib/src/merge.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Generic algorithms for working with merged values, plus specializations for //! some common types of merged values. diff --git a/lib/src/merged_tree.rs b/lib/src/merged_tree.rs index aa30177f2a9..80c4ed643c2 100644 --- a/lib/src/merged_tree.rs +++ b/lib/src/merged_tree.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! A lazily merged view of a set of trees. diff --git a/lib/src/object_id.rs b/lib/src/object_id.rs index cd117f3e656..6938b7fcfff 100644 --- a/lib/src/object_id.rs +++ b/lib/src/object_id.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/op_heads_store.rs b/lib/src/op_heads_store.rs index 828eafc4caa..4d148ee05a3 100644 --- a/lib/src/op_heads_store.rs +++ b/lib/src/op_heads_store.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/op_store.rs b/lib/src/op_store.rs index 9b6380d932c..13753fe835d 100644 --- a/lib/src/op_store.rs +++ b/lib/src/op_store.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/op_walk.rs b/lib/src/op_walk.rs index 44fd5cf00b4..2a52c78bc84 100644 --- a/lib/src/op_walk.rs +++ b/lib/src/op_walk.rs @@ -1,16 +1,5 @@ -// Copyright 2020-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Utility for operation id resolution and traversal. diff --git a/lib/src/operation.rs b/lib/src/operation.rs index 896ab8ce237..36a75cb4a67 100644 --- a/lib/src/operation.rs +++ b/lib/src/operation.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/protos/git_store.proto b/lib/src/protos/git_store.proto index 4f08eb6ef89..e972b006313 100644 --- a/lib/src/protos/git_store.proto +++ b/lib/src/protos/git_store.proto @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/lib/src/protos/local_store.proto b/lib/src/protos/local_store.proto index d804cc8762c..c50bf8445ae 100644 --- a/lib/src/protos/local_store.proto +++ b/lib/src/protos/local_store.proto @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/lib/src/protos/op_store.proto b/lib/src/protos/op_store.proto index 3395bec4905..d382d90decc 100644 --- a/lib/src/protos/op_store.proto +++ b/lib/src/protos/op_store.proto @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/lib/src/protos/working_copy.proto b/lib/src/protos/working_copy.proto index 536ca32e620..6e60e85e036 100644 --- a/lib/src/protos/working_copy.proto +++ b/lib/src/protos/working_copy.proto @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/lib/src/refs.rs b/lib/src/refs.rs index 64d39be5155..eedd7f83556 100644 --- a/lib/src/refs.rs +++ b/lib/src/refs.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/repo.rs b/lib/src/repo.rs index ba0a7610c9d..3a1d64ad01b 100644 --- a/lib/src/repo.rs +++ b/lib/src/repo.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/repo_path.rs b/lib/src/repo_path.rs index 707ca3c1fb8..e3f5298d223 100644 --- a/lib/src/repo_path.rs +++ b/lib/src/repo_path.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/revset.pest b/lib/src/revset.pest index e06ffd4c6f1..c221f60d70b 100644 --- a/lib/src/revset.pest +++ b/lib/src/revset.pest @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 identifier_part = @{ (ASCII_ALPHANUMERIC | "_" | "/")+ } identifier = @{ diff --git a/lib/src/revset.rs b/lib/src/revset.rs index 1b34b010abe..405d7886429 100644 --- a/lib/src/revset.rs +++ b/lib/src/revset.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/revset_graph.rs b/lib/src/revset_graph.rs index ff3c4b72fff..c5df8280bc3 100644 --- a/lib/src/revset_graph.rs +++ b/lib/src/revset_graph.rs @@ -1,16 +1,5 @@ -// Copyright 2021-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/rewrite.rs b/lib/src/rewrite.rs index 00f72c835af..e8ebfd9563b 100644 --- a/lib/src/rewrite.rs +++ b/lib/src/rewrite.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/settings.rs b/lib/src/settings.rs index be51e237c8c..ad5c7032564 100644 --- a/lib/src/settings.rs +++ b/lib/src/settings.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/signing.rs b/lib/src/signing.rs index 17659e04f92..7bf5d9e101e 100644 --- a/lib/src/signing.rs +++ b/lib/src/signing.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Generic APIs to work with cryptographic signatures created and verified by //! various backends. diff --git a/lib/src/simple_op_heads_store.rs b/lib/src/simple_op_heads_store.rs index 848539aeec4..01ae467e48a 100644 --- a/lib/src/simple_op_heads_store.rs +++ b/lib/src/simple_op_heads_store.rs @@ -1,16 +1,5 @@ -// Copyright 2021-2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/simple_op_store.rs b/lib/src/simple_op_store.rs index 3522bd1e227..556cca9a545 100644 --- a/lib/src/simple_op_store.rs +++ b/lib/src/simple_op_store.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/stacked_table.rs b/lib/src/stacked_table.rs index afa3d443530..e5bc8c6c642 100644 --- a/lib/src/stacked_table.rs +++ b/lib/src/stacked_table.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! A persistent table of fixed-size keys to variable-size values. The keys are //! stored in sorted order, with each key followed by an integer offset into the diff --git a/lib/src/store.rs b/lib/src/store.rs index 2b55e0abc23..1c64a3dd7b8 100644 --- a/lib/src/store.rs +++ b/lib/src/store.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/str_util.rs b/lib/src/str_util.rs index 36df7ac5b0b..941e3748f35 100644 --- a/lib/src/str_util.rs +++ b/lib/src/str_util.rs @@ -1,16 +1,5 @@ -// Copyright 2021-2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! String helpers. diff --git a/lib/src/submodule_store.rs b/lib/src/submodule_store.rs index e3c1882161e..673ab65bb35 100644 --- a/lib/src/submodule_store.rs +++ b/lib/src/submodule_store.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/transaction.rs b/lib/src/transaction.rs index 11c1b34c7a9..77ba23529af 100644 --- a/lib/src/transaction.rs +++ b/lib/src/transaction.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/tree.rs b/lib/src/tree.rs index 23690ff6a88..b409d5903d7 100644 --- a/lib/src/tree.rs +++ b/lib/src/tree.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/tree_builder.rs b/lib/src/tree_builder.rs index 71ec1c077f7..1821bcdae2a 100644 --- a/lib/src/tree_builder.rs +++ b/lib/src/tree_builder.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/view.rs b/lib/src/view.rs index a11c2add97e..8de147cffa3 100644 --- a/lib/src/view.rs +++ b/lib/src/view.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/src/working_copy.rs b/lib/src/working_copy.rs index bb56b5016e8..0327e861cb4 100644 --- a/lib/src/working_copy.rs +++ b/lib/src/working_copy.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 //! Defines the interface for the working copy. See `LocalWorkingCopy` for the //! default local-disk implementation. diff --git a/lib/src/workspace.rs b/lib/src/workspace.rs index c97ce22a891..9263a5a430b 100644 --- a/lib/src/workspace.rs +++ b/lib/src/workspace.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #![allow(missing_docs)] diff --git a/lib/tests/test_bad_locking.rs b/lib/tests/test_bad_locking.rs index da5700c7f4b..65796104eee 100644 --- a/lib/tests/test_bad_locking.rs +++ b/lib/tests/test_bad_locking.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/lib/tests/test_commit_builder.rs b/lib/tests/test_commit_builder.rs index 976069a3668..c58942e854a 100644 --- a/lib/tests/test_commit_builder.rs +++ b/lib/tests/test_commit_builder.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::backend::{ChangeId, MillisSinceEpoch, Signature, Timestamp}; use jj_lib::matchers::EverythingMatcher; diff --git a/lib/tests/test_commit_concurrent.rs b/lib/tests/test_commit_concurrent.rs index 800d92ab27a..cf95fe924b9 100644 --- a/lib/tests/test_commit_concurrent.rs +++ b/lib/tests/test_commit_concurrent.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cmp::max; use std::sync::Arc; diff --git a/lib/tests/test_conflicts.rs b/lib/tests/test_conflicts.rs index 8dbe47a6217..a1708bb33ca 100644 --- a/lib/tests/test_conflicts.rs +++ b/lib/tests/test_conflicts.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::backend::FileId; use jj_lib::conflicts::{ diff --git a/lib/tests/test_default_revset_graph_iterator.rs b/lib/tests/test_default_revset_graph_iterator.rs index 738d1ad03c5..0d590987bbb 100644 --- a/lib/tests/test_default_revset_graph_iterator.rs +++ b/lib/tests/test_default_revset_graph_iterator.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::commit::Commit; diff --git a/lib/tests/test_diff_summary.rs b/lib/tests/test_diff_summary.rs index c5403663a5f..c57bdcf9cb7 100644 --- a/lib/tests/test_diff_summary.rs +++ b/lib/tests/test_diff_summary.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::matchers::{EverythingMatcher, FilesMatcher}; use jj_lib::merged_tree::DiffSummary; diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs index dc4eba52bff..04d6a8bc1ec 100644 --- a/lib/tests/test_git.rs +++ b/lib/tests/test_git.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::{BTreeMap, HashSet}; use std::path::PathBuf; diff --git a/lib/tests/test_git_backend.rs b/lib/tests/test_git_backend.rs index 1d072d8d4da..15e69390fdc 100644 --- a/lib/tests/test_git_backend.rs +++ b/lib/tests/test_git_backend.rs @@ -1,16 +1,5 @@ -// Copyright 2024 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashSet; use std::process::Command; diff --git a/lib/tests/test_id_prefix.rs b/lib/tests/test_id_prefix.rs index a9ec064ddd3..afeef1c6417 100644 --- a/lib/tests/test_id_prefix.rs +++ b/lib/tests/test_id_prefix.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::backend::{CommitId, MillisSinceEpoch, Signature, Timestamp}; diff --git a/lib/tests/test_index.rs b/lib/tests/test_index.rs index da5c1ba9eef..fa13985dd5c 100644 --- a/lib/tests/test_index.rs +++ b/lib/tests/test_index.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::fs; use std::sync::Arc; diff --git a/lib/tests/test_init.rs b/lib/tests/test_init.rs index b95bcb4f89a..4421b7c61fb 100644 --- a/lib/tests/test_init.rs +++ b/lib/tests/test_init.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::{Path, PathBuf}; diff --git a/lib/tests/test_load_repo.rs b/lib/tests/test_load_repo.rs index 96092a9ba2e..eb18632b272 100644 --- a/lib/tests/test_load_repo.rs +++ b/lib/tests/test_load_repo.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::repo::RepoLoader; use testutils::{write_random_commit, TestRepo}; diff --git a/lib/tests/test_local_working_copy.rs b/lib/tests/test_local_working_copy.rs index f79634dc98e..61572767682 100644 --- a/lib/tests/test_local_working_copy.rs +++ b/lib/tests/test_local_working_copy.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 #[cfg(unix)] use std::os::unix::fs::PermissionsExt; diff --git a/lib/tests/test_local_working_copy_concurrent.rs b/lib/tests/test_local_working_copy_concurrent.rs index 695e3f6e6af..25b6fd5a7b5 100644 --- a/lib/tests/test_local_working_copy_concurrent.rs +++ b/lib/tests/test_local_working_copy_concurrent.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::cmp::max; use std::thread; diff --git a/lib/tests/test_local_working_copy_sparse.rs b/lib/tests/test_local_working_copy_sparse.rs index d42448d82e9..6db03bd0b5e 100644 --- a/lib/tests/test_local_working_copy_sparse.rs +++ b/lib/tests/test_local_working_copy_sparse.rs @@ -1,16 +1,5 @@ -// Copyright 2022 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::local_working_copy::LocalWorkingCopy; diff --git a/lib/tests/test_merge_trees.rs b/lib/tests/test_merge_trees.rs index 107ce3abfba..e9c5d251496 100644 --- a/lib/tests/test_merge_trees.rs +++ b/lib/tests/test_merge_trees.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools; use jj_lib::backend::TreeValue; diff --git a/lib/tests/test_merged_tree.rs b/lib/tests/test_merged_tree.rs index b19893dda17..b9d344bf94b 100644 --- a/lib/tests/test_merged_tree.rs +++ b/lib/tests/test_merged_tree.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use futures::executor::block_on; use futures::StreamExt; diff --git a/lib/tests/test_mut_repo.rs b/lib/tests/test_mut_repo.rs index b3838c7d120..96f284ce84e 100644 --- a/lib/tests/test_mut_repo.rs +++ b/lib/tests/test_mut_repo.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::backend::CommitId; use jj_lib::op_store::{RefTarget, RemoteRef, RemoteRefState, WorkspaceId}; diff --git a/lib/tests/test_operations.rs b/lib/tests/test_operations.rs index 9fe7596b099..6c3978d9426 100644 --- a/lib/tests/test_operations.rs +++ b/lib/tests/test_operations.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; use std::slice; diff --git a/lib/tests/test_refs.rs b/lib/tests/test_refs.rs index d56d1fb65a7..02de01d04a2 100644 --- a/lib/tests/test_refs.rs +++ b/lib/tests/test_refs.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use jj_lib::merge::Merge; use jj_lib::op_store::RefTarget; diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs index 7f786aca25f..ed4dcb4b5d4 100644 --- a/lib/tests/test_revset.rs +++ b/lib/tests/test_revset.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::path::Path; diff --git a/lib/tests/test_rewrite.rs b/lib/tests/test_rewrite.rs index 5a2b29367c8..4135342652d 100644 --- a/lib/tests/test_rewrite.rs +++ b/lib/tests/test_rewrite.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use itertools::Itertools as _; use jj_lib::commit::Commit; diff --git a/lib/tests/test_view.rs b/lib/tests/test_view.rs index 91787b567af..a3102189fb7 100644 --- a/lib/tests/test_view.rs +++ b/lib/tests/test_view.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::BTreeMap; diff --git a/lib/tests/test_workspace.rs b/lib/tests/test_workspace.rs index 7f97e365498..f3155a628fd 100644 --- a/lib/tests/test_workspace.rs +++ b/lib/tests/test_workspace.rs @@ -1,16 +1,5 @@ -// Copyright 2021 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use assert_matches::assert_matches; use jj_lib::op_store::WorkspaceId; diff --git a/lib/testutils/src/lib.rs b/lib/testutils/src/lib.rs index fdd871aa5fc..1942009937a 100644 --- a/lib/testutils/src/lib.rs +++ b/lib/testutils/src/lib.rs @@ -1,16 +1,5 @@ -// Copyright 2020 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::collections::HashMap; use std::env; diff --git a/lib/testutils/src/test_backend.rs b/lib/testutils/src/test_backend.rs index 91ece531d8a..e1b4b5e3432 100644 --- a/lib/testutils/src/test_backend.rs +++ b/lib/testutils/src/test_backend.rs @@ -1,16 +1,5 @@ -// Copyright 2023 The Jujutsu Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-FileCopyrightText: © 2020-2024 The Jujutsu Authors +// SPDX-License-Identifier: Apache-2.0 use std::any::Any; use std::collections::HashMap;