Page MenuHomePhabricator

marmoute (Pierre-Yves David)
User

Projects

User does not belong to any projects.

User Details

User Since
Jun 29 2017, 2:56 PM (169 w, 6 d)

Recent Activity

Yesterday

marmoute updated the diff for D9129: salvaged: persist the salvaged set on disk.
Wed, Sep 30, 9:36 PM
marmoute updated the diff for D9128: changing-files: add clean computation of changed file for merges.
Wed, Sep 30, 9:36 PM
marmoute added a comment to D9110: updaterepo: add deprecation warning.

Looks good

Wed, Sep 30, 10:27 AM
marmoute added a comment to D9071: rust-matchers: make `Matcher` trait object-safe.

That seems fine to me. We can battle with rustc to re-introducing the genericity when we actually need it.

Wed, Sep 30, 10:06 AM
marmoute added a comment to D9082: chg: make clang format happy.

I wanted the obsmarker. Which was not created (then my comment was wrong).

Wed, Sep 30, 10:01 AM
marmoute accepted D9094: rust: clippy pass.
Wed, Sep 30, 9:57 AM
marmoute created D9125: changing-files: add a debug command display changed files.
Wed, Sep 30, 9:12 AM
marmoute created D9130: salvaged: properly deal with salvaged file during copy tracing.
Wed, Sep 30, 9:11 AM
marmoute created D9129: salvaged: persist the salvaged set on disk.
Wed, Sep 30, 9:11 AM
marmoute created D9128: changing-files: add clean computation of changed file for merges.
Wed, Sep 30, 9:11 AM
marmoute created D9127: changing-files: add clean computation of changed files for linear changesets.
Wed, Sep 30, 9:11 AM
marmoute created D9126: changing-files: add clean computation of changed files for roots.
Wed, Sep 30, 9:11 AM
marmoute created D9124: side-data: add a test to check sidedata upgrade.
Wed, Sep 30, 9:11 AM
marmoute created D9123: changing-files: split the changing files computation from encoding.
Wed, Sep 30, 9:10 AM
marmoute updated the diff for D9120: salvaged: record salvaged in ChangingFiles at commit time.
Wed, Sep 30, 9:10 AM
marmoute updated the summary of D9119: salvaged: track removal-candidates in more cases.
Wed, Sep 30, 9:10 AM
marmoute created D9122: salvaged: explicitly skip salvaged file while encoding.
Wed, Sep 30, 9:10 AM
marmoute updated the diff for D9118: changing-files: add a "salvaged" set to track file that were not removed.
Wed, Sep 30, 9:10 AM

Tue, Sep 29

marmoute created D9119: salvaged: track removal-candidates in more cases.
Tue, Sep 29, 6:37 AM
marmoute created D9120: salvaged: record salvaged in ChangingFiles at commit time.
Tue, Sep 29, 6:37 AM
marmoute created D9118: changing-files: add a "salvaged" set to track file that were not removed.
Tue, Sep 29, 6:37 AM

Mon, Sep 28

marmoute created D9117: copies: directly pass a changes object to the copy tracing code.
Mon, Sep 28, 12:33 PM
marmoute created D9116: copies: no longer change the sidedata flag.
Mon, Sep 28, 12:32 PM
marmoute created D9115: copies: use dedicated `_revinfo_getter` function and call.
Mon, Sep 28, 12:32 PM
marmoute created D9114: copies: make two version of the changeset centric algorithm.
Mon, Sep 28, 12:32 PM
marmoute created D9113: copies: rename some function to the new naming scheme.
Mon, Sep 28, 12:32 PM
marmoute created D9112: changing-files: cache the various property.
Mon, Sep 28, 12:32 PM
marmoute created D9111: changing-files: always use `mark_touched` to update the touched set.
Mon, Sep 28, 12:32 PM
marmoute updated the diff for D9088: changing-files: record merged files at commit time.
Mon, Sep 28, 12:32 PM
marmoute committed rHG3d5b2b8e93fd: changing-files: move default constructor value to None.
changing-files: move default constructor value to None
Mon, Sep 28, 8:08 AM
marmoute closed D9086: changing-files: move default constructor value to None.
Mon, Sep 28, 8:08 AM
D9047: dispatch: load shared source repository config in share-safe mode now requires review to proceed.

ha, okay

Mon, Sep 28, 5:25 AM

Sat, Sep 26

marmoute created D9092: changing-files: retrieve changelogrevision.files from the sidedata block.
Sat, Sep 26, 8:10 AM
marmoute created D9090: changing-files: rework the way we store changed files in side-data.
Sat, Sep 26, 8:10 AM
marmoute created D9091: changing-files: drop the now useless changelogrevision argument.
Sat, Sep 26, 8:10 AM
marmoute created D9089: changing-files: add a utility to compute the merged files post-commit.
Sat, Sep 26, 8:10 AM
marmoute created D9088: changing-files: record merged files at commit time.
Sat, Sep 26, 8:10 AM
marmoute created D9087: changing-files: add the ability to track merged files too.
Sat, Sep 26, 8:10 AM
marmoute created D9086: changing-files: move default constructor value to None.
Sat, Sep 26, 8:09 AM
D9047: dispatch: load shared source repository config in share-safe mode now requires changes to proceed.

The logic looks good, but I hve a minor point on about the test.

Sat, Sep 26, 6:51 AM
marmoute committed rHG147fb889278b: sidedata: simply read p2copies files from the `ChangingFiles` object.
sidedata: simply read p2copies files from the `ChangingFiles` object
Sat, Sep 26, 6:50 AM
marmoute committed rHGf9a67afcc33b: sidedata: simply read removed files from the `ChangingFiles` object.
sidedata: simply read removed files from the `ChangingFiles` object
Sat, Sep 26, 6:50 AM
marmoute committed rHG4e2238ba51a4: sidedata: simply read p1copies files from the `ChangingFiles` object.
sidedata: simply read p1copies files from the `ChangingFiles` object
Sat, Sep 26, 6:50 AM
marmoute committed rHG48c93a0b2acb: sidedata: simply read added files from the `ChangingFiles` object.
sidedata: simply read added files from the `ChangingFiles` object
Sat, Sep 26, 6:50 AM
marmoute committed rHG7543b5072e84: sidedata: add a `decode_files_sidedata` function.
sidedata: add a `decode_files_sidedata` function
Sat, Sep 26, 6:50 AM
marmoute committed rHG64d18e9e8508: sidedata: rename `encode_copies_sidedata` to `encode_files_sidedata`.
sidedata: rename `encode_copies_sidedata` to `encode_files_sidedata`
Sat, Sep 26, 6:50 AM
marmoute committed rHG9a3563b46f52: changelog: add a `changes` property on `changelogrevision`.
changelog: add a `changes` property on `changelogrevision`
Sat, Sep 26, 6:50 AM

Fri, Sep 25

marmoute added a comment to D9065: merge: make low-level update() private (API).

tests/test-install.t and tests/test-duplicateoptions.py are unhappy about this change.

Fri, Sep 25, 8:01 AM
marmoute added a comment to D9082: chg: make clang format happy.

Thanks (but apparently you did created an obsmarker)

Fri, Sep 25, 6:20 AM

Thu, Sep 24

marmoute created D9082: chg: make clang format happy.
Thu, Sep 24, 8:23 PM

Wed, Sep 23

marmoute added a comment to D9045: tests: update test-share-safe to work with non-zstd versions.

This looks fine

Wed, Sep 23, 7:32 AM
marmoute updated subscribers of D9004: hgdemandimport: bypass demandimport for _ast module (issue6407).

Now that a fix as landed in python 3.9 should we back this out ?

Wed, Sep 23, 3:11 AM
marmoute added a comment to D8937: rust: enable on macOS.

@Alphare gentle ping to provide a todo list here.

Wed, Sep 23, 2:41 AM

Fri, Sep 18

marmoute committed rHG2bc978921e8a: strip: with --keep, consider all revs "removed" from the wcp (issue6270).
strip: with --keep, consider all revs "removed" from the wcp (issue6270)
Fri, Sep 18, 11:56 PM
marmoute committed rHG27822b8436bf: test-strip: display more information highlight buggy behavior.
test-strip: display more information highlight buggy behavior
Fri, Sep 18, 11:56 PM
marmoute committed rHGdf87821081ee: changing-files: implement equality checking.
changing-files: implement equality checking
Fri, Sep 18, 11:56 PM
marmoute committed rHG1f50bcc96595: changing-files: document the various sets.
changing-files: document the various sets
Fri, Sep 18, 11:56 PM

Thu, Sep 17

marmoute accepted D9006: chg: make is possible to call by default an hg binary located next to chg.
Thu, Sep 17, 4:01 AM
marmoute added a comment to D9006: chg: make is possible to call by default an hg binary located next to chg.

The behavior and the code looks good to me. I guess we should document the variable and the behavior somewhere. However I am not sure of where that might be. @yuya do you know where the chg documentation lives ?

Thu, Sep 17, 3:59 AM
marmoute added a comment to D8937: rust: enable on macOS.

Thanks for taking the time to do this.
I however still have reservations as to adding MacOS as a supported platform since it currently is tested in no CI that runs even semi-frequently on Rust code.
Also, what do you mean by "most tests pass"? What is needed to make the rest pass? And finally, which is the correct behavior from the Python version or the Rust one (according to your new commit message)?
I will take time to take a look at the code in detail after this becomes clearer for me, just so I can understand what compromise, if any, you're making right now.

Thu, Sep 17, 3:53 AM

Wed, Sep 16

marmoute closed D8939: tests: add criss cross merging tests whose behavior need to be fixed.
Wed, Sep 16, 7:49 AM
marmoute committed rHG9bd60ec60601: tests: add criss cross merging tests whose behavior need to be fixed.
tests: add criss cross merging tests whose behavior need to be fixed
Wed, Sep 16, 7:49 AM
marmoute added a comment to D9023: branchmap: add a cache validation cache, avoid expensive re-hash on every use.

Did you measure the performance impact on other operation than your target operation ? I am curious about the impact of the @property here.

Wed, Sep 16, 6:52 AM

Tue, Sep 15

marmoute committed rHG14be07d5603c: copy-tracing: test case where a merge reverted a file deletion.
copy-tracing: test case where a merge reverted a file deletion
Tue, Sep 15, 7:04 AM
marmoute committed rHG4b582a93316a: copy-tracing: test case where we go across a changed/deleted merge.
copy-tracing: test case where we go across a changed/deleted merge
Tue, Sep 15, 7:04 AM

Mon, Sep 14

marmoute added a comment to D8977: merge: check for dir rename dest before adding ACTION_KEEP.

Why don't we get a test change with this ?

The test changes are visible after disabling the m2-vs-ma optimization. I just plugged it before to minimize the test changes in that patch which disables the optimization.

Mon, Sep 14, 4:54 AM

Sat, Sep 12

marmoute added a comment to D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7.

looks good. As an unrelated change, maybe add a comment on the previous block to indicate it is relevant for all python starting from 3.9+

Sat, Sep 12, 6:03 AM
marmoute added a comment to D9007: graphlog: use '%' only if there are *unresolved* conflicts.

(maybe update the description to state this since this is a common question)

Sat, Sep 12, 6:01 AM
marmoute added a comment to D9007: graphlog: use '%' only if there are *unresolved* conflicts.

Sounds good then :-)

Sat, Sep 12, 6:01 AM

Fri, Sep 11

marmoute added a comment to D9016: histedit: cache description line.

great

Fri, Sep 11, 5:05 PM
marmoute added a comment to D9017: tests: make emacs test less strict.

sounds good.

Fri, Sep 11, 5:05 PM
marmoute added a comment to D9007: graphlog: use '%' only if there are *unresolved* conflicts.

Does this affect all merge (especially hg merge) ? or just the one where the working copy has only one parent?

Fri, Sep 11, 9:36 AM
marmoute added a comment to D8984: commit: pass mergestate into _filecommit() instead of re-reading it.

looks good

Fri, Sep 11, 8:58 AM
marmoute added a comment to D8983: merge: move initial handling of mergeactions near to later one.

This kind of massive code block move in a huge function make me think we should slice it into smaller function. What do you think?

Fri, Sep 11, 8:56 AM
D8977: merge: check for dir rename dest before adding ACTION_KEEP now requires changes to proceed.

Why don't we get a test change with this ?

Fri, Sep 11, 8:54 AM
marmoute added a comment to D8967: merge: show number of ancestors in bid merge debug notes.

Fri, Sep 11, 8:51 AM
marmoute added a comment to D8942: debugmergestate: show extras for files which are not in mergestate.

Thanks for the update.

Fri, Sep 11, 8:50 AM
marmoute added a comment to D8965: merge: update commitinfo from all mergeresults during bid merge.

not great, but okay.

Fri, Sep 11, 8:49 AM
marmoute added a comment to D8966: merge: show list of bids for each file in bid-merge in ui.note().

Fri, Sep 11, 8:48 AM
D8940: merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally now requires changes to proceed.
Fri, Sep 11, 5:40 AM
marmoute added a comment to D8974: merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent.

(I wonder if we don't use "missing" more than "absent" through the code. However quick grepping is not very conclusive and "missing" could be confused with the hg status state)

Fri, Sep 11, 5:35 AM
D8989: commit: force create a new filenode if it was set in mergestate by merge now requires changes to proceed.
Fri, Sep 11, 5:17 AM
marmoute added inline comments to D8988: merge: store commitinfo if mergetool resolved a dc or cd conflict.
Fri, Sep 11, 5:17 AM
D9003: merge: store cases when a file is absent post merge in commitinfo now requires changes to proceed.
Fri, Sep 11, 5:16 AM
marmoute added a comment to D8989: commit: force create a new filenode if it was set in mergestate by merge.

Cf feedback on the previous changeset about the semantic of the message.

Fri, Sep 11, 5:14 AM
D8988: merge: store commitinfo if mergetool resolved a dc or cd conflict now requires changes to proceed.
Fri, Sep 11, 5:12 AM
marmoute added a comment to D8987: tests: add few debugrevlogindex and a log call to see changes in next test.

Looks good.

Fri, Sep 11, 5:08 AM
marmoute added a comment to D8982: merge: disable `m2-vs-ma` diff optimization in case of flat manifests.

Looks good. Out of curiosity, did you do any performance measurement of this?

Fri, Sep 11, 5:06 AM
marmoute accepted D8981: scmutil: introduce function to check whether repo uses treemanifest or not.
Fri, Sep 11, 5:03 AM
marmoute added a comment to D8940: merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally.

So right now the bid merge still behave in a bad way (delete the file instead of conflicting, but at least not it consistently does so regardless of where the merge is started?

Fri, Sep 11, 4:59 AM
D8974: merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent now requires changes to proceed.
Fri, Sep 11, 4:55 AM
marmoute added a comment to D8939: tests: add criss cross merging tests whose behavior need to be fixed.

thanks for the extensive documentation.

Fri, Sep 11, 4:52 AM
marmoute added a comment to D9002: mergestate: introduce a new ACTION_KEEP_NEW.

Seems saner

Fri, Sep 11, 4:50 AM
marmoute added a comment to D8986: debugmergestate: sort extras before printing.

big +1

Fri, Sep 11, 4:47 AM
marmoute added inline comments to D8872: rhg: make output of `files` relative to the current directory and the root.
Fri, Sep 11, 4:47 AM
marmoute added a comment to D8872: rhg: make output of `files` relative to the current directory and the root.

This looks fine.

Fri, Sep 11, 4:42 AM
marmoute added a comment to D8972: [WIP] diff: add a `--tool` flag.

Should we move this to change requested since this is WIP ?

Fri, Sep 11, 4:29 AM
D8784: tags: adjust file node cache to have space for 32 bytes node ids now requires changes to proceed.

(updating status to reflect the current discussion status)

Fri, Sep 11, 4:27 AM
marmoute added a comment to D6259: [POC] revset: on-disk cache for children queries.

The approach used by the nodemap is probably a good way forward for transactional case. Some kind of happen only index, that get recompacked on a regular basis. Combined with an append only data file (for example, children can be stored as linked list (data file size) with a pointer to the first entry in an index file.

Fri, Sep 11, 4:24 AM
marmoute added a comment to D8990: rust-cpython: switch logging facade from `simple_logger` to `env_logger`.

Looks good.

Fri, Sep 11, 4:18 AM