This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12577

amend: small refactor of logic for clarity
AbandonedPublic

Authored by spectral on Apr 19 2022, 3:21 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

spectral created this revision.Apr 19 2022, 3:21 PM
spectral added a comment.Apr 19 2022, 3:42 PM

I'm not very tied to this, if someone thinks this makes it worse, feel free to reject.

Alphare added a subscriber: Alphare.Apr 20 2022, 12:02 PM

I personally find this harder to read since you have to distribute in your head. -0?

spectral added a comment.Apr 20 2022, 2:16 PM
In D12577#192669, @Alphare wrote:

I personally find this harder to read since you have to distribute in your head. -0?

I would normally agree with you, but I found this one a bit easier to read because it more easily triggered the "on a 4 element truth table, there's only one element I need to worry about" way of thinking of it, and I could read it to myself as "keep items in files unless (they're in filestoamend and they're the same file in base and wctx)". But like I said, I'm +0.5 at best and probably closer to +0.1. I'll drop it :)

spectral abandoned this revision.Apr 20 2022, 2:16 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 33236

mercurial/cmdutil.py

# copy, then those two files are the same and # copy, then those two files are the same and
# we can discard X from our list of files. Likewise if X # we can discard X from our list of files. Likewise if X
# was removed, it's no longer relevant. If X is missing (aka # was removed, it's no longer relevant. If X is missing (aka
# deleted), old X must be preserved. # deleted), old X must be preserved.
files.update(filestoamend) files.update(filestoamend)
files = [ files = [
f f
for f in files for f in files
if (f not in filestoamend or not samefile(f, wctx, base)) if not (f in filestoamend and samefile(f, wctx, base))
] ]
def filectxfn(repo, ctx_, path): def filectxfn(repo, ctx_, path):
try: try:
# If the file being considered is not amongst the files # If the file being considered is not amongst the files
# to be amended, we should use the file context from the # to be amended, we should use the file context from the
# old changeset. This avoids issues when only some files in # old changeset. This avoids issues when only some files in
# the working copy are being amended but there are also # the working copy are being amended but there are also