Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (145 w, 15 h)

Recent Activity

Tue, Apr 7

martinvonz added a comment to D8376: tests: collect all branch creation in one place in test-copies-chain-merge.t.

I would prefer you wait for planned change to land before you do further change to the file. The coming changes fixes bug and I rather not have to fix too many conflict while doing so.

I already pushed them, I will resolve conflicts on those couple of patches and update them on heptapod.

Tue, Apr 7, 11:30 AM
martinvonz closed D8377: tests: move verification closer to setup in test-copies-chain-merge.t.
Tue, Apr 7, 9:07 AM
martinvonz closed D8376: tests: collect all branch creation in one place in test-copies-chain-merge.t.
Tue, Apr 7, 9:07 AM
martinvonz committed rHG806f1f1ba430: tests: move verification closer to setup in test-copies-chain-merge.t.
tests: move verification closer to setup in test-copies-chain-merge.t
Tue, Apr 7, 9:07 AM
martinvonz committed rHG4e2845d9452d: tests: collect all branch creation in one place in test-copies-chain-merge.t.
tests: collect all branch creation in one place in test-copies-chain-merge.t
Tue, Apr 7, 9:07 AM

Fri, Apr 3

martinvonz closed D8356: rebase: don't create merge when continuing rebase interrupted by old hg.
Fri, Apr 3, 11:04 AM
martinvonz committed rHGe7af56a0733e: rebase: don't create merge when continuing rebase interrupted by old hg.
rebase: don't create merge when continuing rebase interrupted by old hg
Fri, Apr 3, 11:04 AM
martinvonz closed D8355: tests: demonstrate how continuing rebase after upgrade can result in merge.
Fri, Apr 3, 11:04 AM
martinvonz committed rHGe89b3603d3da: tests: demonstrate how continuing rebase after upgrade can result in merge.
tests: demonstrate how continuing rebase after upgrade can result in merge
Fri, Apr 3, 11:04 AM

Thu, Apr 2

martinvonz created D8377: tests: move verification closer to setup in test-copies-chain-merge.t.
Thu, Apr 2, 5:00 PM
martinvonz created D8376: tests: collect all branch creation in one place in test-copies-chain-merge.t.
Thu, Apr 2, 4:59 PM
D8258: copies-tests: remove spurious `]` in the template is now accepted and ready to land.

This one is trivial to move ahead of the other two patches so I'll queue it and fix any conflicts in flight.

Thu, Apr 2, 4:31 PM

Wed, Apr 1

martinvonz created D8356: rebase: don't create merge when continuing rebase interrupted by old hg.
Wed, Apr 1, 5:46 PM
martinvonz created D8355: tests: demonstrate how continuing rebase after upgrade can result in merge.
Wed, Apr 1, 5:46 PM
martinvonz added a comment to D7827: rebase: don't use rebased node as dirstate p2 (BC).

Heads up that we ran into a fun bug that was probably caused by this patch. I think what happened was this:

Wed, Apr 1, 2:08 PM

Thu, Mar 26

martinvonz closed D8331: py3: make setup.py's hgcommand() consistently return bytes.
Thu, Mar 26, 6:18 AM
martinvonz committed rHG2141427533d2: py3: require values in changelog extras to be bytes.
py3: require values in changelog extras to be bytes
Thu, Mar 26, 6:18 AM
martinvonz closed D8332: py3: require values in changelog extras to be bytes.
Thu, Mar 26, 6:18 AM
martinvonz committed rHGbda050bc9987: py3: make setup.py's hgcommand() consistently return bytes.
py3: make setup.py's hgcommand() consistently return bytes
Thu, Mar 26, 6:18 AM

Wed, Mar 25

martinvonz created D8332: py3: require values in changelog extras to be bytes.
Wed, Mar 25, 10:19 PM
martinvonz created D8331: py3: make setup.py's hgcommand() consistently return bytes.
Wed, Mar 25, 9:28 PM
martinvonz closed D8322: shelve: split up dounshelve() in unshelvecmd() and _dounshelve().
Wed, Mar 25, 4:33 PM
martinvonz closed D8324: py3: use integer division in histedit.
Wed, Mar 25, 4:33 PM
martinvonz committed rHGa89aa2d7b34d: pvec: drop an unused `from __future__ import division`.
pvec: drop an unused `from __future__ import division`
Wed, Mar 25, 4:32 PM
martinvonz closed D8326: pvec: drop an unused `from __future__ import division`.
Wed, Mar 25, 4:32 PM
martinvonz committed rHGd06e748cfd02: py3: use integer division in histedit.
py3: use integer division in histedit
Wed, Mar 25, 4:32 PM
martinvonz committed rHG47c1226463a1: shelve: split up dounshelve() in unshelvecmd() and _dounshelve().
shelve: split up dounshelve() in unshelvecmd() and _dounshelve()
Wed, Mar 25, 4:31 PM
martinvonz added inline comments to D8324: py3: use integer division in histedit.
Wed, Mar 25, 11:30 AM
martinvonz created D8326: pvec: drop an unused `from __future__ import division`.
Wed, Mar 25, 11:28 AM
martinvonz updated the diff for D8324: py3: use integer division in histedit.
Wed, Mar 25, 11:24 AM
martinvonz created D8324: py3: use integer division in histedit.
Wed, Mar 25, 2:42 AM

Mon, Mar 23

martinvonz created D8322: shelve: split up dounshelve() in unshelvecmd() and _dounshelve().
Mon, Mar 23, 6:28 PM

Fri, Mar 20

martinvonz added a comment to D8281: narrow: escape includepats/excludepats when sending over the wire.

Since narrow is still experimental, I don't think we should try too hard for backward compatibility. We could introduce a new end-point for a new encoding and drop the old one in a couple of version.

+0, honestly. I won't require it, but I'd really rather we shaved this yak _now_ rather than when narrow has even more users.

I'm getting a bit frustrated with how much time I've spent on this, made worse by the fact that I agree with everything everyone's saying and so it's not like I'm frustrated at the review process, just how slow I've been at accomplishing this.
So, before I go down another rabbit hole, here's what I'm thinking:

  • Server emits a new capability narrow-exp-1-escaped (in addition to the current narrow-exp-1, this is not replacing the existing capability)
Fri, Mar 20, 7:32 PM
martinvonz updated subscribers of D8190: nodemap: test that concurrent process don't see the pending transaction.

The parent patch (D8189) was a bit controversial. We don't need that patch if we apply the following patch on top of this one (making this test sleep-free):

Fri, Mar 20, 1:55 PM

Thu, Mar 19

martinvonz added a comment to D8243: copies: stop recording buggy file merge when new file overwrite an old one.

This is pretty ugly and it doesn't seem that the next patch depends on it. You said you'll soon clean it up anyway, so I wonder if should just wait for the better solution instead. It doesn't seem like this fixes a serious bug so we have to rush it. Thoughts?

My initial motivation to rush the ugly way was "getting the behavior right to compare with the changeset centric one and being able to test performance improvement for the changeset centric one while having access to a specific repository". However, cancelling of all travel has cancelled the window to access that repo. I'll resubmit a cleaner versions soon.
since you did not commented on it, I assume the new behavior is fine by you, right?

Thu, Mar 19, 8:31 PM
martinvonz added a comment to D8289: resolve: add a --clear option for clearing the merge state.

I like the idea. IIRC, Ryan from FB hit similar issues in a sprint some years ago and came up with hg up --finish or something like that.
Maybe we should not let user clear the mergestate and suggest continue/<cmd-name> --continue if it's not result of update command. Thoughts?

Ho, that's a good idea. It looks like hg update --merge is the only command that do not have --continue support. So instead of adding a whole new flag and action to this exception, removing the exception seems like a better move. What do you think @martinvonz ?

Thu, Mar 19, 7:55 PM
martinvonz closed D8287: fix: add a -s option to format a revision and its descendants.
Thu, Mar 19, 4:46 AM
martinvonz closed D8288: fix: mark -r as advanced.
Thu, Mar 19, 4:46 AM
martinvonz committed rHGa6ef1e8e2f6d: fix: mark -r as advanced.
fix: mark -r as advanced
Thu, Mar 19, 4:45 AM
martinvonz closed D8286: fix: move handling of --all into getrevstofix() for consistency.
Thu, Mar 19, 4:45 AM
martinvonz committed rHG5205b46bd887: fix: add a -s option to format a revision and its descendants.
fix: add a -s option to format a revision and its descendants
Thu, Mar 19, 4:45 AM
martinvonz committed rHG9f5e94bbc606: fix: move handling of --all into getrevstofix() for consistency.
fix: move handling of --all into getrevstofix() for consistency
Thu, Mar 19, 4:45 AM

Wed, Mar 18

martinvonz updated the diff for D8287: fix: add a -s option to format a revision and its descendants.
Wed, Mar 18, 2:35 AM
martinvonz updated the diff for D8288: fix: mark -r as advanced.
Wed, Mar 18, 2:34 AM
martinvonz updated the diff for D8286: fix: move handling of --all into getrevstofix() for consistency.
Wed, Mar 18, 2:34 AM

Tue, Mar 17

martinvonz updated the summary of D8289: resolve: add a --clear option for clearing the merge state.
Tue, Mar 17, 6:06 PM

Mon, Mar 16

martinvonz closed D8284: fix: disallow `hg fix --all --working-dir`.
Mon, Mar 16, 11:04 PM
martinvonz closed D8285: fix: refactor getrevstofix() to define revisions first, then validate them.
Mon, Mar 16, 11:04 PM
martinvonz committed rHG368f85c5dfc0: fix: refactor getrevstofix() to define revisions first, then validate them.
fix: refactor getrevstofix() to define revisions first, then validate them
Mon, Mar 16, 11:04 PM
martinvonz committed rHG40f4a75938ba: fix: disallow `hg fix --all --working-dir`.
fix: disallow `hg fix --all --working-dir`
Mon, Mar 16, 11:04 PM
martinvonz updated the diff for D8287: fix: add a -s option to format a revision and its descendants.
Mon, Mar 16, 10:11 PM
martinvonz updated the diff for D8288: fix: mark -r as advanced.
Mon, Mar 16, 10:11 PM
martinvonz updated the diff for D8286: fix: move handling of --all into getrevstofix() for consistency.
Mon, Mar 16, 10:10 PM
martinvonz updated the diff for D8285: fix: refactor getrevstofix() to define revisions first, then validate them.
Mon, Mar 16, 10:10 PM
martinvonz added a comment to D8284: fix: disallow `hg fix --all --working-dir`.

If --working-dir and --all are redundant, I don't see anyharm in allowing both to be passed.

The idea was to inform users that they're doing something that's a little weird, in case they were hoping for it to do something else. I don't care much and I'm fine with dropping this patch if that's the consensus.

If the intend is to inform, maybe we could issue a warning?

Mon, Mar 16, 8:31 PM
martinvonz added a comment to D8284: fix: disallow `hg fix --all --working-dir`.

If --working-dir and --all are redundant, I don't see anyharm in allowing both to be passed.

Mon, Mar 16, 1:36 PM

Sat, Mar 14

martinvonz closed D8292: rebase: accept multiple --source arguments (BC).
Sat, Mar 14, 5:33 AM
martinvonz closed D8293: rebase: accept multiple --base arguments (BC).
Sat, Mar 14, 5:33 AM
martinvonz closed D8283: tests: simplify test-fix-topology.t slightly by using a `(case !)`.
Sat, Mar 14, 5:32 AM
martinvonz committed rHGea40fea992e0: tests: simplify test-fix-topology.t slightly by using a `(case !)`.
tests: simplify test-fix-topology.t slightly by using a `(case !)`
Sat, Mar 14, 5:32 AM
martinvonz closed D8277: tests: fix rebase test broken by earlier cleanup.
Sat, Mar 14, 5:32 AM
martinvonz committed rHG254c5f71e2df: tests: fix rebase test broken by earlier cleanup.
tests: fix rebase test broken by earlier cleanup
Sat, Mar 14, 5:32 AM
martinvonz closed D8295: rebase: mention -r argument in synopsis.
Sat, Mar 14, 5:32 AM
martinvonz committed rHGf63598aa1c4b: rebase: accept multiple --base arguments (BC).
rebase: accept multiple --base arguments (BC)
Sat, Mar 14, 5:32 AM
martinvonz closed D8291: rebase: remove unused defaults argument values from _definedestmap().
Sat, Mar 14, 5:32 AM
martinvonz committed rHG05654ea5137c: rebase: accept multiple --source arguments (BC).
rebase: accept multiple --source arguments (BC)
Sat, Mar 14, 5:32 AM
martinvonz committed rHGc4c97cabfc16: rebase: mention -r argument in synopsis.
rebase: mention -r argument in synopsis
Sat, Mar 14, 5:32 AM
martinvonz committed rHGdc25de8117e4: rebase: remove unused defaults argument values from _definedestmap().
rebase: remove unused defaults argument values from _definedestmap()
Sat, Mar 14, 5:32 AM

Fri, Mar 13

martinvonz added a comment to D8293: rebase: accept multiple --base arguments (BC).

I've updated the synopsis (also added another patch in the series for adding -r to the synopsis).

Fri, Mar 13, 10:40 PM
martinvonz updated the diff for D8292: rebase: accept multiple --source arguments (BC).
Fri, Mar 13, 10:38 PM
martinvonz updated the diff for D8293: rebase: accept multiple --base arguments (BC).
Fri, Mar 13, 10:38 PM
martinvonz retitled D8295: rebase: mention -r argument in synopsis from rebase: mention -r argument in synposis to rebase: mention -r argument in synopsis.
Fri, Mar 13, 10:37 PM
martinvonz created D8295: rebase: mention -r argument in synopsis.
Fri, Mar 13, 10:37 PM
martinvonz retitled D8293: rebase: accept multiple --base arguments (BC) from rebase: accept multiple --base arguments to rebase: accept multiple --base arguments (BC).
Fri, Mar 13, 8:24 PM
martinvonz created D8292: rebase: accept multiple --source arguments (BC).
Fri, Mar 13, 8:23 PM
martinvonz created D8293: rebase: accept multiple --base arguments (BC).
Fri, Mar 13, 8:23 PM
martinvonz created D8291: rebase: remove unused defaults argument values from _definedestmap().
Fri, Mar 13, 8:23 PM
D8136: phabricator: add a `phabimport` command is now accepted and ready to land.
Fri, Mar 13, 8:22 PM
martinvonz updated the diff for D8287: fix: add a -s option to format a revision and its descendants.
Fri, Mar 13, 7:24 PM
martinvonz updated the diff for D8288: fix: mark -r as advanced.
Fri, Mar 13, 7:24 PM
martinvonz added inline comments to D8287: fix: add a -s option to format a revision and its descendants.
Fri, Mar 13, 7:23 PM
martinvonz created D8289: resolve: add a --clear option for clearing the merge state.
Fri, Mar 13, 5:21 PM
martinvonz created D8290: morestatus: recommend `hg resolve --clear` when appropriate.
Fri, Mar 13, 5:21 PM
martinvonz updated the diff for D8287: fix: add a -s option to format a revision and its descendants.
Fri, Mar 13, 3:38 PM
martinvonz updated the diff for D8288: fix: mark -r as advanced.
Fri, Mar 13, 3:38 PM
martinvonz created D8287: fix: add a -s option to format a revision and its descendants.
Fri, Mar 13, 3:33 PM
martinvonz created D8288: fix: mark -r as advanced.
Fri, Mar 13, 3:33 PM
martinvonz created D8286: fix: move handling of --all into getrevstofix() for consistency.
Fri, Mar 13, 3:33 PM
martinvonz created D8285: fix: refactor getrevstofix() to define revisions first, then validate them.
Fri, Mar 13, 3:33 PM
martinvonz created D8284: fix: disallow `hg fix --all --working-dir`.
Fri, Mar 13, 3:33 PM
martinvonz abandoned D8223: merge: respect ui.relative-paths for some warning messages.
Fri, Mar 13, 1:17 PM
martinvonz updated the diff for D8283: tests: simplify test-fix-topology.t slightly by using a `(case !)`.
Fri, Mar 13, 1:12 PM
martinvonz abandoned D8282: tests: consistently put #testcases at beginning of file.
Fri, Mar 13, 1:11 PM
martinvonz updated the summary of D8282: tests: consistently put #testcases at beginning of file.
Fri, Mar 13, 12:57 PM
martinvonz added a comment to D8282: tests: consistently put #testcases at beginning of file.

Can you drop your change to tests/test-push-race.t from this patch ?

Fri, Mar 13, 12:54 PM
martinvonz added a comment to D8282: tests: consistently put #testcases at beginning of file.

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 title and documentation (the one with =====\ntitle\n===== or title\n=====).
I would be fine with having the requires/testcases right after the title when it make senses. I think there are some instance where the variants are formally documented, and the #testcase block is part of that. It might make sense to keep them at that location.

Fri, Mar 13, 12:35 PM
martinvonz added a comment to D8282: tests: consistently put #testcases at beginning of file.

(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 the testcase declaration to comes after the initial module title (and maybe doc).

Fri, Mar 13, 11:34 AM
martinvonz added a comment to D8281: narrow: escape includepats/excludepats when sending over the wire.

The Windows path changes seem like a good idea.
Would quoting paths with commas eliminate the need for custom escaping? I don't feel strongly about it, but custom escaping always feels weird to me. (I fact, a coworker did some homebrew escaping for CSV files a few days ago, but I forget how it ultimately ended up.)

Let me play with that a bit, I think it'll work and be detectable on the server since the first character can't currently be a double-quote, so there wouldn't really be any BC issues aside from the pconvert (which wouldn't be as important anymore, but still probably a good idea?)

I haven't played with narrow yet, so I'm not sure of the context. Are these user input paths that would end up being ignored/rejected if a Windows user used path\to\file when talking to a Unix server? Or are these stored in a tracked file? (Which I think could still cause problems.) I can't think of a good reason to stay inconsistent, and it is still experimental, so it still seems like a good idea while we still can fix it.

Fri, Mar 13, 11:17 AM
martinvonz added a comment to D8282: tests: consistently put #testcases at beginning of file.

I very much agree with Matt

Fri, Mar 13, 11:05 AM
martinvonz added inline comments to D8282: tests: consistently put #testcases at beginning of file.
Fri, Mar 13, 9:29 AM