Page MenuHomePhabricator
Feed Advanced Search

Sat, May 30

martinvonz added a comment to D7177: rebase: introduce optional parent mapping.

Maybe another option is to allow multiple -d arguments for this case? Something like hg rebase -r C -d B -d D. I haven't thought through BC, but I think that's what I'd prefer if we were writing rebase from scratch. I know we can't support hg rebase -r C -d 'B + D' for backward-compatibility reasons (because we already support that -- it rebases to the highest revnum in the set).

Sat, May 30, 2:08 PM

Fri, May 29

martinvonz updated subscribers of D8596: merge: mark copies in in-memory context when merging.

This is not meant for review; I'm sending it now in case it'll be useful for @durin42's work on merge-diffs. I also included the rest of the stack to explain why I wrote the code.

Fri, May 29, 12:00 PM
martinvonz created D8599: rebase: remove now-unused arguments from rebasenode().
Fri, May 29, 11:58 AM
martinvonz created D8598: rebase: drop duplicate call to copies.graftcopies().
Fri, May 29, 11:58 AM
martinvonz created D8596: merge: mark copies in in-memory context when merging.
Fri, May 29, 11:58 AM
martinvonz created D8597: rebase: use merge.graft() instead of merge.update().
Fri, May 29, 11:58 AM
martinvonz created D8595: copies: make _chain() and _filter() public.
Fri, May 29, 11:57 AM

Tue, May 26

martinvonz committed rHGfd3b94f1712d: merge with stable.
merge with stable
Tue, May 26, 12:18 PM

Tue, May 19

martinvonz added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

I think I'd prefer to leave code that doesn't use overlayworkingctx unchanged. I don't see any reason to get the merge state from the context if we know that the context is a regular workingctx.

I'd rather it was globally-consistent that if you need a mergestate, you load it via a context, so that more code will implicitly be right for in-memory operations.

Tue, May 19, 4:39 PM
martinvonz added inline comments to D8567: mergestate: implement trivial in-memory mergestate.
Tue, May 19, 3:20 AM
martinvonz added a comment to D8563: localrepo: get mergestate via context.

It looks like the latter two hunks in this file will need to be able to read the merge state from an overlayworkingctx. Maybe that's coming in a later patch, but I think it would be easier to follow if this code was changed only then (very much related to my comment on an earlier patch).

Tue, May 19, 2:30 AM
martinvonz added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

I think I'd prefer to leave code that doesn't use overlayworkingctx unchanged. I don't see any reason to get the merge state from the context if we know that the context is a regular workingctx.

Tue, May 19, 2:23 AM
martinvonz added a comment to D8550: mergestate: split out merge state handling code from main merge module.

Also update the release notes to mention the API change?

Tue, May 19, 2:17 AM

Mon, May 18

martinvonz committed rHGf445a4f7e8a7: relnotes: copy "next" to "5.4" and clear "next".
relnotes: copy "next" to "5.4" and clear "next"
Mon, May 18, 11:42 AM
martinvonz closed D8546: relnotes: copy "next" to "5.4" and clear "next".
Mon, May 18, 11:42 AM
martinvonz created D8546: relnotes: copy "next" to "5.4" and clear "next".
Mon, May 18, 11:33 AM

Sat, May 16

martinvonz added inline comments to D8489: rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291).
Sat, May 16, 2:05 AM

Tue, May 12

D8522: fastexport: adjust output to be more canonical is now accepted and ready to land.

Thanks for the quick fix and the added test case!

Tue, May 12, 6:07 PM
martinvonz committed rHGd2741ab1f8b7: tests: show poor error message for `hg cp -A --at-rev . non-existent dst`.
tests: show poor error message for `hg cp -A --at-rev . non-existent dst`
Tue, May 12, 4:05 PM
martinvonz committed rHGc5574408254a: copy: give better error message when no source paths found with --at-rev.
copy: give better error message when no source paths found with --at-rev
Tue, May 12, 4:05 PM
martinvonz committed rHG1cdc80280286: copy: to find copy source, walk parent of revision we're marking copies in.
copy: to find copy source, walk parent of revision we're marking copies in
Tue, May 12, 4:05 PM
martinvonz committed rHGaf9970501021: tests: show that `hg cp -A --at-rev .` doesn't work for renames.
tests: show that `hg cp -A --at-rev .` doesn't work for renames
Tue, May 12, 4:05 PM
martinvonz added inline comments to D8486: fastexport: adjust output to be more canonical.
Tue, May 12, 1:08 PM
martinvonz added inline comments to D8502: cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat.
Tue, May 12, 2:22 AM
martinvonz added a comment to D8502: cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat.

Mention API change in relnotes/next?

Tue, May 12, 2:21 AM

Mon, May 11

martinvonz added inline comments to D8504: diff: add experimental support for "merge diffs".
Mon, May 11, 10:57 PM
martinvonz closed D8514: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode.
Mon, May 11, 7:37 PM
martinvonz committed rHG62435a5b46fe: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode.
revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode
Mon, May 11, 7:37 PM
martinvonz closed D8511: status: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
Mon, May 11, 5:19 PM
martinvonz closed D8510: diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
Mon, May 11, 5:19 PM
martinvonz committed rHG07a6a29d25ea: status: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
status: use cmdutil.check_at_most_one_arg() for checking --rev/--change
Mon, May 11, 5:19 PM
martinvonz committed rHGaac816f584ad: diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change
Mon, May 11, 5:19 PM
martinvonz created D8514: revisions: parse "x123" as "nodeid starting with 123" without prefixhexnode.
Mon, May 11, 12:27 PM
martinvonz committed rHG0505766084d2: copy: give better error message when no source paths found with --at-rev.
copy: give better error message when no source paths found with --at-rev
Mon, May 11, 11:58 AM
martinvonz committed rHG9255d14adae9: tests: show poor error message for `hg cp -A --at-rev . non-existent dst`.
tests: show poor error message for `hg cp -A --at-rev . non-existent dst`
Mon, May 11, 11:58 AM
martinvonz committed rHG81c6d1b7ceee: copy: to find copy source, walk parent of revision we're marking copies in.
copy: to find copy source, walk parent of revision we're marking copies in
Mon, May 11, 11:58 AM
martinvonz committed rHG3a101007b86e: tests: show that `hg cp -A --at-rev .` doesn't work for renames.
tests: show that `hg cp -A --at-rev .` doesn't work for renames
Mon, May 11, 11:58 AM

Fri, May 8

martinvonz added a comment to D8504: diff: add experimental support for "merge diffs".

Looking forward to using this!

Fri, May 8, 12:25 PM
martinvonz created D8510: diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
Fri, May 8, 12:01 PM
martinvonz created D8511: status: use cmdutil.check_at_most_one_arg() for checking --rev/--change.
Fri, May 8, 12:01 PM

Thu, May 7

martinvonz closed D8496: copy: give better error message when no source paths found with --at-rev.
Thu, May 7, 2:22 PM
martinvonz closed D8494: copy: to find copy source, walk parent of revision we're marking copies in.
Thu, May 7, 2:21 PM
martinvonz committed rHG16596f5e1afa: copy: give better error message when no source paths found with --at-rev.
copy: give better error message when no source paths found with --at-rev
Thu, May 7, 2:21 PM
martinvonz closed D8495: tests: show poor error message for `hg cp -A --at-rev . non-existent dst`.
Thu, May 7, 2:21 PM
martinvonz committed rHG8e47b43d665f: tests: show poor error message for `hg cp -A --at-rev . non-existent dst`.
tests: show poor error message for `hg cp -A --at-rev . non-existent dst`
Thu, May 7, 2:21 PM
martinvonz closed D8493: tests: show that `hg cp -A --at-rev .` doesn't work for renames.
Thu, May 7, 2:21 PM
martinvonz committed rHG02bf61bb4a70: copy: to find copy source, walk parent of revision we're marking copies in.
copy: to find copy source, walk parent of revision we're marking copies in
Thu, May 7, 2:21 PM
martinvonz committed rHG5c49a4fdb238: tests: show that `hg cp -A --at-rev .` doesn't work for renames.
tests: show that `hg cp -A --at-rev .` doesn't work for renames
Thu, May 7, 2:21 PM
martinvonz added inline comments to D8486: fastexport: adjust output to be more canonical.
Thu, May 7, 11:56 AM
martinvonz added inline comments to D8497: procutil: always waiting on child processes to prevent zombies with 'hg serve'.
Thu, May 7, 11:40 AM

Wed, May 6

martinvonz created D8496: copy: give better error message when no source paths found with --at-rev.
Wed, May 6, 3:02 PM
martinvonz created D8494: copy: to find copy source, walk parent of revision we're marking copies in.
Wed, May 6, 3:02 PM
martinvonz created D8495: tests: show poor error message for `hg cp -A --at-rev . non-existent dst`.
Wed, May 6, 3:02 PM
martinvonz created D8493: tests: show that `hg cp -A --at-rev .` doesn't work for renames.
Wed, May 6, 3:01 PM

May 1 2020

martinvonz committed rHG16cba0ad8ac2: merge with stable.
merge with stable
May 1 2020, 11:18 AM

Apr 30 2020

martinvonz added a comment to D8484: automation: support building Python 3 MSI installers.

I'm queuing this series. Thanks for all your work on packaging!

Apr 30 2020, 12:52 AM
martinvonz added a comment to D8478: automation: support building Windows wheels for Python 3.7 and 3.8.

Why do we even give the choice between 3.7 and 3.8? Just because it was easy to do so anyway? Since the Python runtime is embedded, there's very little reason to try to match a system Python or something, right? To be clear, I don't have an issue with allowing it; I was just surprised by it and wanted to make sure I understand it correctly.

Apr 30 2020, 12:48 AM

Apr 23 2020

martinvonz closed D8463: commit: tell user what to do with .hg/last-message.txt.
Apr 23 2020, 2:04 PM
martinvonz committed rHGc6d31e659a28: commit: tell user what to do with .hg/last-message.txt.
commit: tell user what to do with .hg/last-message.txt
Apr 23 2020, 2:01 PM

Apr 22 2020

martinvonz added a comment to D8244: copies: fix the changeset based algorithm regarding merge.

Gentle ping on this. This is still ready for review.

Apr 22 2020, 1:55 PM
martinvonz abandoned D7149: export: use unfiltered repo if we're exporting the working copy parent.
Apr 22 2020, 12:02 PM
martinvonz added a comment to D7148: annotate: use unfiltered repo if we're annotating the working copy.

I thought I already had abandoned this, but apparently not :)

Apr 22 2020, 12:01 PM

Apr 21 2020

martinvonz updated the summary of D8463: commit: tell user what to do with .hg/last-message.txt.
Apr 21 2020, 11:54 AM
martinvonz added a comment to D8463: commit: tell user what to do with .hg/last-message.txt.

Okay. I am still a bit lost about what do you have in mind ? If the user do not act of the last-message.txt but move to something else, it seems reasonable that it get cleanup, right?

Apr 21 2020, 11:22 AM
martinvonz added a comment to D8463: commit: tell user what to do with .hg/last-message.txt.

I don't understand wer you are going with this mention of "other operation". But I don't think they loose it. It only get overwritten when a new one is written.

Apr 21 2020, 11:17 AM
martinvonz added a comment to D8463: commit: tell user what to do with .hg/last-message.txt.

Manual copy pasting is not necessary, hg commit --logfile .hg/last-message.txt can be used to reuse that message and hg commit --logfile .hg/last-message.txt --edit can be used to re-use and edit the message.
I would recommand that instead.

Apr 21 2020, 9:52 AM

Apr 20 2020

martinvonz created D8463: commit: tell user what to do with .hg/last-message.txt.
Apr 20 2020, 5:43 PM

Apr 13 2020

martinvonz added a comment to D8398: fastexport: fix diagnostics.

Think about any attempt to localize the error message.

Would have helped to put that in the commit message. So the pycompat.bytestr() call is unrelated and not needed, right?

Apr 13 2020, 1:43 PM
martinvonz added a comment to D8398: fastexport: fix diagnostics.

Think about any attempt to localize the error message.

Apr 13 2020, 1:38 PM
martinvonz added a comment to D8398: fastexport: fix diagnostics.

What was broken before? The test case still seems to pass for me if I undo the code change.

Apr 13 2020, 1:20 PM

Apr 10 2020

D8392: [RFC] mergestate: store about files resolved in favour of other is now accepted and ready to land.
Apr 10 2020, 12:11 PM

Apr 7 2020

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.

Apr 7 2020, 11:30 AM
martinvonz closed D8377: tests: move verification closer to setup in test-copies-chain-merge.t.
Apr 7 2020, 9:07 AM
martinvonz closed D8376: tests: collect all branch creation in one place in test-copies-chain-merge.t.
Apr 7 2020, 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
Apr 7 2020, 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
Apr 7 2020, 9:07 AM

Apr 3 2020

martinvonz closed D8356: rebase: don't create merge when continuing rebase interrupted by old hg.
Apr 3 2020, 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
Apr 3 2020, 11:04 AM
martinvonz closed D8355: tests: demonstrate how continuing rebase after upgrade can result in merge.
Apr 3 2020, 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
Apr 3 2020, 11:04 AM

Apr 2 2020

martinvonz created D8377: tests: move verification closer to setup in test-copies-chain-merge.t.
Apr 2 2020, 5:00 PM
martinvonz created D8376: tests: collect all branch creation in one place in test-copies-chain-merge.t.
Apr 2 2020, 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.

Apr 2 2020, 4:31 PM

Apr 1 2020

martinvonz created D8356: rebase: don't create merge when continuing rebase interrupted by old hg.
Apr 1 2020, 5:46 PM
martinvonz created D8355: tests: demonstrate how continuing rebase after upgrade can result in merge.
Apr 1 2020, 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:

Apr 1 2020, 2:08 PM

Mar 26 2020

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

Mar 25 2020

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