Skip to content

RDI-3208 Add --interactive option to remove subcommand #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfoch merged 1 commit into from
May 6, 2026
Merged

RDI-3208 Add --interactive option to remove subcommand #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions guw/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def add(
# Dump the new toml
self.dump()

def remove(self, backup, keep, local, folder, to_remove):
def remove(self, backup, keep, local, folder, to_remove, interactive=False):
feature, idx = self._get_feature_by_name(to_remove)
if not feature:
logger.critical(f"Feature {feature} not found")
Expand All @@ -389,7 +389,7 @@ def remove(self, backup, keep, local, folder, to_remove):
prev_feature = self.config["features"][idx - 1]
feature["status"] = "_remove"
# Sync it again
self._sync(backup, keep, local, folder, self.config["features"][idx:], prev_feature)
self._sync(backup, keep, local, folder, self.config["features"][idx:], prev_feature, interactive=interactive)
# Dump the new toml
self.dump()

Expand Down Expand Up @@ -486,6 +486,9 @@ def run():
# Remove subcommand
remove_args = subparser.add_parser("remove", help="Remove a feature")
_common_command_arguments(remove_args)
remove_args.add_argument(
"--interactive", help="Interactive mode to allow manual conflict resolution", action="store_true"
)
remove_args.add_argument("feature", help="Name of the feature to remove")
# Update subcommand
update_args = subparser.add_parser("update", help="Update a feature commits with other's branch commits")
Expand Down Expand Up @@ -532,7 +535,7 @@ def run():
args.prev_feature,
)
elif args.command == "remove":
guw.remove(args.backup, args.keep, args.local, args.directory, args.feature)
guw.remove(args.backup, args.keep, args.local, args.directory, args.feature, args.interactive)
elif args.command == "update":
guw.update(
args.backup,
Expand Down
Loading