commit - e9e7a0c254f546e81ec08157a6068ec6b87449b4cd5cd47f2a5218a218055bd5
commit + f7a0f2ea3a4cab9f9d33443da4ffe3e2a9fce043af990a023035a14e56cb76d9
blob - 3c2ad916f782cb485930d0941f6b75e62d49ea1af061223445f86a89d89f3673
blob + 348362e8dfc9733ce454a1e0c8e3c173f7bd59e1522b4fef5e83656bb5db0b5c
--- cvg/cvg.c
+++ cvg/cvg.c
error = got_worktree_schedule_delete(worktree, &paths,
delete_local_mods, status_codes, print_remove_status, NULL,
- repo, keep_on_disk, ignore_missing_paths, 0);
+ repo, keep_on_disk, ignore_missing_paths, 0, 0);
done:
if (repo) {
const struct got_error *close_err = got_repo_close(repo);
blob - 4012a5eaf316d1f5f9c64e5617317635c0a5665a9eb22262594f7d3bf29126f1
blob + bf313afbf38972d7b1df888dee39005a9ed637077672f78168be7b2716dc510f
--- got/got.1
+++ got/got.1
.Tg rm
.It Xo
.Cm remove
-.Op Fl fkR
+.Op Fl fIkR
.Op Fl s Ar status-codes
.Ar path ...
.Xc
from the repository in the next commit.
.Pp
By default, only files tracked under version control are removed, and
-attempts to remove unversioned files result in errors.
+attempts to remove unversioned or ignored files result in errors.
.Pp
The options for
.Cm got remove
and do not raise an error if a specified
.Ar path
does not exist on disk.
+.It Fl I
+With
+.Fl s\ ? ,
+remove unversioned files even if they match an ignore pattern.
+See
+.Sx Ignore Patterns .
.It Fl k
Keep affected files on disk.
Silently ignore unversioned files encountered during file removal.
blob - 12336d47c4b8eafffd8514ecc20e19c403a9729d6c18df82b5255e66eeae1954
blob + 4d3646a89bb33797589bc9bb59bbd4a2ea8e7188da5020659adc6efdb699208a
--- got/got.c
+++ got/got.c
usage_remove(int status)
{
FILE *fp = (status == 0) ? stdout : stderr;
- fprintf(fp, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
+ fprintf(fp, "usage: %s remove [-fIkR] [-s status-codes] path ...\n",
getprogname());
exit(status);
}
struct got_pathlist_entry *pe;
int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
int ignore_missing_paths = 0, delete_unversioned = 0;
+ int delete_ignored = 0;
int *pack_fds = NULL;
RB_INIT(&paths);
err(1, "pledge");
#endif
- while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
+ while ((ch = getopt(argc, argv, "fIkRs:")) != -1) {
switch (ch) {
case 'f':
delete_local_mods = 1;
ignore_missing_paths = 1;
break;
+ case 'I':
+ /* Used in combination with "-s ?". */
+ delete_ignored = 1;
+ break;
case 'k':
keep_on_disk = 1;
break;
error = got_worktree_schedule_delete(worktree, &paths,
delete_local_mods, status_codes, print_remove_status, NULL,
- repo, keep_on_disk, ignore_missing_paths, delete_unversioned);
+ repo, keep_on_disk, ignore_missing_paths, delete_unversioned,
+ delete_ignored);
done:
if (repo) {
const struct got_error *close_err = got_repo_close(repo);
blob - b30ccae318b9206107747dc67f22258dee0ff035cc0aae87abc5a385fb8eec33
blob + 5f797f951539132a03c0e5589681a7692202a6ef0686363773396dd3fc220b28
--- include/got_worktree.h
+++ include/got_worktree.h
const struct got_error *
got_worktree_schedule_delete(struct got_worktree *,
struct got_pathlist_head *, int, const char *,
- got_worktree_delete_cb, void *, struct got_repository *, int, int, int);
+ got_worktree_delete_cb, void *, struct got_repository *, int, int, int,
+ int);
/* A callback function which is used to select or reject a patch. */
typedef const struct got_error *(*got_worktree_patch_cb)(int *, void *,
blob - 235d42bcc1fd7657827eff9516d4174f8df58c27e1bc34e765bcada360eba92a
blob + 184e5fc63ffb65104e0e401b9aaa8d251cebfe3c6a48daa65c5b6a8242e3f205
--- lib/worktree.c
+++ lib/worktree.c
const char *status_codes,
got_worktree_delete_cb progress_cb, void *progress_arg,
struct got_repository *repo, int keep_on_disk, int ignore_missing_paths,
- int delete_unversioned)
+ int delete_unversioned, int delete_ignored)
{
struct got_fileindex *fileindex = NULL;
char *fileindex_path = NULL;
sda.status_path = ondisk_status_path;
sda.status_path_len = strlen(ondisk_status_path);
err = worktree_status(worktree, pe->path, fileindex, repo,
- schedule_for_deletion, &sda, NULL, NULL, 1, 1);
+ schedule_for_deletion, &sda, NULL, NULL,
+ (delete_unversioned && !delete_ignored) ? 0 : 1,
+ 1);
free(ondisk_status_path);
if (err)
break;
blob - 1ae8a688d55cc0618185d9edea073d0dd47fbfea2725b29f0891bc302923e4e3
blob + 1b677f22437368d9a22629c3ca3fba920594a383593da925869c027af2eb7f8e
--- regress/cmdline/rm.sh
+++ regress/cmdline/rm.sh
return 1
fi
- # Remove all unversioned files from the work tree with -R -s ?
+ # Remove all unversioned files from the work tree with -R -s ?.
+ # Ignored files will not be removed unless -I is passed as well.
+ echo 'epsilon/*' > $testroot/wt/.gitignore
+ (cd $testroot/wt && got add $testroot/wt/.gitignore > /dev/null)
+
(cd $testroot/wt && got rm -R -s ? . \
>$testroot/stdout 2>$testroot/stderr)
- echo "D epsilon/unversioned" > $testroot/stdout.expected
- echo "D unversioned" >> $testroot/stdout.expected
+ echo "D unversioned" > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret=$?
if [ $ret -ne 0 ]; then
return 1
fi
+ if [ ! -e "$testroot/wt/epsilon/unversioned" ]; then
+ echo "ignored file $testroot/wt/epsilon/unversioned was deleted" &>2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ echo 'A .gitignore' > $testroot/stdout.expected
+ echo '? epsilon/unversioned' >> $testroot/stdout.expected
+ (cd $testroot/wt && got status -I > $testroot/stdout)
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ (cd $testroot/wt && got rm -R -s ? -I . \
+ >$testroot/stdout 2>$testroot/stderr)
+
+ echo "D epsilon/unversioned" > $testroot/stdout.expected
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ echo -n > $testroot/stderr.expected
+ cmp -s $testroot/stderr.expected $testroot/stderr
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stderr.expected $testroot/stderr
+ test_done "$testroot" "1"
+ return 1
+ fi
+
if [ -e "$testroot/wt/epsilon/unversioned" ]; then
echo "file $testroot/wt/epsilon/unversioned still exists on disk" &>2
test_done "$testroot" "1"
return 1
fi
+ echo 'A .gitignore' > $testroot/stdout.expected
+ (cd $testroot/wt && got status -I > $testroot/stdout)
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "1"
+ return 1
+ fi
+
test_done "$testroot" "$ret"
}