[Bug 6288] New: The curses ui doesn't support word diff

https://bz.mercurial-scm.org/show_bug.cgi?id=6288 Bug ID: 6288 Summary: The curses ui doesn't support word diff Product: Mercurial Version: 5.3 Hardware: All OS: All Status: UNCONFIRMED Severity: feature

D8295: rebase: mention -r argument in synopsis

mharbison72 added a comment. mharbison72 accepted this revision. Weird, I thought this was dependent on evolve too. But I guess if that were really the case, it would have be implemented in a wrapper in evolve. I suppose it works without evolve if using `--keep`, but I never use that. REPO

D8293: rebase: accept multiple --base arguments (BC)

martinvonz added a comment. martinvonz marked an inline comment as done. I've updated the synopsis (also added another patch in the series for adding `-r` to the synopsis). REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8293/new/ REVISION DETAIL htt

D8292: rebase: accept multiple --source arguments (BC)

martinvonz updated this revision to Diff 20791. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8292?vs=20783&id=20791 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8292/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8293: rebase: accept multiple --base arguments (BC)

martinvonz updated this revision to Diff 20792. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8293?vs=20784&id=20792 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8293/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8295: rebase: mention -r argument in synposis

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm guessing that we simply forgot to mention it there. I was wondering if maybe `-r` was experimental as long as evolution is, but that doesn't seem to be th

D8280: tests: make test-doctest.t module list match reality

spectral added a comment. spectral marked an inline comment as done. In D8280#123642 , @marmoute wrote: > Should we try to move to some automatic detection of file with doctest? That would be more reliable. D8294

D8281: narrow: escape includepats/excludepats when sending over the wire (BC)

spectral updated this revision to Diff 20789. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8281?vs=20767&id=20789 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8281/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8

D8294: tests: make test-doctest.t automatically find files to run tests on

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8294 AFFECTED FILES tests/test-doctest.py CHANGE DETAILS diff --git a/tests/test-d

D8293: rebase: accept multiple --base arguments (BC)

mharbison72 added inline comments. INLINE COMMENTS > rebase.py:874 > + cmdutil.confirmopts, > _(b'[-s REV | -b REV] [-d REV] [OPTION]'), > helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, Maybe these need to be updated to `REV...` like some other commands that take multiple revs.

D8137: phabricator: add a config knob to import in the secret phase

Closed by commit rHG9bae1d1a0f4c: phabricator: add a config knob to import in the secret phase (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8137?vs=20555

D8136: phabricator: add a `phabimport` command

Closed by commit rHGbbb170f9396d: phabricator: add a `phabimport` command (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8136?vs=20554&id=20785 CHANGES SI

D8138: phabricator: add a config knob to create obsolete markers when importing

Closed by commit rHGf10055b099b3: phabricator: add a config knob to create obsolete markers when importing (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8

D8293: rebase: accept multiple --base arguments

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same reasoning as for the previous patch. Rebase has worked well with `--base 'A + B'` since 51e7c83e05ee

D8292: rebase: accept multiple --source arguments (BC)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think it's a little surprising that `hg rebase -s A -s B` rebases only `B::` and ignores `A`. That's because the `-s` flag is not a repeated flag. This patc

D8291: rebase: remove unused defaults argument values from _definedestmap()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The caller always provides values for these arguments. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8291 AFFE

D8287: fix: add a -s option to format a revision and its descendants

martinvonz updated this revision to Diff 20780. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8287?vs=20776&id=20780 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8287/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8288: fix: mark -r as advanced

martinvonz updated this revision to Diff 20781. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8288?vs=20777&id=20781 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8288/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8287: fix: add a -s option to format a revision and its descendants

martinvonz added inline comments. INLINE COMMENTS > mharbison72 wrote in fix.py:221 > nit: is `descendants` usually self referential? (The revset is, but IDK if > that's what a casual reader would expect here.) The same option for rebase > says: > > rebase the specified changeset and desce

D8287: fix: add a -s option to format a revision and its descendants

mharbison72 added a comment. Thanks for this! INLINE COMMENTS > fix.py:221 > +[], > +_(b'fix descendants of these revisions'), > +_(b'REV'), nit: is `descendants` usually self referential? (The revset is, but IDK if that's what a casual reader would expect here.) The same opti

D8289: resolve: add a --clear option for clearing the merge state

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8289 AFFECTED FILES mercurial/commands.py relnotes/next tests/test-completion.

D8290: morestatus: recommend `hg resolve --clear` when appropriate

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8290 AFFECTED FILES mercurial/cmdutil.py tests/test-update-branches.t CHANGE DE

D8287: fix: add a -s option to format a revision and its descendants

hooper added a comment. D8283 :D8288 all looks good to me. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8287/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8287 To

D8287: fix: add a -s option to format a revision and its descendants

martinvonz updated this revision to Diff 20776. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8287?vs=20774&id=20776 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8287/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8288: fix: mark -r as advanced

martinvonz updated this revision to Diff 20777. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8288?vs=20775&id=20777 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8288/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8287: fix: add a -s option to format a revision and its descendants

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants

D8288: fix: mark -r as advanced

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY See the previous patch for reasoning. I planned to even mark it deprecated, but someone (timeless?) on the #mercurial IRC channel said they sometimes wanted t

D8286: fix: move handling of --all into getrevstofix() for consistency

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8286 AFFECTED FILES hgext/fix.py CHANGE DETAILS diff --git a/hgext/fix.py b/hgex

D8285: fix: refactor getrevstofix() to define revisions first, then validate them

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This refactoring makes it easier to add a new way of specifying revisions (I'm about to add a `--source`, which adds the specified revisions and their descend

D8284: fix: disallow `hg fix --all --working-dir`

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `--all` implies `--working-dir`, so it's probably a mistake if the user uses both. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab

D8232: phabricator: add a helper function to convert DREVSPECs to a DREV dict list

mharbison72 added a comment. In D8232#123673 , @Alphare wrote: > This seems like something that can easily have a few simple unit tests The next patch attempts to provide coverage. I'm not sure how else to test this, because it wants to c

D8283: tests: simplify test-fix-topology.t slightly by using a `(case !)`

martinvonz updated this revision to Diff 20770. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8283?vs=20769&id=20770 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8283/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. In D8282#123677 , @martinvonz wrote: > In D8282#123675 , @marmoute wrote: > >> Can you drop your change to `tests/test-push-race.t` from this patch ? > > That chang

D8282: tests: consistently put #testcases at beginning of file

martinvonz added a comment. In D8282#123675 , @marmoute wrote: > Can you drop your change to `tests/test-push-race.t` from this patch ? That change is consistent with the other changes in putting `#requires` and `#testcases` first. I'll u

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. Can you drop your change to `tests/test-push-race.t` from this patch ? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8282/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8282 To: martinvonz, durin42, #hg-reviewers, ma

D8282: tests: consistently put #testcases at beginning of file

martinvonz added a comment. In D8282#123665 , @marmoute wrote: > That's a good point, doing it for `#require` too would be more consistent. > I would make a difference between test that do not make too much of an effort to have a title + ear

D8232: phabricator: add a helper function to convert DREVSPECs to a DREV dict list

Alphare added a comment. This seems like something that can easily have a few simple unit tests REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8232/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8232 To: mharbison72, #hg-reviewers Cc: Alphare,

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. That's a good point, doing it for `#require` too would be more consistent. I would make a difference between test that do not make too much of an effort to have a title + early documentation and the one who actually make effort to have a formal format for their

D8282: tests: consistently put #testcases at beginning of file

martinvonz added a comment. In D8282#123663 , @marmoute wrote: > In D8282#123661 , @martinvonz wrote: > >> (like imports and includes in other languages) > > Precisely, import and includes u

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. In D8282#123661 , @martinvonz wrote: > (like imports and includes in other languages) Precisely, import and includes usually comes **after** the initial module licence, title and documentation. So I would like th

D8281: narrow: escape includepats/excludepats when sending over the wire (BC)

martinvonz added a comment. In D8281#123659 , @mharbison72 wrote: > In D8281#123625 , @spectral wrote: > >> In D8281#123621 , @mharbison72 wrote:

D8282: tests: consistently put #testcases at beginning of file

martinvonz added a comment. I very much agree with Matt In D8282#123660 , @marmoute wrote: > I would rather have the large title (===\ntitle\n===) be the very first things in the test for clarify. I'm like @mharbison72 and mostly ski

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. I would rather have the large title (===\ntitle\n===) be the very first things in the test for clarify. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8282/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8282 To: mart

D8281: narrow: escape includepats/excludepats when sending over the wire (BC)

mharbison72 added a comment. In D8281#123625 , @spectral wrote: > In D8281#123621 , @mharbison72 wrote: > >> The Windows path changes seem like a good idea. >> Would quoting paths with commas

D8282: tests: consistently put #testcases at beginning of file

mharbison72 added inline comments. mharbison72 accepted this revision. INLINE COMMENTS > martinvonz wrote in test-push-race.t:1-3 > > Please avoir putting content before the > > test file title. > > Why? (I personally don't find this hard to read.) I'd go further and say it's easier to read whe

D8282: tests: consistently put #testcases at beginning of file

martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in test-push-race.t:1-3 > Please avoir putting content before the test file title. > (and maybe keep the documentation closer to them.) > Please avoir putting content before the > test file title. Why? (I personally don't find t

D8281: narrow: escape includepats/excludepats when sending over the wire (BC)

This revision now requires changes to proceed. marmoute added a comment. marmoute requested changes to this revision. The escaping scheme is a bit puzzling to me. Coudl we use something more standard for this ? (like urlencode). (requesting change of the function name. Now that we can, le

D8282: tests: consistently put #testcases at beginning of file

marmoute added a comment. The other change looks good and I would take them if they were not in the same changeset as the change in tests/test-push-race.t INLINE COMMENTS > test-push-race.t:1-3 > +#testcases strict unrelated > + > > =

D8280: tests: make test-doctest.t module list match reality

marmoute added a comment. Should we try to move to some automatic detection of file with doctest? That would be more reliable. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8280/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8280 To: spectra

Re: Mercurial 5.4 Sprint; Paris, France; March 27th-29th.

Hello again, TL;DR: The end of March sprint is cancelled. It will be rescheduled once the pandemic settled down. Given he current trend and the restriction already in place. We have to cancel the current sprint plan. Avoiding extra mixing of people is the responsible things to do at this p