Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (172 w, 6 d)

Recent Activity

Yesterday

martinvonz updated the diff for D9167: errors: introduce InputError and use it from commands and cmdutil.
Tue, Oct 20, 3:34 PM
martinvonz created D9234: errors: remove unnecessary override of __bytes__ in RevlogError.
Tue, Oct 20, 3:33 PM
martinvonz added a comment to D9152: hook: ignore EPIPE when flushing stdout/stderr.

The test case fails on both py2 and py3 for me. This CI pipeline agrees that it's failing: https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/11695. Can you send a fix?

Tue, Oct 20, 1:06 PM

Fri, Oct 16

martinvonz added a reviewer for D9226: fix: don't include obsolete descendants with -s: hooper.
Fri, Oct 16, 7:05 PM
martinvonz created D9226: fix: don't include obsolete descendants with -s.
Fri, Oct 16, 7:04 PM
martinvonz created D9227: fix: only check for obsolete commits in the --rev case.
Fri, Oct 16, 7:04 PM
martinvonz created D9224: fix: suggest --source instead of --rev on empty revset.
Fri, Oct 16, 7:04 PM
martinvonz created D9225: tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes.
Fri, Oct 16, 7:04 PM
martinvonz added inline comments to D9218: commit: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 11:12 AM
martinvonz updated the diff for D9218: commit: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 11:12 AM
martinvonz closed D9223: tag: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:52 AM
martinvonz closed D9222: serve: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:51 AM
martinvonz closed D9221: revert: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:51 AM
martinvonz committed rHG94f681b84c70: tag: leverage cmdutil.check_incompatible_arguments().
tag: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:51 AM
martinvonz closed D9220: incoming: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:51 AM
martinvonz committed rHG4df5d3965a3e: serve: leverage cmdutil.check_incompatible_arguments().
serve: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:50 AM
martinvonz closed D9217: import: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:50 AM
martinvonz committed rHG3b23cec4953f: revert: leverage cmdutil.check_incompatible_arguments().
revert: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:50 AM
martinvonz closed D9216: backout: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:50 AM
martinvonz committed rHGb5e0746e272b: incoming: leverage cmdutil.check_incompatible_arguments().
incoming: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:50 AM
martinvonz closed D9219: grep: levarage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 3:50 AM
martinvonz committed rHG4f7309fdfb60: grep: levarage cmdutil.check_incompatible_arguments().
grep: levarage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:49 AM
martinvonz committed rHGd1cabce5ef05: import: leverage cmdutil.check_incompatible_arguments().
import: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:49 AM
martinvonz committed rHG693da1b928af: backout: leverage cmdutil.check_incompatible_arguments().
backout: leverage cmdutil.check_incompatible_arguments()
Fri, Oct 16, 3:49 AM
martinvonz committed rHG5df1655edf42: transaction: use ProgrammingError for when an committed transaction is used.
transaction: use ProgrammingError for when an committed transaction is used
Fri, Oct 16, 3:49 AM
martinvonz closed D9215: transaction: use ProgrammingError for when an committed transaction is used.
Fri, Oct 16, 3:49 AM
martinvonz created D9223: tag: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:03 AM
martinvonz created D9220: incoming: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:03 AM
martinvonz created D9222: serve: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:03 AM
martinvonz created D9221: revert: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:03 AM
martinvonz created D9217: import: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:02 AM
martinvonz created D9219: grep: levarage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:02 AM
martinvonz created D9216: backout: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:02 AM
martinvonz created D9218: commit: leverage cmdutil.check_incompatible_arguments().
Fri, Oct 16, 2:02 AM
martinvonz created D9215: transaction: use ProgrammingError for when an committed transaction is used.
Fri, Oct 16, 2:01 AM

Thu, Oct 15

martinvonz closed D9214: copy: clarify in help text that `hg co --forget` takes a *destination* file.
Thu, Oct 15, 3:07 PM
martinvonz committed rHG03690079d7dd: copy: clarify in help text that `hg co --forget` takes a *destination* file.
copy: clarify in help text that `hg co --forget` takes a *destination* file
Thu, Oct 15, 3:06 PM
martinvonz created D9214: copy: clarify in help text that `hg co --forget` takes a *destination* file.
Thu, Oct 15, 1:32 PM

Wed, Oct 14

martinvonz added a comment to D9204: tests: add notes about broken `hg log --follow <file>` with copies in extras.

I'm happy to let the wait until @marmoute has no more pending patches.

Wed, Oct 14, 11:41 AM
martinvonz added a reviewer for D9204: tests: add notes about broken `hg log --follow <file>` with copies in extras: marmoute.
Wed, Oct 14, 11:41 AM
martinvonz added a comment to D9173: tests: run test-copies-chain-merge.t also with copies in changesets.

This adds a non negligible amount of churn that conflict with an import bug series I submitted (See D9195 and above).
Can we drop it for now and restart review on a new diff?

That was sent for review after this series, so I don't think it's fair to drop this one for that reason.

You probably noticed that I have been sending a pretty regular stream of patch on this topic over the last month. This series is just the continuation of this. I would have appreciated if you would have coordinated with me before starting sending arbitrary patch on this topic. The lack of communication is probably going to cost too many hours for both of us.

In particular, I do not understand why the changeset version of the algorithm is not giving use the same result as the compatibility one.

I think I explained that in the commit message: hg log --follow <file> doesn't work with copy information (only) in the changelog, since it has a fast-path that follows the revisions in the filelog. We (probably I) will need to fix that some day...

We should probably explicitly add this information around the if block.

Yes, it will be nice to get this documented around that block.

Wed, Oct 14, 11:40 AM
martinvonz created D9204: tests: add notes about broken `hg log --follow <file>` with copies in extras.
Wed, Oct 14, 11:40 AM
martinvonz added a comment to D9167: errors: introduce InputError and use it from commands and cmdutil.

I've renamed the exception to InputError to unblock this. Let me know if there was anything else blocking. I wasn't sure if you wanted to see more discussion about the name on thread before we decide.

Thank you. I am thinking to get back to this (queue this maybe) once we cut the upcoming RC (after 3 days). I agree that there are no BC changes but doing this will make things easier as then we can try to have all these changes in one release. Doesn't yield much but sounds like a good idea to me. Let me know if you prefer it to be queued before.

Wed, Oct 14, 11:33 AM

Tue, Oct 13

martinvonz added a comment to D9173: tests: run test-copies-chain-merge.t also with copies in changesets.

This adds a non negligible amount of churn that conflict with an import bug series I submitted (See D9195 and above).
Can we drop it for now and restart review on a new diff?

Tue, Oct 13, 12:27 PM
martinvonz added a comment to D9171: tests: add test of copies suggested by Pierre-Yves on D9159.

This test case should go in tests/test-copies-chain-merge.t since this is where the combination of merging and copies information is tested.

Tue, Oct 13, 12:22 PM
martinvonz added inline comments to D9172: tests: update test-copies-chain-merge.t to not use empty files.
Tue, Oct 13, 12:01 PM
D9195: copies: split creation of the graph and actual checking again now requires changes to proceed.

I really don't like this patch. I did the split back in D8377 because I found this format very hard to read. IIRC, at least @pulkit agreed with me. I don't understand why testing of upgrades require this structure.

Tue, Oct 13, 11:05 AM
martinvonz closed D9173: tests: run test-copies-chain-merge.t also with copies in changesets.
Tue, Oct 13, 4:40 AM
martinvonz closed D9171: tests: add test of copies suggested by Pierre-Yves on D9159.
Tue, Oct 13, 4:40 AM
martinvonz committed rHG5e72827dae1e: tests: run test-copies-chain-merge.t also with copies in changesets.
tests: run test-copies-chain-merge.t also with copies in changesets
Tue, Oct 13, 4:40 AM
martinvonz closed D9172: tests: update test-copies-chain-merge.t to not use empty files.
Tue, Oct 13, 4:40 AM
martinvonz committed rHGd1c44591e751: tests: add test of copies suggested by Pierre-Yves on D9159.
tests: add test of copies suggested by Pierre-Yves on D9159
Tue, Oct 13, 4:40 AM
martinvonz committed rHGdeeb215be337: tests: update test-copies-chain-merge.t to not use empty files.
tests: update test-copies-chain-merge.t to not use empty files
Tue, Oct 13, 4:40 AM

Mon, Oct 12

martinvonz retitled D9167: errors: introduce InputError and use it from commands and cmdutil from errors: introduce UserError and use it from commands and cmdutil to errors: introduce InputError and use it from commands and cmdutil.
Mon, Oct 12, 2:30 PM
martinvonz added a comment to D9167: errors: introduce InputError and use it from commands and cmdutil.

I've renamed the exception to InputError to unblock this. Let me know if there was anything else blocking. I wasn't sure if you wanted to see more discussion about the name on thread before we decide.

Mon, Oct 12, 2:30 PM
martinvonz updated the diff for D8653: copies: handle more cases where a file got replaced by a copy.
Mon, Oct 12, 12:50 PM
martinvonz updated the diff for D8653: copies: handle more cases where a file got replaced by a copy.
Mon, Oct 12, 12:41 PM

Sat, Oct 10

martinvonz closed D9184: py3: convert an exception message to bytes.
Sat, Oct 10, 2:18 AM
martinvonz committed rHGed0ded64a8a9: py3: convert an exception message to bytes.
py3: convert an exception message to bytes
Sat, Oct 10, 2:18 AM
martinvonz committed rHG223296268c4e: tests: fix test-url.py on py3, broken by D9179.
tests: fix test-url.py on py3, broken by D9179
Sat, Oct 10, 2:18 AM
martinvonz closed D9180: tests: fix test-url.py on py3, broken by D9179.
Sat, Oct 10, 2:18 AM

Fri, Oct 9

martinvonz created D9184: py3: convert an exception message to bytes.
Fri, Oct 9, 12:23 PM
martinvonz added a comment to D9180: tests: fix test-url.py on py3, broken by D9179.

Feel free to fold this into D9179 or add on top

Fri, Oct 9, 11:09 AM
martinvonz created D9180: tests: fix test-url.py on py3, broken by D9179.
Fri, Oct 9, 11:09 AM
martinvonz added inline comments to D9179: errors: name arguments to Abort constructor.
Fri, Oct 9, 11:06 AM
martinvonz added a comment to D9173: tests: run test-copies-chain-merge.t also with copies in changesets.

Reviewers: Up to here is ready for review (and uncontroversial, I would think)

Fri, Oct 9, 10:57 AM
martinvonz closed D9179: errors: name arguments to Abort constructor.
Fri, Oct 9, 6:19 AM
martinvonz closed D9178: errors: stop passing non-strings to Abort's constructor.
Fri, Oct 9, 6:18 AM
martinvonz closed D9176: tests: set git config using `git config` for simplicity.
Fri, Oct 9, 6:17 AM
martinvonz committed rHG0c18493287f5: tests: set git config using `git config` for simplicity.
tests: set git config using `git config` for simplicity
Fri, Oct 9, 6:16 AM
martinvonz closed D9175: tests: use `git init` instead of unusual synonym `git init-db`.
Fri, Oct 9, 6:16 AM
martinvonz committed rHG04aa48afab99: tests: use `git init` instead of unusual synonym `git init-db`.
tests: use `git init` instead of unusual synonym `git init-db`
Fri, Oct 9, 6:16 AM
martinvonz committed rHGd2e1dcd4490d: errors: name arguments to Abort constructor.
errors: name arguments to Abort constructor
Fri, Oct 9, 6:16 AM
martinvonz closed D9165: errors: name arguments to AmbiguousCommand constructor.
Fri, Oct 9, 6:16 AM
martinvonz closed D9166: errors: name arguments to UnknownCommand constructor.
Fri, Oct 9, 6:16 AM
martinvonz committed rHGa736ab681b78: errors: stop passing non-strings to Abort's constructor.
errors: stop passing non-strings to Abort's constructor
Fri, Oct 9, 6:16 AM
martinvonz committed rHGbb1a988ef4a5: errors: name arguments to UnknownCommand constructor.
errors: name arguments to UnknownCommand constructor
Fri, Oct 9, 6:16 AM
martinvonz closed D9164: errors: name arguments to CommandError constructor.
Fri, Oct 9, 6:16 AM
martinvonz committed rHG65e2b64670b5: errors: name arguments to AmbiguousCommand constructor.
errors: name arguments to AmbiguousCommand constructor
Fri, Oct 9, 6:16 AM
martinvonz committed rHGbd2df58366b1: errors: name arguments to CommandError constructor.
errors: name arguments to CommandError constructor
Fri, Oct 9, 6:16 AM
martinvonz closed D9163: errors: move UnknownCommand and AmbiguousCommand near CommandError.
Fri, Oct 9, 6:16 AM
martinvonz committed rHGbdd2cdf9e248: errors: move UnknownCommand and AmbiguousCommand near CommandError.
errors: move UnknownCommand and AmbiguousCommand near CommandError
Fri, Oct 9, 6:16 AM
martinvonz updated the diff for D9159: [RFC] merge: stop caring about whether files are related (issue6163).
Fri, Oct 9, 3:37 AM
martinvonz added a comment to D9159: [RFC] merge: stop caring about whether files are related (issue6163).

Regardless of the issue6163 question, simply dropping the tracking or removed files seems wrong and will introduces bug (eg: we can end up merging a "dead" file history with a fresh file history, picking the "dead" one). So we cannot do that.
minimal description of the case I am talking about below.

o → X should be copied from B, not A
| \
o |  delete X 
| |
o |  rename A to X
| |
| o rename B to X
|/
o

I added that test as a parent of this patch (D9171). It passed before and after this patch. Did I not write it down correctly?

Fri, Oct 9, 3:35 AM
martinvonz committed rHG66cb7ad3787c: branching: merge with stable.
branching: merge with stable
Fri, Oct 9, 2:29 AM
martinvonz updated the diff for D9159: [RFC] merge: stop caring about whether files are related (issue6163).
Fri, Oct 9, 2:29 AM
martinvonz committed rHG6569b2371240: tests: back out accidentally queued changeset 0627cd03b1e9.
tests: back out accidentally queued changeset 0627cd03b1e9
Fri, Oct 9, 2:28 AM
martinvonz committed rHG4a146cff76fa: tests: fix test-check-module-imports.t broken by D9150.
tests: fix test-check-module-imports.t broken by D9150
Fri, Oct 9, 2:28 AM
martinvonz closed D9177: tests: fix test-check-module-imports.t broken by D9150.
Fri, Oct 9, 2:28 AM
martinvonz updated the diff for D9172: tests: update test-copies-chain-merge.t to not use empty files.
Fri, Oct 9, 2:28 AM
martinvonz added a comment to D9177: tests: fix test-check-module-imports.t broken by D9150.

I'm breaking the rules by queuing this myself so we can have tests passing again

Fri, Oct 9, 2:22 AM

Thu, Oct 8

martinvonz created D9179: errors: name arguments to Abort constructor.
Thu, Oct 8, 7:13 PM
martinvonz updated the diff for D9167: errors: introduce InputError and use it from commands and cmdutil.
Thu, Oct 8, 7:12 PM
martinvonz created D9178: errors: stop passing non-strings to Abort's constructor.
Thu, Oct 8, 7:11 PM
martinvonz added a comment to D9159: [RFC] merge: stop caring about whether files are related (issue6163).

My previous, larger comment got lost. It contained other tests cases.
I do not have time re-type my full comment (phabricator eating comment is very upsetting).

Thu, Oct 8, 6:01 PM
martinvonz created D9177: tests: fix test-check-module-imports.t broken by D9150.
Thu, Oct 8, 4:49 PM
martinvonz closed D9174: tests: make test-convert-git.t work across changed default branch name.
Thu, Oct 8, 4:33 PM
martinvonz committed rHG366c547a8a57: tests: make test-convert-git.t work across changed default branch name.
tests: make test-convert-git.t work across changed default branch name
Thu, Oct 8, 4:33 PM
martinvonz created D9176: tests: set git config using `git config` for simplicity.
Thu, Oct 8, 4:19 PM
martinvonz created D9175: tests: use `git init` instead of unusual synonym `git init-db`.
Thu, Oct 8, 4:19 PM