mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

cli: add an option to avoid committing the working copy

Browse source 
It can be useful in command prompts and scripts to be able to quickly
get e.g. the `jj status` output without spending time committing the
working copy (perhaps because some background process continuously
commits the working copy). One can already do that by passing
`--at-op=<operation ID>`, but then one needs to look up the operation
ID first. That is both extra work for the user/script and it means
there's an extra `jj op log` invocation to get the operation ID. Let's
have a global flag to make it easy and efficient to do.
This commit is contained in:
Martin von Zweigbergk 2022-02-26 21:53:33 -08:00
parent 1a0b5b9c9e
commit a88865a418
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/commands.rs
View file

@ -259,6 +259,8 @@ impl WorkspaceCommandHelper {
repo: Arc<ReadonlyRepo>,
) -> Result<Self, CommandError> {
let loaded_at_head = root_args.value_of("at_op").unwrap() == "@";
let may_update_working_copy =
loaded_at_head && !root_args.is_present("no_commit_working_copy");
let mut working_copy_shared_with_git = false;
let maybe_git_repo = repo.store().git_repo();
if let Some(git_repo) = &maybe_git_repo {
@ -270,12 +272,12 @@ impl WorkspaceCommandHelper {
settings: ui.settings().clone(),
workspace,
repo,
may_update_working_copy: loaded_at_head,
may_update_working_copy,
working_copy_shared_with_git,
working_copy_committed: false,
rebase_descendants: true,
};
if working_copy_shared_with_git && loaded_at_head {
if working_copy_shared_with_git && may_update_working_copy {
helper.import_git_refs_and_head(maybe_git_repo.as_ref().unwrap())?;
}
Ok(helper)
@ -1338,7 +1340,7 @@ List branches and their targets. A remote branch will be included only if its ta
revisions are preceded by a \"-\" and new target revisions are preceded by a \"+\".
For information about branches, see https://github.com/martinvonz/jj/blob/main/docs/branches.md",
);
);
let undo_command = App::new("undo")
.about("Undo an operation")
.arg(op_arg().help("The operation to undo"));
@ -1434,15 +1436,13 @@ https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.\
),
)
.subcommand(
App::new("fetch")
.about("Fetch from a Git remote")
.arg(
Arg::new("remote")
.long("remote")
.takes_value(true)
.default_value("origin")
.help("The remote to fetch from (only named remotes are supported)"),
),
App::new("fetch").about("Fetch from a Git remote").arg(
Arg::new("remote")
.long("remote")
.takes_value(true)
.default_value("origin")
.help("The remote to fetch from (only named remotes are supported)"),
),
)
.subcommand(
App::new("clone")
@ -1486,8 +1486,7 @@ By default, all branches are pushed. Use `--branch` if you want to push only one
),
)
.subcommand(
App::new("import")
.about("Update repo with changes made in the underlying Git repo"),
App::new("import").about("Update repo with changes made in the underlying Git repo"),
)
.subcommand(
App::new("export")
@ -1572,6 +1571,20 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
closest .jj/ directory in an ancestor of the current working directory.",
),
)
.arg(
Arg::new("no_commit_working_copy")
.long("no-commit-working-copy")
.global(true)
.help("Don't commit the working copy")
.long_help(
"Don't commit the working copy. By default, Jujutsu commits the working copy \
on every command, unless you load the repo at a specific operation with \
`--at-operation`. If you want to avoid committing the working and instead \
see a possibly stale working copy commit, you can use \
`--no-commit-working-copy`. This may be useful e.g. in a command prompt, \
especially if you have another process that commits the working copy.",
),
)
.arg(
Arg::new("at_op")
.long("at-operation")