This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29406		Jul 19 2021, 6:41 AM	★	★
Diff 2	29503		Jul 19 2021, 3:52 PM	★	★
Diff 3	29641	rHG9fa1085fbd63af8387dd9011d45252a5732c7612	Jul 18 2021, 9:20 PM	★	★

Commit	Parents	Author	Summary	Date
109fbf0a3627	b21f95713e70	Pierre-Yves David		Jul 18 2021, 9:20 PM

Status	Author	Revision
Closed	marmoute	D11200 relnotes: document the change in the dirstate API
Closed	marmoute	D11199 dirstate: deprecate the `add` method
Closed	marmoute	D11198 mq: replace `add` call with newer API
Closed	marmoute	D11197 largefile: use `updatefile` instead of `add` in `synclfdirstate`
Closed	marmoute	D11196 largefile: use `update_file` instead of `add` in `mergerecordupdates`
Closed	marmoute	D11195 dirstate: deprecate the `drop` method
Closed	marmoute	D11194 narrow: stop using `drop` in the `updateworkingcopy`
Closed	marmoute	D11193 mq: replace `drop` call with newer API
Closed	marmoute	D11192 largefile: use `update_file` instead of `drop` during `rollback`
Closed	marmoute	D11191 largefile: use `update_file` instead of `drop` in `synclfdirstate`
Closed	marmoute	D11190 sparse: use `update_file` instead of `drop`
Closed	marmoute	D11189 sparse: use `update_file` instead of `drop` in `refreshwdir`
Closed	marmoute	D11188 amend: use `update_file` instead of `drop`
Closed	marmoute	D11187 context: use `update_file` instead of `drop` in `markcommitted`
Closed	marmoute	D11186 dirstate: deprecate the `merge` method in all cases
Closed	marmoute	D11185 mq: drop the use of `dirstate.merged
Closed	marmoute	D11184 dirstate: deprecate the `otherparent` method in all cases
Closed	marmoute	D11183 dirstate: deprecate the `normallookup` method in all cases
Closed	marmoute	D11182 narrow: stop using `normallookup` during a test
Closed	marmoute	D11181 narrow: use `update_file` instead of `normallookup` after update
Closed	marmoute	D11180 test: use the internal `_normallookup` in `test-rebuildstate.t`
Closed	marmoute	D11179 sparse: use `update_file` instead of `normallookup` in refreshwdir
Closed	marmoute	D11178 keywork: use `update_file_p1` instead of `normallookup`
Closed	marmoute	D11177 fix: use `set_possibly_dirty` instead of `normallookup`
Closed	marmoute	D11176 eol: use `set_possibly_dirty` instead of `normallookup`
Closed	marmoute	D11175 mq: replace `normallookup` call with newer API
Closed	marmoute	D11174 revert: use `set_possibly_dirty` instead of `normal_lookup`
Closed	marmoute	D11173 dirstate: enforce `possibly_dirty` in `set_tracked`
Closed	marmoute	D11172 record: use `update_file` instead of `normallookup`
Closed	marmoute	D11171 copy: use `set_tracked` instead of `normallookup` in `dirstatecopy`
Closed	marmoute	D11170 amend: use `update_file` instead of `normallookup`
Closed	marmoute	D11169 mergestate: use `update_file` to handle `for ACTION_EXEC`
Closed	marmoute	D11168 mergestate: use `update_file` to handle `for ACTION_ADD_MODIFIED`
Closed	marmoute	D11167 largefile: use `update_file` for `synclfdirstate` "m" case
Closed	marmoute	D11166 largefile: use `update_file` for `synclfdirstate` "n" case
Closed	marmoute	D11165 largefile: replace the `normallookup` call when creating a new lfdirstate
Closed	marmoute	D11164 largefile: use `update_file` instead of `normallookup` in `updatelfiles`
Closed	marmoute	D11163 largefile: use `set_possibly_dirty` instead of `normallookup`
Closed	marmoute	D11162 dirstate: add a `set_possibly_dirty` method
Closed	marmoute	D11161 dirstate: deprecate the `normal` method in all cases
Closed	marmoute	D11160 test: use `set_traced` in `test-context`
Closed	marmoute	D11159 mq: replace usage of `normal` with newer API
Closed	marmoute	D11158 largefile: use `update_file` instead of `normal` in `synclfdirstate`
Closed	marmoute	D11157 largefile: use `set_clean` instead of `normal` in `repo.status`
Closed	marmoute	D11156 largefile: use `set_clean` instead of `normal` in `lfdirstatestatus`
Closed	marmoute	D11155 largefile: use `update_file` instead of `normal` in `updatelfiles`
Closed	marmoute	D11154 largefile: respect the `normal` signature
Closed	marmoute	D11153 keywork: use `set_clean` instead of `normal`
Closed	marmoute	D11152 sparse: use `update_file` instead of `normal` in `refreshwdir`
Closed	marmoute	D11151 sparse: use `update_file` instead of `normal` during `applyupdates`
Closed	marmoute	D11150 sparse: apply update with in a `parentchange` context
Closed	marmoute	D11149 revert: use `set_clean` instead of `normal`
Closed	marmoute	D11148 context: use `update_file` instead of `normal` in `markcommitted`
Closed	marmoute	D11147 context: use new API instead of `normal` during fixup post status
Closed	marmoute	D11146 dirstate: introduce a `set_clean` method
Closed	marmoute	D11145 largefile: use `update_file` instead of `normal`
Closed	marmoute	D11144 largefile: adjust the dirstate post update within a `parentchange` context
Closed	marmoute	D11143 dirstate: deprecate `dirstate.remove` in all cases
Closed	marmoute	D11142 largefile: use `update_file` instead of `remove` in `synclfdirstate`
Closed	marmoute	D11141 largefile: rearrange conditionnal in `synclfdirstate`
Closed	marmoute	D11140 largefile: use `update_file` instead of `remove` in `mergerecordupdates`
Closed	marmoute	D11139 mq: use `update_file_p1` instead of `remove` when adjusting dirstate
Closed	marmoute	D11138 dirstate: properly update `_lastnormaltime` in `update_file_p1`
Closed	marmoute	D11137 dirstate: properly update `_lastnormaltime` in `update_file`
Closed	marmoute	D11136 dirstate: use `reset_state` in `update_file_p1`
Closed	marmoute	D11135 dirstate: rename `update_file_reference` to `update_file_p1`
Closed	marmoute	D11134 dirstate-map: move most of `dirstate.update_file` logic in the dsmap
Closed	marmoute	D11133 dirstate: replace `update_parent_file_data` with simpler `update_parent` call
Closed	marmoute	D11132 dirstate: factor out the part retrieve "filedata" out of `normal`
Closed	marmoute	D11131 dirstate-map: factor out the change to _dirs and _alldirs on removing
Closed	marmoute	D11130 dirstate-map: factor out the change to _dirs and _alldirs on dropping
Closed	marmoute	D11129 dirstate-map: factor out the change to _dirs and _alldirs on adding
Closed	marmoute	D11128 dirstate: replace a dead conditional branch with an assert in `update_file`
Closed	marmoute	D11127 dirstate-map: do not use `size` to gate copy dropping during remove_file
Closed	marmoute	D11126 dirstate: drop a duplicated assert
Closed	marmoute	D11125 dirstate: drop duplicated check
Closed	marmoute	D11124 dirstate-item: introduce a `dm_otherparent` property
Closed	marmoute	D11123 dirstate-item: introduce a `dm_nonnormal` property
Closed	marmoute	D11122 dirstate: add a `set_possibly_dirty` in `fakedirstatewritetime`
Closed	marmoute	D11121 dirstatemap: use `set_possibly_dirty` in `clearambiguoustimes`
Closed	marmoute	D11120 dirstate-item: use `set_possibly_dirty` in `pure.pack_dirstate`
Closed	marmoute	D11119 dirstate-item: add a `set_possibly_dirty` method
Closed	marmoute	D11118 dirstate-item: add a `from_v1_data` constructor
Closed	marmoute	D11117 dirstate-item: use an explicit __init__ function instead of the attrs one
Closed	marmoute	D11116 dirstate: deprecated `drop` outside of `update/merge`
Closed	marmoute	D11115 dirstate: deprecated `remove` outside of `update/merge`
Closed	marmoute	D11114 dirstate: deprecate the `add` method outside of update/merge context
Closed	marmoute	D11113 largefiles: replace use of synclfdirstate with drop
Closed	marmoute	D11112 largefile: use `parentchange` markcommitted
Closed	marmoute	D11111 largefile: use `set_untracked` in the override of copy/rename
Closed	marmoute	D11110 largefile: use `set_untracked` in the `forget` override
Closed	marmoute	D11109 largefile: directly use set_untracked() for removing files
Closed	marmoute	D11108 largefile: use `parentchange` during rollback
Closed	marmoute	D11107 largefile: consider `updatelfiles` as a `parentchange`
Closed	marmoute	D11106 largefile: use `set_tracker` in the `hg copy` overwrite
Closed	marmoute	D11105 largefile: use parentchange during mergerecordupdates
Closed	marmoute	D11104 largefile: use `set_tracker` in the `hg add` overwrite
Closed	marmoute	D11103 largefile: synchronise the dirstate within a `parentchange` context

Diff 29503

hgext/largefiles/overrides.py

	if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:			if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
	lfdirstate = lfutil.openlfdirstate(repo.ui, repo)			lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
	with lfdirstate.parentchange():			with lfdirstate.parentchange():
	for lfile, args, msg in actions[			for lfile, args, msg in actions[
	MERGE_ACTION_LARGEFILE_MARK_REMOVED			MERGE_ACTION_LARGEFILE_MARK_REMOVED
	]:			]:
	# this should be executed before 'orig', to execute 'remove'			# this should be executed before 'orig', to execute 'remove'
	# before all other actions			# before all other actions
	repo.dirstate.remove(lfile)			repo.dirstate.update_file(
				lfile, p1_tracked=True, wc_tracked=False
				)
	# make sure lfile doesn't get synclfdirstate'd as normal			# make sure lfile doesn't get synclfdirstate'd as normal
	lfdirstate.add(lfile)			lfdirstate.add(lfile)
	lfdirstate.write()			lfdirstate.write()

	return orig(repo, actions, branchmerge, getfiledata)			return orig(repo, actions, branchmerge, getfiledata)


	# Override filemerge to prompt the user about how they wish to merge			# Override filemerge to prompt the user about how they wish to merge

This is an archive of the discontinued Mercurial Phabricator instance.

largefile: use `update_file` instead of `remove` in `mergerecordupdates`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 29503

hgext/largefiles/overrides.py

largefile: use `update_file` instead of `remove` in `mergerecordupdates`
ClosedPublic

Revision Contents
Changeset List