Page MenuHomePhabricator

dploch (Daniel Ploch)
User

Projects

User does not belong to any projects.

User Details

User Since
Jan 10 2018, 9:13 PM (135 w, 9 h)

Recent Activity

Mon, Jul 20

dploch closed D8714: state: support validated declaration of nested unfinished ops.
Mon, Jul 20, 9:34 AM
dploch committed rHG5322e738be0f: state: support validated declaration of nested unfinished ops.
state: support validated declaration of nested unfinished ops
Mon, Jul 20, 9:34 AM

Fri, Jul 17

dploch added a comment to D8714: state: support validated declaration of nested unfinished ops.

Following test fails with this patch:

--- /tests/test-check-code.t
+++ /tests/test-check-code.t.err
@@ -33,6 +33,16 @@
   Skipping i18n/polib.py it has no-che?k-code (glob)
   Skipping mercurial/statprof.py it has no-che?k-code (glob)
   Skipping tests/badserverext.py it has no-che?k-code (glob)
+  tests/test-state-extension.t:79:
+   >   $ hg co -q .^
+   warning: ^ must be quoted
+  tests/test-state-extension.t:82:
+   >   $ hg co -q .^
+   warning: ^ must be quoted
+  tests/test-state-extension.t:85:
+   >   $ hg co -q .^
+   warning: ^ must be quoted
+  [1]
 @commands in debugcommands.py should be in alphabetical order.
ERROR: test-check-code.t output changed
!
--- /tests/test-check-pylint.t
+++ /tests/test-check-pylint.t.err
@@ -20,3 +20,9 @@
   ------------------------------------ (?)
   Your code has been rated at 10.00/10 (?)
    (?)
+  ************* Module mercurial.state
+  W:200, 0: Dangerous default value [] as argument (dangerous-default-value)
+  
+  ------------------------------------
+  Your code has been rated at 10.00/10
+  
ERROR: test-check-pylint.t output changed
!
Fri, Jul 17, 8:05 PM
dploch updated the diff for D8714: state: support validated declaration of nested unfinished ops.
Fri, Jul 17, 8:04 PM
dploch closed D8730: error: unify the error message formats for 'rebase' and 'unshelve'.
Fri, Jul 17, 2:10 PM
dploch closed D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Fri, Jul 17, 2:05 PM
dploch committed rHGe429e7c801b2: error: normalize "unresolved conflicts" error messages with a custom class.
error: normalize "unresolved conflicts" error messages with a custom class
Fri, Jul 17, 2:04 PM
dploch committed rHGdc5e5577af39: error: unify the error message formats for 'rebase' and 'unshelve'.
error: unify the error message formats for 'rebase' and 'unshelve'
Fri, Jul 17, 2:04 PM

Thu, Jul 16

dploch added a comment to D8730: error: unify the error message formats for 'rebase' and 'unshelve'.

Update also have some clearer precursors message. eg:

warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges

My general point is that if we are to unify and improve merge conflict related message, we should probably align things on what the main command for merging is: hg merge. (Possibly improving it in the process).

Right, I agree with that, but I also don't want that to be a requirement for the series to get accepted. In other words, I'd be happy to see that larger unification, but I'd leave it up to Daniel to decide if it's worth his time.

Thu, Jul 16, 8:09 PM

Tue, Jul 14

dploch added inline comments to D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Tue, Jul 14, 4:42 PM
dploch added a comment to D8730: error: unify the error message formats for 'rebase' and 'unshelve'.

! In D8730#130363, @martinvonz wrote:
I think that's a know problem (known to me anyway :)). You can fix it here in Phabricator's UI. I'll do that for you.

Tue, Jul 14, 4:40 PM
dploch updated the diff for D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Tue, Jul 14, 4:39 PM
dploch updated the diff for D8714: state: support validated declaration of nested unfinished ops.
Tue, Jul 14, 4:38 PM

Jul 13 2020

dploch added a comment to D8730: error: unify the error message formats for 'rebase' and 'unshelve'.

Er, well... I guess reordering the chain broke phabricator? Originally I had A -> B -> C, as suggested I reordered this to B -> A -> C with appropriate changes, and how hg phabsend crashes with:

Jul 13 2020, 7:50 PM
Herald added a reviewer for D8730: error: unify the error message formats for 'rebase' and 'unshelve': martinvonz.
Jul 13 2020, 7:49 PM
dploch added inline comments to D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Jul 13 2020, 7:47 PM

Jul 10 2020

dploch added a comment to D8714: state: support validated declaration of nested unfinished ops.

Can you give an example of an extension that would benefit from this? It’s not immediately obvious to me, and ideally patches should be written such that it’s obvious for most people. :)

To give a concrete example, we have an internal command which does something similar to chainify. It generates N individual commits with different parents (based on input flags), then rebases then sequentially into a single chain in a specific order; it currently does some hacky wrapping of methods in this file to make it work. We have need of another command that does something similar with multiple evolve instructions; rather than repeat the hacks, I thought it would be good to make the support cleaner by implementing it upstream.

Can you add a test case? That would probably also help understanding the use case.

I added a test file with a simple-ish example extension that hopefully clarifies the intent. I revised the changes a bit to make the intended usage in extensions cleaner/more intuitive (I probably should have done this in the first place since there were also two minor bugs in the initial draft.)

Jul 10 2020, 9:19 PM
dploch added a comment to D8713: error: normalize "unresolved conflicts" error messages with a custom class.

Can you separate the change from "unresolved conflicts (see hg resolve, then hg rebase --continue)" to "unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')", to make the diff less noisy?

Done. Added a temporary legacy hook which is removed in D8730; all the .t file updates are moved to that revision as well.

Of course, it feels stupid to change code that’s going to be replaced in the next patch. Still, I think it makes things easier to review (at least that’s my opinion, I don’t know if more experienced reviewers agree).

I suppose it's nice in this case because it confirms that it's only the rebase message that's changing (whereas otherwise, you'd need to check every .t file to see this).

Jul 10 2020, 9:14 PM
dploch added a comment to D8712: black: format some files in preparation for subsequent changes.

Sorry for the noise. There was some conflict between our internal fix configuration and the black.toml setup in the hg repo; I thought I had sorted it out but I was mistaken (and black apparently leaves the opinionated quotation-style changes in place, it doesn't have its own opinion about them?)

Jul 10 2020, 9:12 PM
dploch created D8730: error: unify the error message formats for 'rebase' and 'unshelve'.
Jul 10 2020, 9:08 PM
dploch updated the diff for D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Jul 10 2020, 9:05 PM
dploch updated the diff for D8714: state: support validated declaration of nested unfinished ops.
Jul 10 2020, 9:05 PM

Jul 8 2020

dploch created D8713: error: normalize "unresolved conflicts" error messages with a custom class.
Jul 8 2020, 6:55 PM
dploch created D8712: black: format some files in preparation for subsequent changes.
Jul 8 2020, 6:51 PM
dploch created D8714: state: support validated declaration of nested unfinished ops.
Jul 8 2020, 6:50 PM

Nov 21 2019

dploch closed D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings.
Nov 21 2019, 8:41 AM
dploch committed rHGbfbbf48d51e8: py3: make doc strings containing deprecated '\.' escape sequence raw strings.
py3: make doc strings containing deprecated '\.' escape sequence raw strings
Nov 21 2019, 8:40 AM

Nov 20 2019

dploch created D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings.
Nov 20 2019, 10:17 PM

Nov 13 2019

dploch closed D7372: remotefilelog: handle **kwargs correctly when overriding changelog.add().
Nov 13 2019, 9:00 AM
dploch committed rHGc5f6f58f6c71: remotefilelog: handle **kwargs correctly when overriding changelog.add().
remotefilelog: handle **kwargs correctly when overriding changelog.add()
Nov 13 2019, 9:00 AM

Nov 12 2019

dploch created D7372: remotefilelog: handle **kwargs correctly when overriding changelog.add().
Nov 12 2019, 6:55 PM

Jan 9 2019

dploch closed D5534: merge: make local file storage in the .hg/merge directory extensible.
Jan 9 2019, 3:11 PM
dploch committed rHG8c222bec97da: merge: make local file storage in the .hg/merge directory extensible.
merge: make local file storage in the .hg/merge directory extensible
Jan 9 2019, 3:10 PM

Jan 8 2019

dploch created D5534: merge: make local file storage in the .hg/merge directory extensible.
Jan 8 2019, 6:20 PM

Mar 23 2018

dploch closed D2935: fancyopts: fix rendering of customopt defaults in help text.
Mar 23 2018, 11:07 PM
dploch committed rHG979c8ce9022d: fancyopts: fix rendering of customopt defaults in help text.
fancyopts: fix rendering of customopt defaults in help text
Mar 23 2018, 11:07 PM
dploch committed rHGef6215df2402: fancyopts: prevent mutation of the default value in customopts.
fancyopts: prevent mutation of the default value in customopts
Mar 23 2018, 11:07 PM
dploch closed D2937: fancyopts: prevent mutation of the default value in customopts.
Mar 23 2018, 11:07 PM
dploch added a comment to D2935: fancyopts: fix rendering of customopt defaults in help text.
In D2935#47329, @yuja wrote:

Looks good, but can you split this to two patches?
https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

Mar 23 2018, 2:24 PM
dploch created D2937: fancyopts: prevent mutation of the default value in customopts.
Mar 23 2018, 2:24 PM
dploch updated the diff for D2935: fancyopts: fix rendering of customopt defaults in help text.
Mar 23 2018, 2:23 PM

Mar 22 2018

dploch updated subscribers of D2935: fancyopts: fix rendering of customopt defaults in help text.
Mar 22 2018, 8:16 PM
dploch created D2935: fancyopts: fix rendering of customopt defaults in help text.
Mar 22 2018, 8:10 PM

Mar 5 2018

dploch added inline comments to D2623: dispatch: adding config items for overriding flag defaults.
Mar 5 2018, 6:29 PM

Feb 22 2018

dploch committed rHGcc9d0763c8e9: fancyopts: add support for custom multi-arg opts in fancyopts.py.
fancyopts: add support for custom multi-arg opts in fancyopts.py
Feb 22 2018, 8:29 AM

Feb 21 2018

dploch committed rHG2ed36fec5321: fancyopts: add support for custom multi-arg opts in fancyopts.py.
fancyopts: add support for custom multi-arg opts in fancyopts.py
Feb 21 2018, 11:06 PM
dploch closed D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.
Feb 21 2018, 11:06 PM
dploch added a comment to D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.

Out of curiosity, do you think it would be possible to implement an option that behaved like a boolean when given in isolation but also optionally accepted a value? My use case is I want hg serve --open to automatically open a web browser pointing at the started server and hg serve --open chrome to open Chrome instead of my default web browser. I'm not sure if that's a good idea to implement in the parser though. It could possibly lead to ambiguous argument parsing.

Feb 21 2018, 10:26 PM
dploch updated the diff for D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.
Feb 21 2018, 10:26 PM

Feb 20 2018

dploch added a comment to D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.

Friendly ping! This is my first commit so I'm not sure if more information or changes are expected; please let me know if there's anything I'm missing.

Feb 20 2018, 11:18 PM

Feb 7 2018

dploch added a comment to D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.

The fancyopts code is some of the oldest in Mercurial. We've been wanting to rewrite it for a while. This patch seems like an interesting and more powerful direction to take the parser.
Out of curiosity, do you have an intended use case in mind? Will that use case be in Mercurial itself or is this for an extension?

Feb 7 2018, 9:53 PM
dploch created D2090: fancyopts: add support for custom multi-arg opts in fancyopts.py.
Feb 7 2018, 8:38 PM