This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	15062		May 11 2019, 3:18 AM	★	★
Diff 2	15080		May 14 2019, 6:58 PM	★	★
Diff 3	15152		May 16 2019, 1:41 PM	★	★
Diff 4	15265	rHG7a64ad3f325d01e11e66a0b47221b79d4fd0eed0	May 11 2019, 3:06 AM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		May 11 2019, 3:06 AM

Status	Author	Revision
Closed	martinvonz	D6422 copies: avoid calling matcher if matcher.always()
Closed	martinvonz	D6421 copies: avoid unnecessary copying of copy dict
Closed	martinvonz	D6420 copies: don't filter out copy targets created on other side of merge commit
Closed	martinvonz	D6419 copies: do full filtering at end of _changesetforwardcopies()
Closed	martinvonz	D6418 copies: split up _chain() in naive chaining and filtering steps
Closed	martinvonz	D6417 context: get filesadded() and filesremoved() from changeset if configured
Closed	martinvonz	D6416 changelog: optionally store added and removed files in changeset extras
Closed	martinvonz	D6369 templatekw: make {file_*} compare to both merge parents (issue4292)
Closed	martinvonz	D6370 templatekw: move showfileadds() close to showfile{mods,dels}()
Closed	martinvonz	D6368 tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
Closed	martinvonz	D6367 context: add ctx.files{modified,added,removed}() methods

Diff 15080

mercurial/context.py

	def user(self):			def user(self):
	return self._changeset.user			return self._changeset.user
	def date(self):			def date(self):
	return self._changeset.date			return self._changeset.date
	def files(self):			def files(self):
	return self._changeset.files			return self._changeset.files
	def filesmodified(self):			def filesmodified(self):
	modified = set(self.files())			modified = set(self.files())
	modified.difference_update(self.added())			modified.difference_update(self.filesadded())
	modified.difference_update(self.removed())			modified.difference_update(self.filesremoved())
				pulkitUnsubmitted Not Done This change should be part of previous patch right? (I can fold that in previous change in flight) pulkit: This change should be part of previous patch right? (I can fold that in previous change in…
				martinvonzAuthorUnsubmitted Not Done Yes, thanks for noticing and fixing. I fixed it in my repo, but I must have forgotten to update it here. martinvonz: Yes, thanks for noticing and fixing. I fixed it in my repo, but I must have forgotten to update…
	return sorted(modified)			return sorted(modified)
	def filesadded(self):			def filesadded(self):
	added = []			added = []
	for f in self.files():			for f in self.files():
	if not any(f in p for p in self.parents()):			if not any(f in p for p in self.parents()):
	added.append(f)			added.append(f)
	return added			return added
	def filesremoved(self):			def filesremoved(self):

tests/test-template-keywords.t

	third			third
	$ hg log -l1 -T '{files % "{path}\n"}'			$ hg log -l1 -T '{files % "{path}\n"}'
	a			a
	b			b
	fifth			fifth
	fourth			fourth
	third			third

				Test files lists on merge commit:

				$ hg co '.^' -q
				$ touch c
				$ hg add c
				$ hg ci -qm 'add file'
				$ hg merge 10 -q
				$ hg ci -m 'merge'
				$ hg log -l1 -T '{files}\n'
				a fourth
				$ hg log -l1 -T '{file_mods}\n'
				third
				$ hg log -l1 -T '{file_adds}\n'
				b fifth
				$ hg log -l1 -T '{file_dels}\n'
				a fourth

	Test file copies dict:			Test file copies dict:

	$ hg log -r8 -T '{join(file_copies, " ")}\n'			$ hg log -r8 -T '{join(file_copies, " ")}\n'
	fourth (second)			fourth (second)
	$ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'			$ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
	fourth <- second			fourth <- second
	$ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'			$ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'
	fourth <- second			fourth <- second

	$ hg log -r8 -T '{join(file_copies_switch, " ")}\n'			$ hg log -r8 -T '{join(file_copies_switch, " ")}\n'

	$ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'			$ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'
	fourth (second)			fourth (second)
	$ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'			$ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'
	fourth <- second			fourth <- second
	$ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'			$ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'
	fourth <- second			fourth <- second

	Test file attributes:			Test file attributes:

	$ hg log -l1 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}'			$ hg log -r10 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}'
	R a			R a
	A 0 b			A 0 b
	A 7 fifth			A 7 fifth
	R fourth			R fourth
	M 13 third			M 13 third

	Test file status including clean ones:			Test file status including clean ones:

	$ hg log -r9 -T '{files("**") % "{status} {path}\n"}'			$ hg log -r9 -T '{files("**") % "{status} {path}\n"}'
	A a			A a
	C fourth			C fourth
	C third			C third

	Test index keyword:			Test index keyword:

	$ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'			$ hg log -r 10:9 -T '{index + 10}{files % " {index}:{file}"}\n'
	10 0:a 1:b 2:fifth 3:fourth 4:third			10 0:a 1:b 2:fifth 3:fourth 4:third
	11 0:a			11 0:a

	$ hg branches -T '{index} {branch}\n'			$ hg branches -T '{index} {branch}\n'
	0 default			0 default
	1 foo			1 foo

	p1/p2 keywords:			p1/p2 keywords:

This is an archive of the discontinued Mercurial Phabricator instance.

tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commitClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 15080

mercurial/context.py

tests/test-template-keywords.t

tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit
ClosedPublic

Revision Contents
Changeset List