This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8324

py3: use integer division in histedit
ClosedPublic

Authored by martinvonz on Mar 25 2020, 2:42 AM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHGd06e748cfd02: py3: use integer division in histedit
Summary

Histedit uses the / operator, which does type conversion to float in
Python 3 instead of integer division likeon Python 2. Let's preserve
the Python 2 behavior by importing and using the // operator.

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

martinvonz created this revision.Mar 25 2020, 2:42 AM
marmoute requested changes to this revision.Mar 25 2020, 5:59 AM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
hgext/histedit.py
193

That import is not needed unless there are other location where you intend / to return float. If this is the case, this is unrelated to the / → // change and should go in an independant changesets.

This revision now requires changes to proceed.Mar 25 2020, 5:59 AM
martinvonz added inline comments.Mar 25 2020, 11:30 AM
hgext/histedit.py
193

Oops, I didn't even realize that the // operator existed in py2. I only noticed that / behaves differently on py2 and py3, so I blindly assumed that the import statement imported the // operator from the future. I've drop this line now.

martinvonz added a commit: rHGd06e748cfd02: py3: use integer division in histedit.Mar 25 2020, 4:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd06e748cfd02: py3: use integer division in histedit (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)

Diff 20883

hgext/histedit.py

of losing the work you've done in a histedit if the histedit aborts of losing the work you've done in a histedit if the histedit aborts
unexpectedly:: unexpectedly::
[histedit] [histedit]
singletransaction = True singletransaction = True
""" """
from __future__ import absolute_import from __future__ import absolute_import
marmouteUnsubmitted
Not Done

That import is not needed unless there are other location where you intend / to return float. If this is the case, this is unrelated to the / → // change and should go in an independant changesets.

marmoute: That import is not needed unless there are other location where you intend `/` to return float.
martinvonzAuthorUnsubmitted
Done

Oops, I didn't even realize that the // operator existed in py2. I only noticed that / behaves differently on py2 and py3, so I blindly assumed that the import statement imported the // operator from the future. I've drop this line now.

martinvonz: Oops, I didn't even realize that the `//` operator existed in py2. I only noticed that `/`…
# chistedit dependencies that are not available everywhere # chistedit dependencies that are not available everywhere
try: try:
import fcntl import fcntl
import termios import termios
except ImportError: except ImportError:
fcntl = None fcntl = None
termios = None termios = None
changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'.''' changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'.'''
mode, _ = state[b'mode'] mode, _ = state[b'mode']
if mode != MODE_PATCH: if mode != MODE_PATCH:
return return
mode_state = state[b'modes'][mode] mode_state = state[b'modes'][mode]
num_lines = len(mode_state[b'patchcontents']) num_lines = len(mode_state[b'patchcontents'])
page_height = state[b'page_height'] page_height = state[b'page_height']
unit = page_height if unit == b'page' else 1 unit = page_height if unit == b'page' else 1
num_pages = 1 + (num_lines - 1) / page_height num_pages = 1 + (num_lines - 1) // page_height
max_offset = (num_pages - 1) * page_height max_offset = (num_pages - 1) * page_height
newline = mode_state[b'line_offset'] + delta * unit newline = mode_state[b'line_offset'] + delta * unit
mode_state[b'line_offset'] = max(0, min(max_offset, newline)) mode_state[b'line_offset'] = max(0, min(max_offset, newline))
def event(state, ch): def event(state, ch):
"""Change state based on the current character input """Change state based on the current character input