This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	marmoute	D11556 dirstate: push back the future a bit in the test
Abandoned	marmoute	D11555 dirstate-item: point out that `merged` is set only with p1_tracked
Abandoned	marmoute	D11554 dirstate-item: update the attribute documentation
Abandoned	marmoute	D11553 dirstate-item: use `any_tracked` more
Abandoned	marmoute	D11552 dirstate-item: drop an outdated comments
Abandoned	marmoute	D11551 dirstate: remove a update_file's special case for `merged` file
Abandoned	marmoute	D11550 dirstate: remove a update_file's special case for tracked file with p2 data
Closed	marmoute	D11544 dirstate: deprecate `__getitem__` access
Closed	marmoute	D11543 dirstate-item: use item's property instead of `state` in largefile
Closed	marmoute	D11542 dirstate-item: use `added` instead of `state` when moving dirstate
Closed	marmoute	D11541 dirstate-item: use item's property instead of `state` in revert
Closed	marmoute	D11540 dirstate-item: use item's property when computing a copies
Closed	marmoute	D11539 dirstate-item: use item's property instead of `state` in copy
Closed	marmoute	D11538 dirstate-item: use `added` in debugrebuilddirstate
Closed	marmoute	D11537 dirstate-item: use `maybe_clean` instead of `state` in record
Closed	marmoute	D11536 dirstate-item: use `any_tracked` instead of `state` to apply patches
Closed	marmoute	D11535 dirstate-item: use item's property instead of `state` in addremove
Closed	marmoute	D11534 dirstate-item: use `tracked` instead of `state` during copy detection
Closed	marmoute	D11533 dirstate-item: use `maybe_clean` instead of `state` in `strip`
Closed	marmoute	D11532 dirstate-item: use `tracked` instead of `state` in context.matches
Closed	marmoute	D11531 dirstate-item: use `tracked` instead of the `state` in context's iter
Closed	marmoute	D11530 dirstate-item: use `tracked` instead of the `state` in context
Closed	marmoute	D11529 dirstate-item: use item's property to deal with hgsubstate in mq
Closed	marmoute	D11528 dirstate-item: use `added` instead of the `state` in the `mq` extension
Closed	marmoute	D11527 dirstate-item: use maybe_clean instead of `state` in the eol extension
Closed	marmoute	D11526 dirstate: move verification code within the dirstate itself
Closed	marmoute	D11525 dirstate-entry: use `?` for the state of entry without any tracking
Closed	marmoute	D11524 dirstate-item: introduce a `any_tracked` property
Closed	marmoute	D11523 dirstate-item: introduce a `maybe_clean` property
Closed	marmoute	D11522 dirstate: add a `get_entry` method to the dirstate
Closed	marmoute	D11521 dirstate-item: Make constructor parameters optional

Diff 30470

hgext/largefiles/lfcommands.py

	)			)
	if wvfs.exists(standin):			if wvfs.exists(standin):
	if wvfs.exists(standinorig) and wvfs.exists(lfile):			if wvfs.exists(standinorig) and wvfs.exists(lfile):
	shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig))			shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig))
	wvfs.unlinkpath(standinorig)			wvfs.unlinkpath(standinorig)
	expecthash = lfutil.readasstandin(wctx[standin])			expecthash = lfutil.readasstandin(wctx[standin])
	if expecthash != b'':			if expecthash != b'':
	if lfile not in wctx: # not switched to normal file			if lfile not in wctx: # not switched to normal file
	if repo.dirstate[standin] != b'?':			if repo.dirstate.get_entry(standin).any_tracked:
	wvfs.unlinkpath(lfile, ignoremissing=True)			wvfs.unlinkpath(lfile, ignoremissing=True)
	else:			else:
	dropped.add(lfile)			dropped.add(lfile)

	# use normallookup() to allocate an entry in largefiles			# use normallookup() to allocate an entry in largefiles
	# dirstate to prevent lfilesrepo.status() from reporting			# dirstate to prevent lfilesrepo.status() from reporting
	# missing files as removed.			# missing files as removed.
	lfdirstate.update_file(			lfdirstate.update_file(

hgext/largefiles/lfutil.py


	if matcher is None:			if matcher is None:
	matcher = getstandinmatcher(repo)			matcher = getstandinmatcher(repo)

	# ignore unknown files in working directory			# ignore unknown files in working directory
	return [			return [
	splitstandin(f)			splitstandin(f)
	for f in repo[rev].walk(matcher)			for f in repo[rev].walk(matcher)
	if rev is not None or repo.dirstate[f] != b'?'			if rev is not None or repo.dirstate.get_entry(f).any_tracked
	]			]


	def instore(repo, hash, forcelocal=False):			def instore(repo, hash, forcelocal=False):
	'''Return true if a largefile with the given hash exists in the store'''			'''Return true if a largefile with the given hash exists in the store'''
	return os.path.exists(storepath(repo, hash, forcelocal))			return os.path.exists(storepath(repo, hash, forcelocal))


	return standins			return standins


	def synclfdirstate(repo, lfdirstate, lfile, normallookup):			def synclfdirstate(repo, lfdirstate, lfile, normallookup):
	lfstandin = standin(lfile)			lfstandin = standin(lfile)
	if lfstandin not in repo.dirstate:			if lfstandin not in repo.dirstate:
	lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False)			lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False)
	else:			else:
	stat = repo.dirstate._map[lfstandin]			stat = repo.dirstate.get_entry(lfstandin)
	state, mtime = stat.state, stat.mtime			state, mtime = stat.state, stat.mtime
	if state == b'n':			if state == b'n':
				AlphareUnsubmitted Not Done Shouldn't that also be taken care of? Alphare: Shouldn't that also be taken care of?
				marmouteAuthorUnsubmitted Done I remember taking care of this eventually, so this is either later in this series, or in the next series. marmoute: I remember taking care of this eventually, so this is either later in this series, or in the…
	if normallookup or mtime < 0 or not repo.wvfs.exists(lfile):			if normallookup or mtime < 0 or not repo.wvfs.exists(lfile):
	# state 'n' doesn't ensure 'clean' in this case			# state 'n' doesn't ensure 'clean' in this case
	lfdirstate.update_file(			lfdirstate.update_file(
	lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True			lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True
	)			)
	else:			else:
	lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)			lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
	elif state == b'm':			elif state == b'm':
	# Refresh all matching big files. It's possible that the			# Refresh all matching big files. It's possible that the
	# commit will end up failing, in which case the big files will			# commit will end up failing, in which case the big files will
	# stay refreshed. No harm done: the user modified them and			# stay refreshed. No harm done: the user modified them and
	# asked to commit them, so sooner or later we're going to			# asked to commit them, so sooner or later we're going to
	# refresh the standins. Might as well leave them refreshed.			# refresh the standins. Might as well leave them refreshed.
	lfdirstate = openlfdirstate(ui, repo)			lfdirstate = openlfdirstate(ui, repo)
	for fstandin in standins:			for fstandin in standins:
	lfile = splitstandin(fstandin)			lfile = splitstandin(fstandin)
	if lfdirstate[lfile] != b'r':			if lfdirstate.get_entry(lfile).tracked:
	updatestandin(repo, lfile, fstandin)			updatestandin(repo, lfile, fstandin)

	# Cook up a new matcher that only matches regular files or			# Cook up a new matcher that only matches regular files or
	# standins corresponding to the big files requested by the			# standins corresponding to the big files requested by the
	# user. Have to modify _files to prevent commit() from			# user. Have to modify _files to prevent commit() from
	# complaining "not tracked" for big files.			# complaining "not tracked" for big files.
	match = copy.copy(match)			match = copy.copy(match)
	origmatchfn = match.matchfn			origmatchfn = match.matchfn

	# Check both the list of largefiles and the list of			# Check both the list of largefiles and the list of
	# standins because if a largefile was removed, it			# standins because if a largefile was removed, it
	# won't be in the list of largefiles at this point			# won't be in the list of largefiles at this point
	match._files += sorted(standins)			match._files += sorted(standins)

	actualfiles = []			actualfiles = []
	for f in match._files:			for f in match._files:
	fstandin = standin(f)			fstandin = standin(f)

	# For largefiles, only one of the normal and standin should be			# For largefiles, only one of the normal and standin should be
	# committed (except if one of them is a remove). In the case of a			# committed (except if one of them is a remove). In the case of a
	# standin removal, drop the normal file if it is unknown to dirstate.			# standin removal, drop the normal file if it is unknown to dirstate.
	# Thus, skip plain largefile names but keep the standin.			# Thus, skip plain largefile names but keep the standin.
	if f in lfiles or fstandin in standins:			if f in lfiles or fstandin in standins:
	if repo.dirstate[fstandin] != b'r':			if not repo.dirstate.get_entry(fstandin).removed:
	if repo.dirstate[f] != b'r':			if not repo.dirstate.get_entry(f).removed:
	continue			continue
	elif repo.dirstate[f] == b'?':			elif not repo.dirstate.get_entry(f).any_tracked:
	continue			continue

	actualfiles.append(f)			actualfiles.append(f)
	match._files = actualfiles			match._files = actualfiles

	def matchfn(f):			def matchfn(f):
	if origmatchfn(f):			if origmatchfn(f):
	return f not in lfiles			return f not in lfiles

hgext/largefiles/overrides.py

	)			)

	wctx = repo[None]			wctx = repo[None]
	matchfiles = []			matchfiles = []
	for f in m._files:			for f in m._files:
	standin = lfutil.standin(f)			standin = lfutil.standin(f)
	if standin in ctx or standin in mctx:			if standin in ctx or standin in mctx:
	matchfiles.append(standin)			matchfiles.append(standin)
	elif standin in wctx or lfdirstate[f] == b'r':			elif standin in wctx or lfdirstate.get_entry(f).removed:
	continue			continue
	else:			else:
	matchfiles.append(f)			matchfiles.append(f)
	m._files = matchfiles			m._files = matchfiles
	m._fileset = set(m._files)			m._fileset = set(m._files)
	origmatchfn = m.matchfn			origmatchfn = m.matchfn

	def matchfn(f):			def matchfn(f):
	clean=False,			clean=False,
	unknown=False,			unknown=False,
	listsubrepos=False,			listsubrepos=False,
	):			):
	r = oldstatus(			r = oldstatus(
	node1, node2, match, ignored, clean, unknown, listsubrepos			node1, node2, match, ignored, clean, unknown, listsubrepos
	)			)
	lfdirstate = lfutil.openlfdirstate(ui, repo)			lfdirstate = lfutil.openlfdirstate(ui, repo)
	unknown = [f for f in r.unknown if lfdirstate[f] == b'?']			unknown = [
	ignored = [f for f in r.ignored if lfdirstate[f] == b'?']			f for f in r.unknown if not lfdirstate.get_entry(f).any_tracked
				]
				ignored = [
				f for f in r.ignored if not lfdirstate.get_entry(f).any_tracked
				]
	return scmutil.status(			return scmutil.status(
	r.modified, r.added, r.removed, r.deleted, unknown, ignored, r.clean			r.modified, r.added, r.removed, r.deleted, unknown, ignored, r.clean
	)			)

	repo.status = overridestatus			repo.status = overridestatus
	orig(ui, repo, dirs, *opts)			orig(ui, repo, dirs, *opts)
	repo.status = oldstatus			repo.status = oldstatus


	@eh.wrapcommand(b'rollback')			@eh.wrapcommand(b'rollback')
	def overriderollback(orig, ui, repo, **opts):			def overriderollback(orig, ui, repo, **opts):
	with repo.wlock():			with repo.wlock():
	before = repo.dirstate.parents()			before = repo.dirstate.parents()
	orphans = {			orphans = {
	f			f
	for f in repo.dirstate			for f in repo.dirstate
	if lfutil.isstandin(f) and repo.dirstate[f] != b'r'			if lfutil.isstandin(f) and not repo.dirstate.get_entry(f).removed
	}			}
	result = orig(ui, repo, **opts)			result = orig(ui, repo, **opts)
	after = repo.dirstate.parents()			after = repo.dirstate.parents()
	if before == after:			if before == after:
	return result # no need to restore standins			return result # no need to restore standins

	pctx = repo[b'.']			pctx = repo[b'.']
	for f in repo.dirstate:			for f in repo.dirstate:
	if lfutil.isstandin(f):			if lfutil.isstandin(f):
	orphans.discard(f)			orphans.discard(f)
	if repo.dirstate[f] == b'r':			if repo.dirstate.get_entry(f).removed:
	repo.wvfs.unlinkpath(f, ignoremissing=True)			repo.wvfs.unlinkpath(f, ignoremissing=True)
	elif f in pctx:			elif f in pctx:
	fctx = pctx[f]			fctx = pctx[f]
	repo.wwrite(f, fctx.data(), fctx.flags())			repo.wwrite(f, fctx.data(), fctx.flags())
	else:			else:
	# content of standin is not so important in 'a',			# content of standin is not so important in 'a',
	# 'm' or 'n' (coming from the 2nd parent) cases			# 'm' or 'n' (coming from the 2nd parent) cases
	lfutil.writestandin(repo, f, b'', False)			lfutil.writestandin(repo, f, b'', False)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30470		Oct 1 2021, 5:40 AM	★	★
Diff 2	30543	rHG82e142b9ad18e86b05eae6a4bde2f8dc8c121a9e	Sep 29 2021, 12:39 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use item's property instead of `state` in largefileClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30470

hgext/largefiles/lfcommands.py

hgext/largefiles/lfutil.py

hgext/largefiles/overrides.py

dirstate-item: use item's property instead of `state` in largefile
ClosedPublic

Revision Contents
Changeset List