Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (231 w, 3 d)

Recent Activity

Yesterday

martinvonz created D11855: mergestate: merge `preresolve()` into `resolve()`.
Sat, Dec 4, 2:10 AM
martinvonz created D11859: filemerge: make `_filemerge()` do both premerge and merge.
Sat, Dec 4, 2:08 AM
martinvonz created D11860: filemerge: inline `_filemerge()` into `filemerge()`.
Sat, Dec 4, 2:07 AM
martinvonz created D11858: filemerge: merge `premerge()` into `filemerge()`.
Sat, Dec 4, 2:07 AM
martinvonz created D11857: mergestate: inline `_resolve()` into `resolve()`.
Sat, Dec 4, 2:06 AM
martinvonz created D11856: mergestate: make `_resolve()` do both preresolve and resolve.
Sat, Dec 4, 2:06 AM
martinvonz created D11854: tests: remove unnecessary explicit args from `failfilemerge.py`.
Sat, Dec 4, 2:06 AM
martinvonz created D11853: simplemerge: set `conflicts` earlier for :union tool.
Sat, Dec 4, 2:06 AM

Wed, Dec 1

martinvonz closed D11832: chistedit: explain which order the commits are presented in.
Wed, Dec 1, 5:43 AM
martinvonz committed rHG9503e15dc588: chistedit: explain which order the commits are presented in.
chistedit: explain which order the commits are presented in
Wed, Dec 1, 5:43 AM

Tue, Nov 30

martinvonz updated the diff for D11832: chistedit: explain which order the commits are presented in.
Tue, Nov 30, 11:47 AM
martinvonz created D11832: chistedit: explain which order the commits are presented in.
Tue, Nov 30, 11:46 AM
martinvonz closed D11829: errors: use detailed exit code for RepoLookupError.
Tue, Nov 30, 10:18 AM
martinvonz closed D11830: errors: use detailed exit code in pathauditor.
Tue, Nov 30, 10:17 AM
martinvonz closed D11824: errors: return more detailed errors when failing to parse or apply patch.
Tue, Nov 30, 10:17 AM
martinvonz committed rHG45a073af50a2: errors: use detailed error for invalid commit-extras argument.
errors: use detailed error for invalid commit-extras argument
Tue, Nov 30, 10:16 AM
martinvonz closed D11831: errors: use detailed error for invalid commit-extras argument.
Tue, Nov 30, 10:16 AM
martinvonz committed rHG35f1ecd84bd0: errors: use detailed exit code in pathauditor.
errors: use detailed exit code in pathauditor
Tue, Nov 30, 10:15 AM
martinvonz closed D11827: errors: use detailed exit code when trying to merge file outside narrowspec.
Tue, Nov 30, 10:15 AM
martinvonz committed rHG8c4881c07f57: errors: use detailed exit code for RepoLookupError.
errors: use detailed exit code for RepoLookupError
Tue, Nov 30, 10:15 AM
martinvonz committed rHG0b8e076e878c: errors: use detailed exit code for detected case-collision.
errors: use detailed exit code for detected case-collision
Tue, Nov 30, 10:15 AM
martinvonz closed D11825: patch: add hint about mangled whitespace on bad patch.
Tue, Nov 30, 10:15 AM
martinvonz closed D11828: errors: use detailed exit code for detected case-collision.
Tue, Nov 30, 10:15 AM
martinvonz committed rHG8e855e9984a6: errors: use detailed exit code when trying to merge file outside narrowspec.
errors: use detailed exit code when trying to merge file outside narrowspec
Tue, Nov 30, 10:14 AM
martinvonz committed rHG67064c238ae7: errors: use detailed exit code for non-integer number of diff context lines.
errors: use detailed exit code for non-integer number of diff context lines
Tue, Nov 30, 10:14 AM
martinvonz closed D11826: errors: use detailed exit code for non-integer number of diff context lines.
Tue, Nov 30, 10:14 AM
martinvonz committed rHG220506bb213e: patch: add hint about mangled whitespace on bad patch.
patch: add hint about mangled whitespace on bad patch
Tue, Nov 30, 10:13 AM
martinvonz committed rHG6a454e7053a1: errors: return more detailed errors when failing to parse or apply patch.
errors: return more detailed errors when failing to parse or apply patch
Tue, Nov 30, 10:13 AM

Mon, Nov 29

martinvonz created D11829: errors: use detailed exit code for RepoLookupError.
Mon, Nov 29, 5:01 PM
martinvonz created D11824: errors: return more detailed errors when failing to parse or apply patch.
Mon, Nov 29, 5:00 PM
martinvonz created D11830: errors: use detailed exit code in pathauditor.
Mon, Nov 29, 4:59 PM
martinvonz created D11831: errors: use detailed error for invalid commit-extras argument.
Mon, Nov 29, 4:58 PM
martinvonz created D11825: patch: add hint about mangled whitespace on bad patch.
Mon, Nov 29, 4:58 PM
martinvonz created D11827: errors: use detailed exit code when trying to merge file outside narrowspec.
Mon, Nov 29, 4:58 PM
martinvonz created D11828: errors: use detailed exit code for detected case-collision.
Mon, Nov 29, 4:58 PM
martinvonz created D11826: errors: use detailed exit code for non-integer number of diff context lines.
Mon, Nov 29, 4:57 PM
martinvonz added a comment to D11770: backout: backed out changeset 5d83a40cd3f8.

we have a solid lead to have competent people take care of this packaging issue for us in time for the 6.1 release

Mon, Nov 29, 11:46 AM

Fri, Nov 26

martinvonz closed D11802: filemerge: simplify slightly by using filectx.decodeddata().
Fri, Nov 26, 10:05 AM
martinvonz committed rHG6ce9ccfcac23: filemerge: simplify slightly by using filectx.decodeddata().
filemerge: simplify slightly by using filectx.decodeddata()
Fri, Nov 26, 10:05 AM
martinvonz closed D11801: filemerge: rename _formatconflictmarker() since it formats a label.
Fri, Nov 26, 10:05 AM
martinvonz committed rHG1eeec02cd919: filemerge: rename _formatconflictmarker() since it formats a label.
filemerge: rename _formatconflictmarker() since it formats a label
Fri, Nov 26, 10:05 AM

Wed, Nov 24

martinvonz created D11802: filemerge: simplify slightly by using filectx.decodeddata().
Wed, Nov 24, 12:05 PM
martinvonz created D11801: filemerge: rename _formatconflictmarker() since it formats a label.
Wed, Nov 24, 12:05 PM

Mon, Nov 15

martinvonz added a comment to D11757: backout: backout 5d83a40cd3f8 and re-instate Python 2 support.

Until this is done (hopefully this cycle), we're keeping Python 2.

Mon, Nov 15, 12:13 PM

Wed, Nov 10

martinvonz closed D11748: ci: stop running with Python 2.
Wed, Nov 10, 2:58 PM
martinvonz committed rHG5d83a40cd3f8: ci: stop running with Python 2.
ci: stop running with Python 2
Wed, Nov 10, 2:58 PM
martinvonz added a comment to D11748: ci: stop running with Python 2.

Just out of curiosity, why wait for 6.0? Because you're hoping for TortoiseHg to get fixed? Or some issue with stable vs. default branches? If this patch were queued on default, would that affect the stable branch? (Again, no rush, I'm just curious.)

It would only affect default indeed, I'm just still observing the freeze of the (very delayed) 6.0.

Wed, Nov 10, 11:23 AM
martinvonz added a comment to D11748: ci: stop running with Python 2.

Nothing would make me happier than to queue this. I'll wait for the 6.0 merge.

Wed, Nov 10, 11:17 AM
martinvonz created D11748: ci: stop running with Python 2.
Wed, Nov 10, 11:09 AM

Nov 4 2021

D11737: relnotes: clear next release notes is now accepted and ready to land.
Nov 4 2021, 11:41 AM
D11736: relnotes: add 6.0 release notes is now accepted and ready to land.
Nov 4 2021, 11:41 AM
D11735: relnotes: fix wrong command name in 5.9 relnotes is now accepted and ready to land.
Nov 4 2021, 11:38 AM

Oct 26 2021

martinvonz added inline comments to D11680: push: add option to abort on dirty working copy if parent is pushed.
Oct 26 2021, 6:34 PM
martinvonz added a comment to D11680: push: add option to abort on dirty working copy if parent is pushed.

Kyle message made me realize that I had not sent mine, so I'm doing that now.

Oct 26 2021, 6:30 PM

Oct 21 2021

martinvonz updated the diff for D11680: push: add option to abort on dirty working copy if parent is pushed.
Oct 21 2021, 1:20 PM
martinvonz added a comment to D11680: push: add option to abort on dirty working copy if parent is pushed.

With a commands.push.check-dirty (or something similar) that control the default value/behavior of this flag.

Oct 21 2021, 1:19 PM

Oct 19 2021

martinvonz added a comment to D11693: backout: backed out changeset 6edc8800dbc3.

Queued, thanks!

Oct 19 2021, 2:00 PM
martinvonz added inline comments to rHG8fb71d1ab953: Backed out changeset 2f2107c01dee.
Oct 19 2021, 11:18 AM
martinvonz added inline comments to rHG8fb71d1ab953: Backed out changeset 2f2107c01dee.
Oct 19 2021, 11:10 AM
martinvonz added inline comments to rHG8fb71d1ab953: Backed out changeset 2f2107c01dee.
Oct 19 2021, 11:04 AM
martinvonz added inline comments to rHG8fb71d1ab953: Backed out changeset 2f2107c01dee.
Oct 19 2021, 10:59 AM

Oct 18 2021

martinvonz closed D11667: copy: recommend `--at-rev .` if target was added in parent commit.
Oct 18 2021, 3:35 PM
martinvonz committed rHGc62e4397eb28: copy: recommend `--at-rev .` if target was added in parent commit.
copy: recommend `--at-rev .` if target was added in parent commit
Oct 18 2021, 3:34 PM
martinvonz added a comment to D11669: chistedit: add option to show order of commits in opposite order.

Doing cross review: is there any indication of the direction of history when the UI pops up, or does the user just have to figure it out?

The user will have to figure it out (hopefully they remembered if they set the config option). Internally at Google, I was going to override helplines() (and some other function which I've forgotten now) to make it print a red banner saying if the direction has changed.

Could I get a follow-up of some kind that prints some advice for users about this in all cases? It seems like even if we don't change the default, we should just tell people. Maybe in plain-text histedit too, but I worry less about that since curses gets more mindshare.

Oct 18 2021, 2:12 PM
martinvonz added a comment to D11669: chistedit: add option to show order of commits in opposite order.

Doing cross review: is there any indication of the direction of history when the UI pops up, or does the user just have to figure it out?

Oct 18 2021, 12:48 PM
martinvonz added a comment to D11627: dispatch: ignore failure to flush ui.

This breaks CI on Python 2: https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/254041
We unfortunately have to support Python 2 until the release in a few days, so this should get fixed.

It doesn't reproduce for me. Does it for you? I wonder what I need to do to make it reproduce. I have /dev/full.

It does, I'm on Linux if somehow this is OS specific.

$ HGMODULEPOLICY=py python2 ./tests/run-tests.py -j6 tests/test-basic.t
running 1 tests using 1 parallel processes
--- /home/alphare/workspace/octobus/mercurial-devel/tests/test-basic.t
+++ /home/alphare/workspace/octobus/mercurial-devel/tests/test-basic.t.err
@@ -40,13 +40,10 @@
   A a
   $ hg status >/dev/full
-  abort: No space left on device
-  [255]
 #endif
 #if devfull
   $ hg status >/dev/full 2>&1
-  [255]
   $ hg status ENOENT 2>/dev/full
   [255]
ERROR: test-basic.t output changed
!
Failed test-basic.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: 454035856
Oct 18 2021, 12:18 PM
martinvonz updated the diff for D11667: copy: recommend `--at-rev .` if target was added in parent commit.
Oct 18 2021, 12:11 PM
martinvonz added inline comments to D11667: copy: recommend `--at-rev .` if target was added in parent commit.
Oct 18 2021, 12:10 PM
martinvonz added a comment to D11627: dispatch: ignore failure to flush ui.

This breaks CI on Python 2: https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/254041
We unfortunately have to support Python 2 until the release in a few days, so this should get fixed.

Oct 18 2021, 12:02 PM

Oct 15 2021

martinvonz created D11680: push: add option to abort on dirty working copy if parent is pushed.
Oct 15 2021, 7:53 PM
martinvonz closed D11669: chistedit: add option to show order of commits in opposite order.
Oct 15 2021, 1:04 PM
martinvonz closed D11670: rhg: fix formatting error reported by test-check-format-rust.t.
Oct 15 2021, 1:04 PM
martinvonz committed rHG1837663ac216: rhg: fix formatting error reported by test-check-format-rust.t.
rhg: fix formatting error reported by test-check-format-rust.t
Oct 15 2021, 1:04 PM
martinvonz committed rHGc820866c52f9: chistedit: add option to show order of commits in opposite order.
chistedit: add option to show order of commits in opposite order
Oct 15 2021, 1:04 PM
martinvonz abandoned D11665: formatting: format with newer black version.
Oct 15 2021, 10:38 AM
martinvonz added a comment to D11670: rhg: fix formatting error reported by test-check-format-rust.t.

@martinvonz, indeed, thanks. Sorry.

Oct 15 2021, 10:35 AM
martinvonz updated subscribers of D11670: rhg: fix formatting error reported by test-check-format-rust.t.

@aalekseyev, I think you'll want to run rustup install nightly-2020-10-04 to make sure that test-check-format-test.t runs.

Oct 15 2021, 1:38 AM
martinvonz created D11670: rhg: fix formatting error reported by test-check-format-rust.t.
Oct 15 2021, 1:36 AM
martinvonz added a comment to D11341: rust: update the minimum version of Rust.

Do you want to also update the rustfmt version used by test-check-format-rust.t?

Oct 15 2021, 1:28 AM
martinvonz created D11669: chistedit: add option to show order of commits in opposite order.
Oct 15 2021, 1:15 AM

Oct 14 2021

martinvonz added a comment to D11666: dirstate-v2: delete unused variable (to make test-check-pyflakes.t happy).

This was already sent in D11658

Oct 14 2021, 8:27 PM
martinvonz closed D11663: narrow: raise StateError when working copy is stale (for detailed exit code).
Oct 14 2021, 6:36 PM
martinvonz committed rHG7ed0fc687220: narrow: raise StateError when working copy is stale (for detailed exit code).
narrow: raise StateError when working copy is stale (for detailed exit code)
Oct 14 2021, 6:36 PM
martinvonz created D11667: copy: recommend `--at-rev .` if target was added in parent commit.
Oct 14 2021, 4:12 PM
martinvonz created D11665: formatting: format with newer black version.
Oct 14 2021, 4:12 PM
martinvonz created D11666: dirstate-v2: delete unused variable (to make test-check-pyflakes.t happy).
Oct 14 2021, 4:11 PM
martinvonz created D11663: narrow: raise StateError when working copy is stale (for detailed exit code).
Oct 14 2021, 11:58 AM
D11616: rhg: stop manifest traversal when no more files are needed is now accepted and ready to land.

I'm getting ~630ms on **/moz.build when I run the original version (1b0f8aafedea), by the way. Could it be that your ~650ms measurement corresponds to that?

Yeah, it's very possible I messed up my measurements somehow. I'll check again tomorrow, then I'll probably queue your version.

Oct 14 2021, 11:08 AM
martinvonz abandoned D11622: dirstate: simplify cat operation.
Oct 14 2021, 11:04 AM

Oct 13 2021

martinvonz closed D11653: chistedit: rename a confusingly named variable.
Oct 13 2021, 6:29 PM
martinvonz closed D11652: chistedit: remove some local variable and access state on self instead.
Oct 13 2021, 6:29 PM
martinvonz closed D11649: chistedit: move changeview() onto state class.
Oct 13 2021, 6:29 PM
martinvonz committed rHGd8cff8564f5a: chistedit: rename a confusingly named variable.
chistedit: rename a confusingly named variable
Oct 13 2021, 6:28 PM
martinvonz closed D11648: chistedit: move cycleaction() onto state class.
Oct 13 2021, 6:28 PM
martinvonz committed rHG1895027c5051: chistedit: remove some local variable and access state on self instead.
chistedit: remove some local variable and access state on self instead
Oct 13 2021, 6:28 PM
martinvonz closed D11647: chistedit: move changeaction() onto state class.
Oct 13 2021, 6:28 PM
martinvonz committed rHG1302905b2d49: chistedit: move changeview() onto state class.
chistedit: move changeview() onto state class
Oct 13 2021, 6:28 PM
martinvonz closed D11646: chistedit: move swap() onto state class.
Oct 13 2021, 6:28 PM
martinvonz committed rHG7913f533592d: chistedit: move cycleaction() onto state class.
chistedit: move cycleaction() onto state class
Oct 13 2021, 6:28 PM
martinvonz closed D11645: chistedit: move makeselection() onto state class.
Oct 13 2021, 6:28 PM