This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9819

purge: also deal with directory with --confirm
ClosedPublic

Authored by marmoute on Jan 18 2021, 4:26 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG57370e7deb7b: purge: also deal with directory with --confirm

Summary

Getting the exact number is simple (you have to project the result of previous
deletion to detect super-directory with only about-to-be-deleted content). So we
use a vaguer message.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 18 2021, 4:26 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 18 2021, 4:26 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D9820: purge: move extension into core mercurial.Jan 18 2021, 4:26 AM

marmoute mentioned this in D9284: purge: move extension into core mercurial.Jan 18 2021, 4:30 AM

Alphare added a subscriber: Alphare.Jan 22 2021, 8:48 AM

Alphare added inline comments.

mercurial/merge.py
2389–2401	This case is not mutually exclusive with the others, is it?

marmoute added inline comments.Jan 22 2021, 9:35 AM

mercurial/merge.py
2389–2401	the case is not, but the message is.

Alphare added inline comments.Jan 22 2021, 11:01 AM

mercurial/merge.py
2389–2401	Sure, but I think I would like to know about the empty directories in the other cases.

marmoute added a commit: rHG57370e7deb7b: purge: also deal with directory with --confirm.Jan 22 2021, 3:38 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG57370e7deb7b: purge: also deal with directory with --confirm (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

(discovering an unsubmitted message from the stone age)

mercurial/merge.py
2389–2401	Yeah but that is a whole different level of computation, since we have to computed the "would be deleted" directory in an entirely new manner.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (16 lines)
M			tests/test-purge.t (4 lines)

Status	Author	Revision
Closed	marmoute	D9820 purge: move extension into core mercurial
Closed	marmoute	D9819 purge: also deal with directory with --confirm
Closed	marmoute	D9818 purge: add a --confirm option

Diff 25222

mercurial/merge.py

	msg = _(b"permanently delete %d unkown and %d ignored files?")			msg = _(b"permanently delete %d unkown and %d ignored files?")
	msg %= (nb_unkown, nb_ignored)			msg %= (nb_unkown, nb_ignored)
	elif nb_unkown:			elif nb_unkown:
	msg = _(b"permanently delete %d unkown files?")			msg = _(b"permanently delete %d unkown files?")
	msg %= nb_unkown			msg %= nb_unkown
	elif nb_ignored:			elif nb_ignored:
	msg = _(b"permanently delete %d ignored files?")			msg = _(b"permanently delete %d ignored files?")
	msg %= nb_ignored			msg %= nb_ignored
				elif removeemptydirs:
				dir_count = 0
				for f in directories:
				if matcher(f) and not repo.wvfs.listdir(f):
				dir_count += 1
				if dir_count:
				msg = _(
				b"permanently delete at least %d empty directories?"
				)
				msg %= dir_count
	else:			else:
	# XXX we might be missing directory there			# XXX we might be missing directory there
	return res			return res
				AlphareUnsubmitted Not Done This case is not mutually exclusive with the others, is it? Alphare: This case is not mutually exclusive with the others, is it?
				marmouteAuthorUnsubmitted Done the case is not, but the message is. marmoute: the case is not, but the message is.
				AlphareUnsubmitted Not Done Sure, but I think I would like to know about the empty directories in the other cases. Alphare: Sure, but I think I would like to know about the empty directories in the other cases.
				marmouteAuthorUnsubmitted Done Yeah but that is a whole different level of computation, since we have to computed the "would be deleted" directory in an entirely new manner. marmoute: Yeah but that is a whole different level of computation, since we have to computed the "would…
	msg += b" (yN)$$ &Yes $$ &No"			msg += b" (yN)$$ &Yes $$ &No"
	if repo.ui.promptchoice(msg, default=1) == 1:			if repo.ui.promptchoice(msg, default=1) == 1:
	raise error.CanceledError(_(b'removal cancelled'))			raise error.CanceledError(_(b'removal cancelled'))

	if removefiles:			if removefiles:
	for f in sorted(status.unknown + status.ignored):			for f in sorted(status.unknown + status.ignored):
	if not noop:			if not noop:
	repo.ui.note(_(b'removing file %s\n') % f)			repo.ui.note(_(b'removing file %s\n') % f)

tests/test-purge.t

	$ echo 'ignored' > .hgignore			$ echo 'ignored' > .hgignore
	$ hg ci -qAmr3 -d'2 0'			$ hg ci -qAmr3 -d'2 0'

	delete an empty directory			delete an empty directory

	$ mkdir empty_dir			$ mkdir empty_dir
	$ hg purge -p -v			$ hg purge -p -v
	empty_dir			empty_dir
				$ hg purge --confirm
				permanently delete at least 1 empty directories? (yN) n
				abort: removal cancelled
				[250]
	$ hg purge -v			$ hg purge -v
	removing directory empty_dir			removing directory empty_dir
	$ ls -A			$ ls -A
	.hg			.hg
	.hgignore			.hgignore
	directory			directory
	r1			r1

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25101		Jan 18 2021, 4:26 AM	★	★
Diff 2	25222	rHG57370e7deb7b4c9d470c542febbae30b3f40e1f7	Jan 18 2021, 4:24 AM	★	★