durin42 requested changes to this revision.
durin42 added a comment.
This revision now requires changes to proceed.
(moving this off the dashboard until it gets updated)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
To: sangeet259, #hg-reviewers, durin42
Apologies, I didn't run the tests after the latest addition.
On Tue, Feb 19, 2019, 20:39 durin42 (Augie Fackler) <
phabrica...@mercurial-scm.org wrote:
> durin42 added a comment.
>
>
> Even with my in-flight fixes, I can't get this to use the
> non-unified_diff codepath. Can you test again?
durin42 added a comment.
Even with my in-flight fixes, I can't get this to use the non-unified_diff
codepath. Can you test again?
https://bitbucket.org/snippets/durin42/nejj94 has my in-flight fixes, but you
may find it challenging to apply (the test output in the commit message
durin42 added a comment.
I've done some cleanups (dropped an unused import, copyedited the commit
message a bit) and should push this soon. Thanks!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
To: sangeet259, #hg-reviewers, durin42
Cc: pulkit, durin42,
sangeet259 added a comment.
Hey @durin42 , take a look at the changes when you get time.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
To: sangeet259, #hg-reviewers, durin42
Cc: pulkit, durin42, mercurial-devel
sangeet259 added a comment.
ping @durin42
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
To: sangeet259, #hg-reviewers, durin42
Cc: pulkit, durin42, mercurial-devel
___
Mercurial-devel mailing list
sangeet259 updated this revision to Diff 13998.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5514?vs=13123=13998
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
AFFECTED FILES
mercurial/mdiff.py
tests/run-tests.py
CHANGE DETAILS
diff --git
durin42 added inline comments.
INLINE COMMENTS
> mdiff.py:554
> +
> +def new_diff(expected, output, ref, err):
> +exp, date1, out, date2, opts = prepare_mdiff(expected, output)
At least add a docstring taht explains this is designed to be a similar API to
`difflib.unified_diff`?
>
sangeet259 updated this revision to Diff 13123.
sangeet259 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5514?vs=13051=13123
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
AFFECTED FILES
mercurial/mdiff.py
durin42 added a comment.
In https://phab.mercurial-scm.org/D5514#81800, @sangeet259 wrote:
> @durin42 So the `try/except` will fall back to `unified diff`?
Correct.
> Is there a way we can enforce this on system's that don't have mercurial
installed globally and not have to
sangeet259 added a comment.
@durin42 So the `try/except` will fall back to `unified diff`?
Is there a way we can enforce this on system's that don't have mercurial
installed globally and not have to fall back on the earlier practice.
Also, I didn't get your comment on checking the API
pulkit added a comment.
> If you couldn't follow those steps, you can simply check the diffs here:
>
> test's diff: https://pastebin.com/Z4LRg4vx
> diff used by hg diff: https://pastebin.com/qanQEsiA
Can you make the diffs a part of commit message since pastebin's pastes can
be
durin42 requested changes to this revision.
durin42 added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> run-tests.py:72
> import xml.dom.minidom as minidom
> +from mercurial import mdiff, patch
>
This will fail if Mercurial isn't already globally installed
sangeet259 added a comment.
Note: To see this in action, one needs to add the changes from this
`mdiff.py` to the mdiff.py of their installed mercurial.
This is because unless you do that, you cannot import `mdiff.new_patch` as
that function won't be there in your installed version, and
sangeet259 updated this revision to Diff 13051.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5514?vs=13050=13051
REVISION DETAIL
https://phab.mercurial-scm.org/D5514
AFFECTED FILES
mercurial/mdiff.py
tests/run-tests.py
CHANGE DETAILS
diff --git
15 matches
Mail list logo