This is an archive of the discontinued Mercurial Phabricator instance.

Differential D595

cmdutil: rectify comment in amend
ClosedPublic

Authored by singhsrb on Aug 31 2017, 10:01 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG7e9ccb1670e3: amend: rectify comment
rHG7220425d1168: amend: rectify comment
rHG8fafd5df22f7: cmdutil: rectify comment in amend

Summary

Comment was ambiguous as there can be two parents of a changeset in mercurial.
This commit fixes the comment to clarify that the first parent is being
considered.

Test Plan

ran the test suite

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

singhsrb created this revision.Aug 31 2017, 10:01 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 31 2017, 10:01 PM

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

singhsrb added a child revision: D596: amend: add tests for amending only some files from commit to be amended.Aug 31 2017, 10:01 PM

Closed by commit rHG8fafd5df22f7: cmdutil: rectify comment in amend (authored by singhsrb). · Explain WhySep 2 2017, 2:22 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (2 lines)

Status	Author	Revision
Abandoned	singhsrb	D599 cmdutil: remove redundant commitfunc parameter in amend (API)
Abandoned	singhsrb	D598 cmdutil: remove the redundant commit during amend
Closed	singhsrb	D597 cmdutil: moving first use of newid closer to its use in amend
Closed	singhsrb	D596 amend: add tests for amending only some files from commit to be amended
Closed	singhsrb	D595 cmdutil: rectify comment in amend
Closed	singhsrb	D594 cmdutil: removing redundant if condition in amend

Diff 1573

mercurial/cmdutil.py

	# Participating changesets:			# Participating changesets:
	#			#
	# node/ctx o - new (intermediate) commit that contains changes			# node/ctx o - new (intermediate) commit that contains changes
	# \| from working dir to go into amending commit			# \| from working dir to go into amending commit
	# \| (or a workingctx if there were no changes)			# \| (or a workingctx if there were no changes)
	# \|			# \|
	# old o - changeset to amend			# old o - changeset to amend
	# \|			# \|
	# base o - parent of amending changeset			# base o - first parent of the changeset to amend

	# Update extra dict from amended commit (e.g. to preserve graft			# Update extra dict from amended commit (e.g. to preserve graft
	# source)			# source)
	extra.update(old.extra())			extra.update(old.extra())

	# Also update it from the intermediate commit or from the wctx			# Also update it from the intermediate commit or from the wctx
	extra.update(ctx.extra())			extra.update(ctx.extra())

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1527		Aug 31 2017, 10:01 PM	★	★
Diff 2	1573	rHG8fafd5df22f73eedeebcd8970bf4d111d77109b0	Aug 31 2017, 9:35 PM	★	★