This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30581		Oct 2 2021, 8:39 PM	★	★
Diff 2	30594		Oct 3 2021, 6:51 AM	★	★
Diff 3	30647	rHG180e8fa345cc582ea4ea29dee63ea90a6173fc50	Sep 30 2021, 7:45 PM	★	★

Commit	Parents	Author	Summary	Date
6fb44fe47214	faf17afa2a0b	Pierre-Yves David		Sep 30 2021, 7:45 PM

Status	Author	Revision
Closed	SimonSapin	D11546 dirstate-v2: Add internal documentation
Closed	SimonSapin	D11545 dirstate-v2: Move data file info in the docket closer together
Closed	marmoute	D11608 dirstate-item: drop the legacy new_normal constructor
Closed	marmoute	D11607 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11606 dirstate-item: replace a call to new_possibly_dirty
Closed	marmoute	D11605 dirstate-item: drop the legacy new_possibly_dirty constructor
Closed	marmoute	D11604 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11603 dirstate-item: drop the legacy new_from_p2 constructor
Closed	marmoute	D11602 dirstate-item: replace call to new_from_p2
Closed	marmoute	D11601 dirstate-item: drop the legacy new_added constructor
Closed	marmoute	D11600 dirstate-item: replace call to new_added
Closed	marmoute	D11599 dirstate-item: drop the legacy new_merged constructor
Closed	marmoute	D11598 dirstate-item: replace call to new_merged
Closed	marmoute	D11597 dirstate-item: drop the `merged` property
Closed	marmoute	D11596 dirstate-item: replace another usage of `merged`
Closed	marmoute	D11595 dirstate-item: replace a `merged` usage with `from_p2`
Closed	marmoute	D11594 dirstate-item: drop the `from_p2` property
Closed	marmoute	D11593 dirstate-item: directly use `p2_info` in `v1_size`
Closed	marmoute	D11592 dirstate-item: use the `p2_info` property to replace more verbose call
Closed	marmoute	D11591 status: process `from_p2` file the same as `merged` one
Closed	marmoute	D11590 dirstate: drop an incorrect comment
Closed	marmoute	D11589 dirstate: drop some duplicated code
Abandoned	pulkit	D11588 dirstate: drop some duplicated code
Closed	marmoute	D11587 dirstate: align the dirstate's API to the lower level ones
Closed	marmoute	D11586 dirstate-item: introduce a `p1_tracked` property
Closed	marmoute	D11585 dirstate-item: introduce a `p2_info` property that combine two others
Closed	marmoute	D11584 dirstate: narrow gathering of parent data
Closed	marmoute	D11583 dirstate: align the dirstatemap's API to the data change
Closed	marmoute	D11558 dirstate-v2: Store a bitfield on disk instead of v1-like state
Closed	marmoute	D11557 dirstate-item: change the internal storage and constructor value
Closed	marmoute	D11582 dirstatemap: drop legacy method on the dirstatemap wrapper
Closed	marmoute	D11581 dirstatemap: align the Rust wrapper implementation of `setparent`
Closed	marmoute	D11580 dirstatemap: fix copymap.pop in Rust to return the value it pops
Closed	marmoute	D11579 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem
Closed	marmoute	D11578 dirstatemap: use a common implement for reset_state
Closed	marmoute	D11577 dirstatemap: add a common `_drop_entry` method for dirstatemap
Closed	marmoute	D11576 dirstatemap: use common code for set_clean
Closed	marmoute	D11575 dirstatemap: use common code for set_possibly_dirty
Closed	marmoute	D11574 dirstatemap: use a common implement for set_tracked
Closed	marmoute	D11573 dirstatemap: add a common `_insert_entry` method for dirstatemap
Closed	marmoute	D11572 dirstatemap: use a common implementation for `dirstatemap.set_untracked`
Closed	marmoute	D11571 dirstatemap: add a common `_refresh_entry` method for dirstatemap
Closed	marmoute	D11570 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class
Closed	marmoute	D11569 dirstatemap: small rework of the `set_untracked` method
Closed	marmoute	D11568 dirstatemap: arrange methods by category
Closed	marmoute	D11567 dirstatemap: move a multiple simple functions in the common class
Closed	marmoute	D11566 dirstatemap: rename `_rustmap` to `_map`
Closed	marmoute	D11565 dirstatemap: use a common __init__ for dirstatemap
Closed	marmoute	D11564 dirstatemap: introduce a common base for the dirstatemap class

Diff 30581

mercurial/dirstate.py


	need_parent_file_data = (			need_parent_file_data = (
	not possibly_dirty and not p2_info and wc_tracked and p1_tracked			not possibly_dirty and not p2_info and wc_tracked and p1_tracked
	)			)

	# this mean we are doing call for file we do not really care about the			# this mean we are doing call for file we do not really care about the
	# data (eg: added or removed), however this should be a minor overhead			# data (eg: added or removed), however this should be a minor overhead
	# compared to the overall update process calling this.			# compared to the overall update process calling this.
	if need_parent_file_data:			if need_parent_file_data or parentfiledata is None:
	if parentfiledata is None:
	parentfiledata = self._get_filedata(filename)			parentfiledata = self._get_filedata(filename)
	mtime = parentfiledata[2]

	if mtime > self._lastnormaltime:
	# Remember the most recent modification timeslot for
	# status(), to make sure we won't miss future
	# size-preserving file content modifications that happen
	# within the same timeslot.
	self._lastnormaltime = mtime

	self._map.reset_state(			self._map.reset_state(
	filename,			filename,
	wc_tracked,			wc_tracked,
	p1_tracked,			p1_tracked,
	p2_info=p2_info,			p2_info=p2_info,
	has_meaningful_mtime=not possibly_dirty,			has_meaningful_mtime=not possibly_dirty,
	parentfiledata=parentfiledata,			parentfiledata=parentfiledata,

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: drop some duplicated codeClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30581

mercurial/dirstate.py

dirstate: drop some duplicated code
ClosedPublic

Revision Contents
Changeset List