This is an archive of the discontinued Mercurial Phabricator instance.

tweakdefaults: add ellipsis to trimmed showupdated commit messages
ClosedPublic

Authored by • jeroenv on Aug 2 2017, 8:47 AM.

Reviewers

durham

Group Reviewers

Restricted Project

Commits

Summary

Keep showupdated commit messages limited to a 50 character width,
with a "..." ellipsis to signify that the message was trimmed.

Test Plan

Added a test.

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Aug 2 2017, 10:43 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			hgext3rd/tweakdefaults.py (3 lines)
M			tests/test-tweakdefaults.t (8 lines)

	lastnewnodes = mapping[lastoldnode]			lastnewnodes = mapping[lastoldnode]
	_printupdatednode(repo, lastoldnode, lastnewnodes)			_printupdatednode(repo, lastoldnode, lastnewnodes)
	return orig(repo, mapping, operation)			return orig(repo, mapping, operation)

	def _printupdatednode(repo, oldnode, newnodes):			def _printupdatednode(repo, oldnode, newnodes):
	# oldnode was not updated if newnodes is an iterable			# oldnode was not updated if newnodes is an iterable
	if len(newnodes) == 1:			if len(newnodes) == 1:
	newnode = newnodes[0]			newnode = newnodes[0]
	firstline = repo[newnode].description().split("\n")[0][:50]			firstline = encoding.trim(
				repo[newnode].description().split("\n")[0], 50, '...')
	repo.ui.status(_("%s -> %s \"%s\"\n") % (			repo.ui.status(_("%s -> %s \"%s\"\n") % (
	short(oldnode), short(newnode), firstline))			short(oldnode), short(newnode), firstline))

	def _computeobsoletenotrebasedwrapper(orig, repo, rebaseobsrevs, dest):			def _computeobsoletenotrebasedwrapper(orig, repo, rebaseobsrevs, dest):
	"""Wrapper for _computeobsoletenotrebased from rebase extensions			"""Wrapper for _computeobsoletenotrebased from rebase extensions

	Unlike upstream rebase, we don't want to skip purely pruned commits.			Unlike upstream rebase, we don't want to skip purely pruned commits.
	We also want to explain why some particular commit was skipped."""			We also want to explain why some particular commit was skipped."""

	73800d52e8dd -> 3145d47a5692 "6"			73800d52e8dd -> 3145d47a5692 "6"
	7ab24e484daf -> 03a9e0e4badc "3"			7ab24e484daf -> 03a9e0e4badc "3"
	a602e0d56f83 -> e7a99f1fea2a "b"			a602e0d56f83 -> e7a99f1fea2a "b"
	d5e255ef74f8 -> 72d850a207d5 "c"			d5e255ef74f8 -> 72d850a207d5 "c"
	...			...
	ee71024c6e8c -> 0c42bb4bf23f "2"			ee71024c6e8c -> 0c42bb4bf23f "2"
	saved backup bundle to $TESTTMP/showupdated/.hg/strip-backup/6e3ddf6f49ef-4b18babd-rebase.hg (glob)			saved backup bundle to $TESTTMP/showupdated/.hg/strip-backup/6e3ddf6f49ef-4b18babd-rebase.hg (glob)

				Test rebase with showupdate=True and a long commit message
				$ touch longfile && hg add -q
				$ hg commit -qm "This is a long commit message which will be truncated."
				$ hg rebase -d 1
				rebasing 14:e915a57d67db "This is a long commit message which will be truncated." (tip)
				e915a57d67db -> 5444f740ff6c "This is a long commit message which will be tru..."
				saved backup bundle to $TESTTMP/showupdated/.hg/strip-backup/e915a57d67db-ad3372b5-rebase.hg (glob)

	Test bookmark -D			Test bookmark -D
	$ cd $TESTTMP			$ cd $TESTTMP
	$ hg init book-D			$ hg init book-D
	$ cd book-D			$ cd book-D
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> strip=			> strip=
	> [experimental]			> [experimental]