This is an archive of the discontinued Mercurial Phabricator instance.

Differential D512

phabsend: detect patch change with larger context
ClosedPublic

Authored by quark on Aug 24 2017, 9:15 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHG27ff2a87d8c0: phabsend: detect patch change with larger context
Summary

Previously phabsend has an optimization that will skip uploading a diff if
the patch (with context line number = 1) remains unchanged. That could be
confusing:

Aug 24 15:52:28 <martinvonz> phillco: something is wrong with phabricator'your patches/
Aug 24 15:52:45 <martinvonz> ... with phabricator's view of your patches again
Aug 24 15:53:38 <martinvonz> if i phabread D388 and then D399, i get a version of filemerge.py with "a, b, c" somewhere on line 344, which is not what phabricator shows for D399
Aug 24 15:53:51 <martinvonz> junw: maybe that's more for you ^

Fix that by checking context with 32767 lines, which is the same as what
will be actually sent.

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

quark created this revision.Aug 24 2017, 9:15 PM
indygreg accepted this revision.Aug 24 2017, 11:51 PM
This revision is now accepted and ready to land.Aug 24 2017, 11:51 PM
durin42 accepted this revision.Aug 28 2017, 2:42 PM
Closed by commit rHG27ff2a87d8c0: phabsend: detect patch change with larger context (authored by quark). · Explain WhyAug 28 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (2 lines)

Diff 1361

contrib/phabricator.py

If oldnode is not None, check if the patch content (without commit message If oldnode is not None, check if the patch content (without commit message
and metadata) has changed before creating another diff. and metadata) has changed before creating another diff.
If actions is not None, they will be appended to the transaction. If actions is not None, they will be appended to the transaction.
""" """
repo = ctx.repo() repo = ctx.repo()
if oldnode: if oldnode:
diffopts = mdiff.diffopts(git=True, context=1) diffopts = mdiff.diffopts(git=True, context=32767)
oldctx = repo.unfiltered()[oldnode] oldctx = repo.unfiltered()[oldnode]
neednewdiff = (getdiff(ctx, diffopts) != getdiff(oldctx, diffopts)) neednewdiff = (getdiff(ctx, diffopts) != getdiff(oldctx, diffopts))
else: else:
neednewdiff = True neednewdiff = True
transactions = [] transactions = []
if neednewdiff: if neednewdiff:
diff = creatediff(ctx) diff = creatediff(ctx)