Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

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

Recent Activity

Today

martinvonz added a comment to D8029: uncopy: add new `hg uncopy` command.

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Wed, Jan 29, 12:06 PM
martinvonz added a comment to D7907: rebase: always be graft-like, not merge-like, also for merges.

Reviewers: This patch is independent of D7827, so please don't let that patch block this one.

Wed, Jan 29, 11:35 AM
martinvonz added a comment to D3896: copies: handle case when both merge cset are not descendant of merge base.

Pretty sure this was made obsolete by D6255

Wed, Jan 29, 11:31 AM
D8036: tests: stablize test-rename-merge1.t on Windows is now accepted and ready to land.
Wed, Jan 29, 12:10 AM

Yesterday

martinvonz updated the diff for D8035: copy: add support for marking committed copies.
Tue, Jan 28, 6:59 PM
martinvonz updated the diff for D8030: uncopy: add support for unmarking committed copies.
Tue, Jan 28, 6:59 PM
martinvonz updated the diff for D8029: uncopy: add new `hg uncopy` command.
Tue, Jan 28, 6:57 PM
martinvonz created D8035: copy: add support for marking committed copies.
Tue, Jan 28, 6:55 PM
martinvonz created D8030: uncopy: add support for unmarking committed copies.
Tue, Jan 28, 6:54 PM
martinvonz created D8029: uncopy: add new `hg uncopy` command.
Tue, Jan 28, 6:54 PM
martinvonz created D8034: check-code: allow `hg cp -r`, by using a negative lookbehind.
Tue, Jan 28, 6:53 PM
martinvonz created D8033: copy: move argument validation a little earlier.
Tue, Jan 28, 6:53 PM
martinvonz created D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.
Tue, Jan 28, 6:53 PM
martinvonz created D8027: graft: default `base` argument to common case of `ctx.p1()`.
Tue, Jan 28, 6:52 PM
martinvonz created D8031: copy: rewrite walkpat() to depend less on dirstate.
Tue, Jan 28, 6:52 PM
martinvonz created D8028: tests: use full `uncommit` command name in tests.
Tue, Jan 28, 6:51 PM
martinvonz created D8026: graft: let caller pass in overlayworkingctx to merge.graft().
Tue, Jan 28, 6:51 PM
martinvonz added a comment to D8021: chg: switch to using global `environ` instead of envp from main.

Queuing based on @yuja's review.

Tue, Jan 28, 4:38 PM
martinvonz added a comment to D8021: chg: switch to using global `environ` instead of envp from main.

Queuing based on @yuja's review.

Tue, Jan 28, 4:36 PM
martinvonz created D8025: rust: re-format with nightly rustfmt.
Tue, Jan 28, 1:41 PM
D7866: rust-pathauditor: add Rust implementation of the `pathauditor` now requires changes to proceed.
Tue, Jan 28, 12:20 PM
D7867: rust-hg-path: add useful methods to `HgPath` now requires changes to proceed.
Tue, Jan 28, 12:20 PM

Mon, Jan 27

martinvonz added a comment to D7450: packaging: add support for PyOxidizer.

I'd be very happy to queue this as soon as @mharbison72's request for Windows has been addressed (I think that was all, right?). We (Google) would like to use it for macOS packaging too. We may also end up using it on Linux so we don't break when the system python3 changes from 3.7 of 3.8 (because we currently install .so files specific to a minor Python version, IIUC). Thanks a lot for your work on this, @indygreg. And thanks for reviewing and testing it, @mharbison72.

Mon, Jan 27, 3:50 PM
martinvonz created D8020: rust: remove an unnecessary set of parentheses.
Mon, Jan 27, 3:39 PM
martinvonz added inline comments to D7790: rust-node: handling binary Node prefix.
Mon, Jan 27, 2:09 PM
martinvonz accepted D7794: rust-nodemap: generic NodeTreeVisitor.
Mon, Jan 27, 2:00 PM
martinvonz added inline comments to D7791: rust-nodemap: NodeMap trait with simplest implementation.
Mon, Jan 27, 1:40 PM
D7789: rust-revlog: a trait for the revlog index is now accepted and ready to land.
Mon, Jan 27, 1:25 PM
D7790: rust-node: handling binary Node prefix is now accepted and ready to land.
Mon, Jan 27, 1:24 PM
martinvonz created D8018: cmdutil: change check_incompatible_arguments() *arg to single iterable.
Mon, Jan 27, 12:44 PM
martinvonz added a comment to D7993: merge: use check_incompatible_arguments() for --abort.
In D7993#118162, @yuja wrote:

+ cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')

It's a bit late, but I feel the arguments of check_incompatible_arguments()
is confusing since b'abort' isn't the same kind of arguments as the others.
I think (opts, b'abort', [b'rev', b'preview']) is more explicit.

Mon, Jan 27, 12:42 PM
martinvonz added inline comments to D7906: rebase: define base in only place in defineparents().
Mon, Jan 27, 9:44 AM

Sat, Jan 25

martinvonz closed D7998: merge: replace a repo.lookup('.') by more typical repo['.'].node().
Sat, Jan 25, 7:27 PM
martinvonz closed D7997: merge: drop now-unused "abort" argument from hg.merge().
Sat, Jan 25, 7:26 PM
martinvonz closed D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`.
Sat, Jan 25, 7:26 PM
martinvonz committed rHGd84420232492: pathauditor: drop a redundant call to bytes.lower().
pathauditor: drop a redundant call to bytes.lower()
Sat, Jan 25, 7:26 PM
martinvonz closed D8001: pathauditor: drop a redundant call to bytes.lower().
Sat, Jan 25, 7:26 PM
martinvonz committed rHG293cab97a766: merge: replace a repo.lookup('.') by more typical repo['.'].node().
merge: replace a repo.lookup('.') by more typical repo['.'].node()
Sat, Jan 25, 7:26 PM
martinvonz closed D7995: merge: call hg.abortmerge() directly and return early.
Sat, Jan 25, 7:26 PM
martinvonz committed rHGbd4f666b55a7: merge: drop now-unused "abort" argument from hg.merge().
merge: drop now-unused "abort" argument from hg.merge()
Sat, Jan 25, 7:26 PM
martinvonz closed D7993: merge: use check_incompatible_arguments() for --abort.
Sat, Jan 25, 7:26 PM
martinvonz committed rHG1850066f9e36: merge: don't auto-pick destination with `hg merge 'wdir()'`.
merge: don't auto-pick destination with `hg merge 'wdir()'`
Sat, Jan 25, 7:25 PM
martinvonz closed D7994: merge: check that there are no conflicts after --abort.
Sat, Jan 25, 7:25 PM
martinvonz committed rHG6744859ff3ee: merge: call hg.abortmerge() directly and return early.
merge: call hg.abortmerge() directly and return early
Sat, Jan 25, 7:25 PM
martinvonz committed rHG2b6632d64328: merge: check that there are no conflicts after --abort.
merge: check that there are no conflicts after --abort
Sat, Jan 25, 7:24 PM
martinvonz committed rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort.
merge: use check_incompatible_arguments() for --abort
Sat, Jan 25, 7:24 PM
martinvonz updated the diff for D7999: merge: make hg.merge() take a context instead of a node.
Sat, Jan 25, 1:08 AM
martinvonz updated the diff for D7997: merge: drop now-unused "abort" argument from hg.merge().
Sat, Jan 25, 1:07 AM
martinvonz updated the diff for D7998: merge: replace a repo.lookup('.') by more typical repo['.'].node().
Sat, Jan 25, 1:07 AM
martinvonz updated the summary of D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`.
Sat, Jan 25, 1:07 AM

Fri, Jan 24

martinvonz added inline comments to D7866: rust-pathauditor: add Rust implementation of the `pathauditor`.
Fri, Jan 24, 8:50 PM
martinvonz added a comment to D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`.

Looks like we don't have tests for hg merge 'wdir()'. Also I am not sure what should be the correct behavior in that case.

Yes, I just didn't care enough to add tests. I don't care much because it's such a weird thing for the user to do. I changed this only in order to clarify the control flow and how node gets assigned. I can add a test if you want.

Fri, Jan 24, 8:49 PM
martinvonz added a comment to D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`.

Looks like we don't have tests for hg merge 'wdir()'. Also I am not sure what should be the correct behavior in that case.

Fri, Jan 24, 8:42 PM
martinvonz created D8002: pathutil: mark parent directories as audited as we go.
Fri, Jan 24, 8:40 PM
martinvonz created D8001: pathauditor: drop a redundant call to bytes.lower().
Fri, Jan 24, 8:40 PM
martinvonz created D7999: merge: make hg.merge() take a context instead of a node.
Fri, Jan 24, 7:19 PM
martinvonz created D7998: merge: replace a repo.lookup('.') by more typical repo['.'].node().
Fri, Jan 24, 7:18 PM
martinvonz created D8000: mq: don't tell user to commit merge that we already committed.
Fri, Jan 24, 7:18 PM
martinvonz created D7997: merge: drop now-unused "abort" argument from hg.merge().
Fri, Jan 24, 7:17 PM
martinvonz created D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`.
Fri, Jan 24, 7:17 PM
martinvonz created D7995: merge: call hg.abortmerge() directly and return early.
Fri, Jan 24, 7:17 PM
martinvonz created D7993: merge: use check_incompatible_arguments() for --abort.
Fri, Jan 24, 7:17 PM
martinvonz created D7994: merge: check that there are no conflicts after --abort.
Fri, Jan 24, 7:16 PM
martinvonz updated the diff for D7990: merge: start using the per-side copy dicts.
Fri, Jan 24, 6:34 PM
martinvonz updated the diff for D7989: copies: define a type to return from mergecopies().
Fri, Jan 24, 6:34 PM
martinvonz updated the diff for D7988: merge: move initialization of copy dicts to one place.
Fri, Jan 24, 6:34 PM
martinvonz created D7992: clean: delete obsolete unlinking of .hg/graftstate.
Fri, Jan 24, 6:31 PM
martinvonz closed D7905: rebase: move some variables after an error cases where they're not needed.
Fri, Jan 24, 6:27 PM
martinvonz closed D7900: merge: avoid a negation in the definition of updatedirstate.
Fri, Jan 24, 6:27 PM
martinvonz committed rHG1cb7ae9b0071: rebase: move some variables after an error cases where they're not needed.
rebase: move some variables after an error cases where they're not needed
Fri, Jan 24, 6:27 PM
martinvonz closed D7904: rebase: clarify a little by calculating a set in Python instead of in revset.
Fri, Jan 24, 6:27 PM
martinvonz closed D7975: copies: move early return in mergecopies() earlier.
Fri, Jan 24, 6:27 PM
martinvonz committed rHG4263aaab651d: rebase: clarify a little by calculating a set in Python instead of in revset.
rebase: clarify a little by calculating a set in Python instead of in revset
Fri, Jan 24, 6:27 PM
martinvonz committed rHGfaec51c76b7b: merge: avoid a negation in the definition of updatedirstate.
merge: avoid a negation in the definition of updatedirstate
Fri, Jan 24, 6:27 PM
martinvonz closed D7983: merge: move definition of `partial` closer to where it's used.
Fri, Jan 24, 6:27 PM
martinvonz committed rHGae9310709c13: merge: move definition of `partial` closer to where it's used.
merge: move definition of `partial` closer to where it's used
Fri, Jan 24, 6:26 PM
martinvonz closed D7977: copies: extract function for finding directory renames.
Fri, Jan 24, 6:26 PM
martinvonz closed D7976: copies: avoid calculating debug-only stuff without --debug.
Fri, Jan 24, 6:26 PM
martinvonz committed rHG45192589555c: copies: extract function for finding directory renames.
copies: extract function for finding directory renames
Fri, Jan 24, 6:26 PM
martinvonz closed D7985: tests: test merge of renames of different sources to same target.
Fri, Jan 24, 6:26 PM
martinvonz committed rHG782e0d9c3b74: copies: avoid calculating debug-only stuff without --debug.
copies: avoid calculating debug-only stuff without --debug
Fri, Jan 24, 6:26 PM
martinvonz committed rHGbaf3fe2977cc: copies: move early return in mergecopies() earlier.
copies: move early return in mergecopies() earlier
Fri, Jan 24, 6:26 PM
martinvonz closed D7984: clean: check that there are no conflicts after.
Fri, Jan 24, 6:26 PM
martinvonz committed rHGd7622fdec3b5: tests: test merge of renames of different sources to same target.
tests: test merge of renames of different sources to same target
Fri, Jan 24, 6:26 PM
martinvonz closed D7991: progress: delete deprecated ui.progress().
Fri, Jan 24, 6:26 PM
martinvonz committed rHGabcc82bf0717: clean: check that there are no conflicts after.
clean: check that there are no conflicts after
Fri, Jan 24, 6:26 PM
martinvonz committed rHGdf2162672d24: progress: delete deprecated ui.progress().
progress: delete deprecated ui.progress()
Fri, Jan 24, 6:26 PM
martinvonz created D7991: progress: delete deprecated ui.progress().
Fri, Jan 24, 5:33 PM
martinvonz created D7987: copies: print debug information about copies per side/branch.
Fri, Jan 24, 5:02 PM
martinvonz created D7990: merge: start using the per-side copy dicts.
Fri, Jan 24, 5:02 PM
martinvonz updated the summary of D7974: merge: when rename was made on both sides, use ancestor as merge base.
Fri, Jan 24, 5:02 PM
martinvonz created D7989: copies: define a type to return from mergecopies().
Fri, Jan 24, 5:02 PM
martinvonz created D7988: merge: move initialization of copy dicts to one place.
Fri, Jan 24, 5:01 PM
martinvonz updated the diff for D7975: copies: move early return in mergecopies() earlier.
Fri, Jan 24, 5:01 PM
martinvonz created D7986: copies: make mergecopies() distinguish between copies on each side.
Fri, Jan 24, 5:01 PM
martinvonz updated the diff for D7977: copies: extract function for finding directory renames.
Fri, Jan 24, 5:01 PM
martinvonz updated the diff for D7976: copies: avoid calculating debug-only stuff without --debug.
Fri, Jan 24, 5:01 PM
martinvonz created D7985: tests: test merge of renames of different sources to same target.
Fri, Jan 24, 5:00 PM
martinvonz added a comment to D7974: merge: when rename was made on both sides, use ancestor as merge base.

I'll insert another patch with another fun test case before this patch soon

Fri, Jan 24, 1:06 PM
martinvonz created D7984: clean: check that there are no conflicts after.
Fri, Jan 24, 12:36 PM