Page MenuHomePhabricator
Feed Advanced Search

Yesterday

martinvonz added inline comments to D6734: git: skeleton of a new extension to _directly_ operate on git repos.
Thu, Feb 27, 7:36 PM
martinvonz added a comment to D6734: git: skeleton of a new extension to _directly_ operate on git repos.

Not done reviewing, but I need to switch over to other work. Here are a few comments for now.

Thu, Feb 27, 5:43 PM
martinvonz closed D8120: debugmergestate: make templated.
Thu, Feb 27, 1:32 PM
martinvonz closed D8167: merge: drop redundant mergeforce argument from hg.merge().
Thu, Feb 27, 1:31 PM
martinvonz closed D8168: merge: introduce a merge() for that use-case.
Thu, Feb 27, 1:31 PM
martinvonz committed rHG0e5e192adb6f: tests: use new, use-case-specific methods from merge module.
tests: use new, use-case-specific methods from merge module
Thu, Feb 27, 1:30 PM
martinvonz closed D8169: tests: use new, use-case-specific methods from merge module.
Thu, Feb 27, 1:30 PM
martinvonz committed rHGa45ffad9ae98: merge: introduce a merge() for that use-case.
merge: introduce a merge() for that use-case
Thu, Feb 27, 1:30 PM
martinvonz closed D8166: merge: change default of hg.merge()'s "force" argument from None to False.
Thu, Feb 27, 1:30 PM
martinvonz committed rHGddbc296a1f48: merge: drop redundant mergeforce argument from hg.merge().
merge: drop redundant mergeforce argument from hg.merge()
Thu, Feb 27, 1:30 PM
martinvonz closed D8118: mergestate: determine if active without looking for state files on disk.
Thu, Feb 27, 1:30 PM
martinvonz committed rHG0f60687b2324: merge: change default of hg.merge()'s "force" argument from None to False.
merge: change default of hg.merge()'s "force" argument from None to False
Thu, Feb 27, 1:30 PM
martinvonz committed rHGacbfa31cfaf2: debugmergestate: make templated.
debugmergestate: make templated
Thu, Feb 27, 1:30 PM
martinvonz closed D8119: tests: add tests of debugmergestate with unresolved/resolved path conflicts.
Thu, Feb 27, 1:30 PM
martinvonz committed rHG382f4f09f0bd: tests: add tests of debugmergestate with unresolved/resolved path conflicts.
tests: add tests of debugmergestate with unresolved/resolved path conflicts
Thu, Feb 27, 1:30 PM
martinvonz committed rHG5e3402a0b868: mergestate: determine if active without looking for state files on disk.
mergestate: determine if active without looking for state files on disk
Thu, Feb 27, 1:30 PM
martinvonz updated the diff for D8120: debugmergestate: make templated.
Thu, Feb 27, 11:40 AM
martinvonz added a comment to D8118: mergestate: determine if active without looking for state files on disk.

This series fails to apply on current default tip.

Thu, Feb 27, 11:39 AM
martinvonz updated the diff for D8118: mergestate: determine if active without looking for state files on disk.
Thu, Feb 27, 11:39 AM
martinvonz updated the diff for D8167: merge: drop redundant mergeforce argument from hg.merge().
Thu, Feb 27, 11:36 AM
martinvonz added a comment to D8169: tests: use new, use-case-specific methods from merge module.

Moved formatting fix to parent patch

Thu, Feb 27, 11:36 AM
martinvonz added a comment to D8168: merge: introduce a merge() for that use-case.

Moved formatting fix to parent patch

Thu, Feb 27, 11:36 AM
martinvonz updated the diff for D8168: merge: introduce a merge() for that use-case.
Thu, Feb 27, 11:36 AM
martinvonz updated the diff for D8169: tests: use new, use-case-specific methods from merge module.
Thu, Feb 27, 11:35 AM

Wed, Feb 26

martinvonz updated the diff for D8168: merge: introduce a merge() for that use-case.
Wed, Feb 26, 2:17 PM
martinvonz created D8168: merge: introduce a merge() for that use-case.
Wed, Feb 26, 2:15 PM
martinvonz created D8167: merge: drop redundant mergeforce argument from hg.merge().
Wed, Feb 26, 2:14 PM
martinvonz created D8169: tests: use new, use-case-specific methods from merge module.
Wed, Feb 26, 2:14 PM
martinvonz created D8166: merge: change default of hg.merge()'s "force" argument from None to False.
Wed, Feb 26, 2:14 PM
martinvonz committed rHG6689cebacb32: pyoxidizer: allow extensions to be loaded from the file system.
pyoxidizer: allow extensions to be loaded from the file system
Wed, Feb 26, 11:52 AM
martinvonz closed D8122: pyoxidizer: allow extensions to be loaded from the file system.
Wed, Feb 26, 10:32 AM
martinvonz committed rHG4e3dbb48ef76: pyoxidizer: allow extensions to be loaded from the file system.
pyoxidizer: allow extensions to be loaded from the file system
Wed, Feb 26, 10:32 AM
martinvonz committed rHGdda2341d6664: drawdag: abide by new createmarkers() API.
drawdag: abide by new createmarkers() API
Wed, Feb 26, 5:51 AM
martinvonz closed D8149: drawdag: abide by new createmarkers() API.
Wed, Feb 26, 5:51 AM

Tue, Feb 25

martinvonz added a comment to D8115: rebase: show bug when rebasing merge with obsoleted revs on both sides.

We already have tests for this (grepping for "unwanted changes" in tests/ should be enough to find them).

Tue, Feb 25, 6:30 PM
martinvonz created D8149: drawdag: abide by new createmarkers() API.
Tue, Feb 25, 3:53 PM
martinvonz added a comment to D8146: tests: stabilize test-rename-merge2.t on Windows.

Since the line does not occurs on linux, this probably got affected by some other change without being noticed.

Makes sense for why it was missed, but I bisected it back to the referenced commit. I know @martinvonz made some other related changes prior to that commit that had similar test fallout on Windows, but it isn't obvious to me why the referenced commit would change the order of when the background thread spins up.

Perhaps the line doesn't actually happen before that commit? You can try removing the (?) in the commit before my commit and see if that line is actually printed. I'm thinking that that commit pushed the number of files to close above some threshold that made it get printed. In that case, it was probably some of my earlier commits that made it no longer get printed and we just didn't notice since (?) means optional (no error if it doesn't get printed).

I can confirm that it was required in e1ecfc7c84be, and reconfirmed that it is needed in the latest code by removing the line from both. I'm not too worried about why it popped up- it just seemed odd that it didn't with the earlier followup patch I added to fix similar conditionalizing of this exact text elsewhere, and the commit where it started failing looked innocuous.

Tue, Feb 25, 1:05 AM
martinvonz added a comment to D8146: tests: stabilize test-rename-merge2.t on Windows.

Since the line does not occurs on linux, this probably got affected by some other change without being noticed.

Makes sense for why it was missed, but I bisected it back to the referenced commit. I know @martinvonz made some other related changes prior to that commit that had similar test fallout on Windows, but it isn't obvious to me why the referenced commit would change the order of when the background thread spins up.

Tue, Feb 25, 12:21 AM

Sat, Feb 15

martinvonz closed D8035: copy: add experimental support for marking committed copies.
Sat, Feb 15, 2:15 PM
martinvonz closed D8030: copy: add experimetal support for unmarking committed copies.
Sat, Feb 15, 2:15 PM
martinvonz committed rHG9dab3fa64325: copy: add experimental support for marking committed copies.
copy: add experimental support for marking committed copies
Sat, Feb 15, 2:14 PM
martinvonz closed D8029: copy: add option to unmark file as copied.
Sat, Feb 15, 2:14 PM
martinvonz committed rHGd8b49bf6cfec: copy: move argument validation a little earlier.
copy: move argument validation a little earlier
Sat, Feb 15, 2:12 PM
martinvonz closed D8033: copy: move argument validation a little earlier.
Sat, Feb 15, 2:12 PM
martinvonz committed rHG7c4b98a4e536: copy: add experimetal support for unmarking committed copies.
copy: add experimetal support for unmarking committed copies
Sat, Feb 15, 2:12 PM
martinvonz committed rHG8be0c63535b5: copy: add option to unmark file as copied.
copy: add option to unmark file as copied
Sat, Feb 15, 2:12 PM
martinvonz added a reviewer for D8122: pyoxidizer: allow extensions to be loaded from the file system: indygreg.
Sat, Feb 15, 1:12 AM
martinvonz added a comment to D8122: pyoxidizer: allow extensions to be loaded from the file system.

Does this also allow extensions to be bundled in the exe, or are you thinking we need to leave the extensions outside the binary?

Sat, Feb 15, 1:11 AM

Fri, Feb 14

martinvonz created D8122: pyoxidizer: allow extensions to be loaded from the file system.
Fri, Feb 14, 11:30 PM
martinvonz added a comment to D8030: copy: add experimetal support for unmarking committed copies.

fixed stale uses of -r in commit message and transient code

Fri, Feb 14, 6:22 PM
martinvonz added a comment to D8035: copy: add experimental support for marking committed copies.

fixed stale uses of -r in commit message and transient code

Fri, Feb 14, 6:22 PM
martinvonz added a comment to D8033: copy: move argument validation a little earlier.

fixed stale uses of -r in commit message and transient code

Fri, Feb 14, 6:20 PM
martinvonz updated the summary of D8029: copy: add option to unmark file as copied.
Fri, Feb 14, 6:19 PM
martinvonz added a comment to D8034: check-code: allow `hg cp -r`, by using a negative lookbehind.

No longer needed now that we've renamed -r to --at-rev.

Fri, Feb 14, 6:16 PM
martinvonz updated the diff for D8030: copy: add experimetal support for unmarking committed copies.
Fri, Feb 14, 4:41 PM
martinvonz updated the summary of D8035: copy: add experimental support for marking committed copies.
Fri, Feb 14, 4:40 PM
martinvonz updated the diff for D8033: copy: move argument validation a little earlier.
Fri, Feb 14, 4:39 PM
martinvonz added a comment to D8030: copy: add experimetal support for unmarking committed copies.

I don't like the idea of delaying this feature two months.

I believe we need wider discussion about this before going further, this is an interresting change but we cannot rush it. This not necessarly result in a to a 1.5 month delay if a proper community discussion happens before that. Can you create and fill a Plan page and start a community discussion around this?

! In D8030#120861, @Alphare wrote:
I'm fine with marking the use of -r experimental. I don't like the idea of delaying this feature two months. Any problem with marking it experimental for now? As usual with experimental features, that will allow us to rename the flag (and change other behavior) before we take it out of experimental.

Aside from (obviously) @marmoute, both Jordi and I had an instant reaction of "what?" when we learned what --rev meant.
I think that this goes against the intuition of at least a few people that are very accustomed to hg. While being able to operate on any particular rev could be a good - even great - idea in general, I am very uneasy about using --rev to qualify that target. I don't know if --target-rev is an option, but something similar would be much clearer that an already *extremely* common flag. This would shift the semantics of --rev in some commands and not in others.

I'm fine with --target-rev if that's what people prefer. I find it a bit weird to not use --rev` but that may just be because I'm been thinking of the working copy as a commit for longer than most.

Fri, Feb 14, 11:59 AM
martinvonz added a comment to D8030: copy: add experimetal support for unmarking committed copies.

I don't like the idea of delaying this feature two months.

I believe we need wider discussion about this before going further, this is an interresting change but we cannot rush it. This not necessarly result in a to a 1.5 month delay if a proper community discussion happens before that. Can you create and fill a Plan page and start a community discussion around this?

Fri, Feb 14, 9:35 AM
martinvonz created D8120: debugmergestate: make templated.
Fri, Feb 14, 1:22 AM
martinvonz added a comment to D8120: debugmergestate: make templated.

This one replaces D8113.

Fri, Feb 14, 1:20 AM
martinvonz created D8118: mergestate: determine if active without looking for state files on disk.
Fri, Feb 14, 1:20 AM
martinvonz created D8119: tests: add tests of debugmergestate with unresolved/resolved path conflicts.
Fri, Feb 14, 1:20 AM
martinvonz added a comment to D8113: debugmergestate: make templated.

I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the state list). To test that, I added hg debugmergestate before every hg resolve call in the test suite. That showed two different bugs. Feel free to de-queue this patch or I'll send updates later (maybe tomorrow). Sorry that I didn't think to test that before the patch got accepted.

Fri, Feb 14, 12:14 AM

Thu, Feb 13

martinvonz added a comment to D8113: debugmergestate: make templated.

I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the state list). To test that, I added hg debugmergestate before every hg resolve call in the test suite. That showed two different bugs. Feel free to de-queue this patch or I'll send updates later (maybe tomorrow). Sorry that I didn't think to test that before the patch got accepted.

Thu, Feb 13, 7:58 PM
martinvonz closed D8113: debugmergestate: make templated.
Thu, Feb 13, 7:27 PM
martinvonz committed rHG088ab52a04bc: debugmergestate: make templated.
debugmergestate: make templated
Thu, Feb 13, 7:26 PM
martinvonz added inline comments to D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 7:03 PM
martinvonz retitled D8030: copy: add experimetal support for unmarking committed copies from copy: add support for unmarking committed copies to copy: add experimetal support for unmarking committed copies.
Thu, Feb 13, 6:55 PM
martinvonz retitled D8035: copy: add experimental support for marking committed copies from copy: add support for marking committed copies to copy: add experimental support for marking committed copies.
Thu, Feb 13, 6:55 PM
martinvonz added inline comments to D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 6:51 PM
martinvonz added a comment to D8030: copy: add experimetal support for unmarking committed copies.

I had a longer discussion with @martinvonz on IRC on about this feature, he also pointed out to D7631 doing similar work for hg absorb.
From that discussion I understand there is a wider objective for many mercurial commands to gain the ability to use a specific revision in place of the working copy. (eg: hg amend, hg aborb, hg copy, etc…)
The idea is quite interresting and can unlock powerfull capabilities. However, this is a rather big UX project, I think we need a step back and think about this idea on a large scale. I am thinking at least a Plan page with a wider study of the command that could be impacted how the UI will be consistent. This allows a wider set of the community to chim in on such a big project.
A concret issue I current have with the plan is the planned --rev flag usage. To me, and other people around me, something like hg amend --rev X would means "amend change from the working copy into revision X". likewise hg absorb --rev REVSET would absorb the working copy change into the REVSET set of revisions. So the use of --rev is surprising to some and should be discussed. Maybe the --change flag (used, but hg status and hg diff) would be more suitable? Maybe a global flag --change-as-wdir that would work for any commands ?
This is the kind of question I would like to see discussed more widely before we invest more in this idea (Idea, that I find interresting overall). I added this as a topic for the upcoming sprint.
(Sorry for the delay this will involves, I wish the idea had explicitly surfaced earlier).

Thu, Feb 13, 6:33 PM
martinvonz updated the diff for D8030: copy: add experimetal support for unmarking committed copies.
Thu, Feb 13, 6:25 PM
martinvonz updated the diff for D8035: copy: add experimental support for marking committed copies.
Thu, Feb 13, 6:25 PM
martinvonz updated the diff for D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 6:24 PM
martinvonz added inline comments to D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 6:20 PM
martinvonz added inline comments to D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 6:07 PM
martinvonz updated the diff for D8113: debugmergestate: make templated.
Thu, Feb 13, 5:50 PM
martinvonz added a comment to D8113: debugmergestate: make templated.

Will be nice to add some release notes either in BC section or in features section stating debugmergestate now supports templates and can be used by scripts/editors.

Ah, good point, will do.
Thu, Feb 13, 5:48 PM
martinvonz added a comment to D8113: debugmergestate: make templated.

Will be nice to add some release notes either in BC section or in features section stating debugmergestate now supports templates and can be used by scripts/editors.

Thu, Feb 13, 5:45 PM
martinvonz retitled D8113: debugmergestate: make templated from debugcommands: add templated command for reading the merge state for e.g. IDEs to debugmergestate: make templated.
Thu, Feb 13, 4:49 PM
martinvonz added a comment to D8114: debugmergestate: use only templated output.

Making this patch part of D8113 (this patch was never meant to be queued on its own).

Thu, Feb 13, 4:47 PM
martinvonz updated the diff for D8030: copy: add experimetal support for unmarking committed copies.
Thu, Feb 13, 4:39 PM
martinvonz updated the diff for D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 4:39 PM
martinvonz updated the diff for D8033: copy: move argument validation a little earlier.
Thu, Feb 13, 4:38 PM
martinvonz closed D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.
Thu, Feb 13, 3:28 PM
martinvonz closed D8031: copy: rewrite walkpat() to depend less on dirstate.
Thu, Feb 13, 3:28 PM
martinvonz committed rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.
copy: rename `wctx` to `ctx` since it will not necessarily be working copy
Thu, Feb 13, 3:28 PM
martinvonz committed rHG2bd3b95fdce0: copy: rewrite walkpat() to depend less on dirstate.
copy: rewrite walkpat() to depend less on dirstate
Thu, Feb 13, 3:28 PM
martinvonz updated the diff for D8035: copy: add experimental support for marking committed copies.
Thu, Feb 13, 2:12 PM
martinvonz updated the diff for D8030: copy: add experimetal support for unmarking committed copies.
Thu, Feb 13, 2:12 PM
martinvonz updated the diff for D8033: copy: move argument validation a little earlier.
Thu, Feb 13, 2:10 PM
martinvonz updated the diff for D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.
Thu, Feb 13, 2:10 PM
martinvonz added a comment to D8029: copy: add option to unmark file as copied.

The commit message has a mention of uncopy which needs to be removed.

Thu, Feb 13, 2:09 PM
martinvonz updated the summary of D8029: copy: add option to unmark file as copied.
Thu, Feb 13, 2:09 PM
martinvonz created D8114: debugmergestate: use only templated output.
Thu, Feb 13, 2:08 PM
martinvonz committed rHGa69c08cdb2a8: merge with stable.
merge with stable
Thu, Feb 13, 1:23 PM
martinvonz added a comment to D8113: debugmergestate: make templated.

Why can't we add templater support to debugmergestate instead?

Thu, Feb 13, 1:09 PM
martinvonz created D8113: debugmergestate: make templated.
Thu, Feb 13, 1:37 AM

Wed, Feb 12

martinvonz added a comment to D8033: copy: move argument validation a little earlier.

Oddly, this had some rejects (I didn't look why) but i"d be happy to see this earlier in the series.

Wed, Feb 12, 5:27 PM