This is an archive of the discontinued Mercurial Phabricator instance.

hgext/strip.py
218	It's not, but we're going to eventually want to kill the module loader hack, and so I figured since I'm dirtying the line anyway I may as well b-prefix it.

pulkit accepted this revision.Jan 18 2018, 8:47 AM

pulkit added inline comments.

hgext/strip.py
218	That's a good idea. I will follow the same.

yuja added a subscriber: yuja.Jan 18 2018, 8:53 AM

yuja added inline comments.

hgext/strip.py
218	It should be `repo.revs("%d::.", uctx.rev())` by the way.

durin42 marked an inline comment as done.Jan 18 2018, 8:55 AM

durin42 added inline comments.

hgext/strip.py
218	I'm unclear: are you asking to remove the b-prefix? Adding it was intentional, since eventually we're going to need to rewrite everything so we can ditch the module loader hack.

yuja added inline comments.Jan 18 2018, 9:07 AM

hgext/strip.py
218	No. I mean it should use revset.formatspec. i.e. `revs(expr, arg)` instead of `revs(expr % arg)`.

durin42 added inline comments.Jan 18 2018, 10:23 AM

hgext/strip.py
218	Oh good catch, I'll insert another change to fix that in isolation.

durin42 mentioned this in D1905: strip: use in-place revset formatspec instead of %-formatting ourselves.Jan 18 2018, 11:12 AM

durin42 updated this revision to Diff 4906.

indygreg accepted this revision.Feb 1 2018, 3:30 PM

This revision is now accepted and ready to land.Feb 1 2018, 3:30 PM

durin42 mentioned this in rHG41f952d10905: strip: use in-place revset formatspec instead of %-formatting ourselves.Feb 1 2018, 3:32 PM

Closed by commit rHG81a00cd2a6e5: strip: use %d for known-int string interpolation (authored by durin42). · Explain Why

This revision was automatically updated to reflect the committed changes.

durin42 mentioned this in rHG011ca2d795d6: strip: use in-place revset formatspec instead of %-formatting ourselves.Feb 1 2018, 4:37 PM

Revision Contents
Changeset List

			Path	Packages
M			hgext/strip.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4874		Jan 18 2018, 8:38 AM	★	★
Diff 2	4906		Jan 18 2018, 11:12 AM	★	★
Diff 3	5054	rHG81a00cd2a6e59f1c686c9b98901d69370e2178a6	Jan 17 2018, 8:07 PM	★	★

Status	Author	Revision
Closed	durin42	D1908 python3: whitelist an additional 23 passing tests
Closed	durin42	D1907 tests: fix a missed b prefix in a test extension in test-strip.t
Closed	durin42	D1906 revlog: correct type in check to verify rawtext is immutable
Closed	durin42	D1903 mq: use bytes() instead of str() to encode statusentries for writing
Closed	durin42	D1902 mq: open status file et al in bytes mode
Closed	durin42	D1901 mq: fix up statusentry to be both repr()-able and bytes()-able
Closed	durin42	D1900 python3: whitelist another 7 passing tests
Closed	durin42	D1899 localrepo: pass transaction kwargs as strings, not bytes
Closed	durin42	D1898 localrepo: consistently use native str when __dict__ is involved
Closed	durin42	D1897 smartset: use native string when peeking in __dict__
Closed	durin42	D1896 obsolete: use native string when peeking in __dict__
Closed	durin42	D1895 lsprof: use native string when peeking in __dict__
Closed	durin42	D1894 dirstate: use native strings when peeking in __dict__
Closed	durin42	D1893 context: use native string when peeking in __dict__
Closed	durin42	D1892 bundlerepo: use native str when peeking in __dict__
Closed	durin42	D1891 transaction: fix hg version check when loading journal
Closed	durin42	D1890 branchmap: make error messages consistent between Python 2 and 3
Closed	durin42	D1889 tests: bytestring-ify all the adhoc extensions in test-strip.t
Closed	durin42	D1888 filemerge: fix regular expression pattern to be bytes
Closed	durin42	D1887 tags: explicitly grab list of dict keys
Closed	durin42	D1886 commands: replace map() with list comprehension
Closed	durin42	D1885 commands: rewrite legacy ternary operator hack using modern syntax
Closed	durin42	D1884 strip: use %d for known-int string interpolation
Closed	durin42	D1905 strip: use in-place revset formatspec instead of %-formatting ourselves
Closed	durin42	D1883 tests: get run-tests to reliably hand shellquote a string and not a bytes

Diff 4906

hgext/strip.py


	revs = sorted(rootnodes)			revs = sorted(rootnodes)
	if update and opts.get('keep'):			if update and opts.get('keep'):
	urev = _findupdatetarget(repo, revs)			urev = _findupdatetarget(repo, revs)
	uctx = repo[urev]			uctx = repo[urev]

	# only reset the dirstate for files that would actually change			# only reset the dirstate for files that would actually change
	# between the working context and uctx			# between the working context and uctx
	descendantrevs = repo.revs("%s::.", uctx.rev())			descendantrevs = repo.revs(b"%d::.", uctx.rev())
				pulkitUnsubmitted Done b'' is not required. pulkit: b'' is not required.
				durin42AuthorUnsubmitted Not Done It's not, but we're going to eventually want to kill the module loader hack, and so I figured since I'm dirtying the line anyway I may as well b-prefix it. durin42: It's not, but we're going to eventually want to kill the module loader hack, and so I figured…
				pulkitUnsubmitted Not Done That's a good idea. I will follow the same. pulkit: That's a good idea. I will follow the same.
				yujaUnsubmitted Not Done It should be `repo.revs("%d::.", uctx.rev())` by the way. yuja: It should be `repo.revs("%d::.", uctx.rev())` by the way.
				durin42AuthorUnsubmitted Not Done I'm unclear: are you asking to remove the b-prefix? Adding it was intentional, since eventually we're going to need to rewrite everything so we can ditch the module loader hack. durin42: I'm unclear: are you asking to remove the b-prefix? Adding it was intentional, since eventually…
				yujaUnsubmitted Not Done No. I mean it should use revset.formatspec. i.e. `revs(expr, arg)` instead of `revs(expr % arg)`. yuja: No. I mean it should use revset.formatspec. i.e. `revs(expr, arg)` instead of `revs(expr %…
				durin42AuthorUnsubmitted Not Done Oh good catch, I'll insert another change to fix that in isolation. durin42: Oh good catch, I'll insert another change to fix that in isolation.
	changedfiles = []			changedfiles = []
	for rev in descendantrevs:			for rev in descendantrevs:
	# blindly reset the files, regardless of what actually changed			# blindly reset the files, regardless of what actually changed
	changedfiles.extend(repo[rev].files())			changedfiles.extend(repo[rev].files())

	# reset files that only changed in the dirstate too			# reset files that only changed in the dirstate too
	dirstate = repo.dirstate			dirstate = repo.dirstate
	dirchanges = [f for f in dirstate if dirstate[f] != 'n']			dirchanges = [f for f in dirstate if dirstate[f] != 'n']

This is an archive of the discontinued Mercurial Phabricator instance.

strip: use %d for known-int string interpolationClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4906

hgext/strip.py

strip: use %d for known-int string interpolation
ClosedPublic

Revision Contents
Changeset List