mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
083fdaac60
This makes the `test_version` test failure when run at a merge commit less confusing. The test could be fixed, but I'm not sure it's worth it, as we probably don't want to release a version of `jj` compiled at a merge commit. Now, if `jj` is compiled at a merge commit, this would print: ``` $ jj --version jj 0.31.0-fb10a78cb359d52c0eda518a42ab07f117909004-ff9c9d0d8b4e929843eb683709fc1717645796df-99e035c5054e71906d7293ed98b542a9055057ef ``` Admittedly, this is a bit of a quick hack, but I've been confused by `jj --version` output when compiled at a merge commit enough times to want it. Prior art: https://github.com/jj-vcs/jj/pull/6311 and https://github.com/jj-vcs/jj/pull/4033 both pick one commit id hash to print. I think I prefer printing all of them, even if it will fail tests at a merge commit. After this commit, the failure will at least be easy to understand. However, if we prefer to merge one of the others, I'm OK with that too.
85 lines
2.9 KiB
Rust
85 lines
2.9 KiB
Rust
// 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;
|
|
use std::process::Command;
|
|
use std::str;
|
|
|
|
const GIT_HEAD_PATH: &str = "../.git/HEAD";
|
|
const JJ_OP_HEADS_PATH: &str = "../.jj/repo/op_heads/heads";
|
|
|
|
fn main() {
|
|
let version = std::env::var("CARGO_PKG_VERSION").unwrap();
|
|
|
|
if Path::new(GIT_HEAD_PATH).exists() {
|
|
// In colocated repo, .git/HEAD should reflect the working-copy parent.
|
|
println!("cargo:rerun-if-changed={GIT_HEAD_PATH}");
|
|
} else if Path::new(JJ_OP_HEADS_PATH).exists() {
|
|
// op_heads changes when working-copy files are mutated, which is way more
|
|
// frequent than .git/HEAD.
|
|
println!("cargo:rerun-if-changed={JJ_OP_HEADS_PATH}");
|
|
}
|
|
println!("cargo:rerun-if-env-changed=NIX_JJ_GIT_HASH");
|
|
|
|
if let Some(git_hash) = get_git_hash() {
|
|
println!("cargo:rustc-env=JJ_VERSION={version}-{git_hash}");
|
|
} else {
|
|
println!("cargo:rustc-env=JJ_VERSION={version}");
|
|
}
|
|
|
|
let docs_symlink_path = Path::new("docs");
|
|
println!("cargo:rerun-if-changed={}", docs_symlink_path.display());
|
|
if docs_symlink_path.join("index.md").exists() {
|
|
println!("cargo:rustc-env=JJ_DOCS_DIR=docs/");
|
|
} else {
|
|
println!("cargo:rustc-env=JJ_DOCS_DIR=../docs/");
|
|
}
|
|
}
|
|
|
|
fn get_git_hash() -> Option<String> {
|
|
if let Some(nix_hash) = std::env::var("NIX_JJ_GIT_HASH")
|
|
.ok()
|
|
.filter(|s| !s.is_empty())
|
|
{
|
|
return Some(nix_hash);
|
|
}
|
|
if let Ok(output) = Command::new("jj")
|
|
.args([
|
|
"--ignore-working-copy",
|
|
"--color=never",
|
|
"log",
|
|
"--no-graph",
|
|
"-r=@-",
|
|
"-T=commit_id ++ '-'",
|
|
])
|
|
.output()
|
|
{
|
|
if output.status.success() {
|
|
let mut parent_commits = String::from_utf8(output.stdout).unwrap();
|
|
// If a development version of `jj` is compiled at a merge commit, this will
|
|
// result in several commit ids separated by `-`s.
|
|
parent_commits.truncate(parent_commits.trim_end_matches('-').len());
|
|
return Some(parent_commits);
|
|
}
|
|
}
|
|
|
|
if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
|
|
if output.status.success() {
|
|
let line = str::from_utf8(&output.stdout).unwrap();
|
|
return Some(line.trim_end().to_owned());
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|