D6846: packaging: script the building of a MacOS installer using a custom python

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added a comment. Ha, ok. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6846/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6846 To: mharbison72, #hg-reviewers Cc: marmoute, mercurial-devel

D7928: rust-status: add function for sequential traversal of the working directory

2020-02-06 Thread Raphaël Gomès
Alphare added a comment. Alphare marked an inline comment as done. In D7928#119428 , @marmoute wrote: > There is a lot going on in this changeset. I am counting at least: > > - new `BadType/BadMatch` structs, > - `StatusResult` →

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in path_auditor.rs:86 > Since `HgRepoPath` is a path that's stored in the repo, I don't think so. Oh, > we just want to provide a different error message so we handle that further > up (lines 60-61). I see. What error message

D7969: exchange: check the `ui.clonebundleprefers` form while processing (issue6257)

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added inline comments. INLINE COMMENTS > mharbison72 wrote in test-clonebundles.t:458-464 > Not sure I understand. There are a handful of tests in test-clonebundles.t > that have multiple key/value pairs already, so the good case is covered. (I > missed this before and thought that

D8078: tests/test-copies-chain-merge.t

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added a comment. oops, this one got out by mistake. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8078/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8078 To: marmoute, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel

D7733: hgext: initial version of fastexport extension

2020-02-06 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger added a comment. Now blank and Python 3 clean. INLINE COMMENTS > pulkit wrote in fastexport.py:110 > These temporary variables can be prevented. Will be dropped. > pulkit wrote in fastexport.py:121 > This one is also same as `ctx.files()` I guess. I remember @martinvonz

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > Alphare wrote in path_auditor.rs:86 > I see. What error message do you propose? Sorry, I just meant that we do it this way so that we can provide different error messages for "inside .hg" and "inside subrepo" :) REPOSITORY rHG Mercurial

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in path_auditor.rs:86 > Sorry, I just meant that we do it this way so that we can provide different > error messages for "inside .hg" and "inside subrepo" :) Good idea. I'm rewriting my patches, I will soon send an update for

D8078: copies: add a new test dedicated to testing chain of changeset with merge

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute edited the summary of this revision. marmoute retitled this revision from "tests/test-copies-chain-merge.t" to "copies: add a new test dedicated to testing chain of changeset with merge". marmoute updated this revision to Diff 19931. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7733: hgext: initial version of fastexport extension

2020-02-06 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger marked 8 inline comments as done. joerg.sonnenberger updated this revision to Diff 19932. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7733?vs=18949=19932 BRANCH default CHANGES SINCE LAST ACTION

D7927: rust-status: add util for listing a directory

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. Alphare marked an inline comment as done. INLINE COMMENTS > marmoute wrote in status.rs:74 > Silly question: would it make sense to sort the filename before the loop ? It > might result is less bytes to move around since the entry will not be > attached yet. I'm

D7929: rust-status: add bare `hg status` support in hg-core

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > marmoute wrote in status.rs:29-38 > I am curious about where this changes comes from? did rust-format changed > opinion or did we reached a threshold? I was fixing conflicts and prefer this style. `rustfmt` does not nest already separate

D7869: rust-dirs-multiset: add `DirsChildrenMultiset`

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19936. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7869?vs=19383=19936 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7869/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7869

D7923: rust-matchers: add functions to get roots, dirs and parents from patterns

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19939. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7923?vs=19418=19939 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7923/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7923

D8088: rust-status: add missing variants to `Dispatch` enum

2020-02-06 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8088 AFFECTED FILES rust/hg-core/src/dirstate/status.rs CHANGE DETAILS

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

2020-02-06 Thread yuja (Yuya Nishihara)
yuja added a comment. I like the simplicity of this patch. Queued, thanks. > Computing the hash on the client avoids the restart loop, but doesn't avoid the behavior difference - chg will still call setenv and replace the modified version with the original one. Indeed. REPOSITORY

Re: D8076: worker: Manually buffer reads from pickle stream

2020-02-06 Thread Yuya Nishihara
> +if pycompat.ispy3: > + > +class _blockingreader(object): > +def __init__(self, wrapped): > +self._wrapped = wrapped > + > +def __getattr__(self, attr): > +return getattr(self._wrapped, attr) > + > +# issue multiple reads until size is

D7910: rust-re2: add wrapper for calling Re2 from Rust

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19938. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7910?vs=19546=19938 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7910/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7910

D8076: worker: Manually buffer reads from pickle stream

2020-02-06 Thread yuja (Yuya Nishihara)
yuja added a comment. > +if pycompat.ispy3: > + > +class _blockingreader(object): > +def __init__(self, wrapped): > +self._wrapped = wrapped > + > +def __getattr__(self, attr): > +return getattr(self._wrapped, attr) > + > +#

D7867: rust-hg-path: add useful methods to `HgPath`

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19935. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7867?vs=19382=19935 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7867/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7867

D7871: rust-utils: add util for canonical path

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19937. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7871?vs=19359=19937 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7871/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7871

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19934. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7866?vs=19544=19934 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7866/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7866

D7925: rust-matchers: add `IgnoreMatcher`

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19941. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7925?vs=19420=19941 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7925/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7925

D8087: rust-status: rename `StatusResult` to `DirstateStatus`

2020-02-06 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REVISION SUMMARY "Result" has a special meaning in the Rust world, this should be clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D7928: rust-status: add function for sequential traversal of the working directory

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19946. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7928?vs=19417=19946 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7928/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7928

D7931: rust-status: use bare hg status fastpath from Python

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19949. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7931?vs=19423=19949 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7931/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7931

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

2020-02-06 Thread spectral (Kyle Lippincott)
Closed by commit rHG04a3ae7aba14: chg: force-set LC_CTYPE on server start to actual value from the environment (authored by spectral). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7924: rust-matchers: add `build_regex_match` function

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19940. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7924?vs=19419=19940 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7924/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7924

D7929: rust-status: add bare `hg status` support in hg-core

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19947. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7929?vs=19421=19947 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7929/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7929

Re: D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

2020-02-06 Thread Yuya Nishihara
I like the simplicity of this patch. Queued, thanks. > Computing the hash on the client avoids the restart loop, but doesn't avoid > the behavior difference - chg will still call setenv and replace the modified > version with the original one. Indeed.

D7867: rust-hg-path: add useful methods to `HgPath`

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in hg_path.rs:173 > And what happens if you remove it? It only breaks the single rust test I had to check for that particular case. I'll remove it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7927: rust-status: add util for listing a directory

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19942. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7927?vs=19416=19942 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7927/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7927

D8086: rust-status: refactor options into a `StatusOptions` struct

2020-02-06 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8086 AFFECTED FILES rust/hg-core/src/dirstate/status.rs

D7930: rust-status: update rust-cpython bridge to account for the changes in core

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19948. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7930?vs=19422=19948 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7930/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7930

D7929: rust-status: add bare `hg status` support in hg-core

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added inline comments. INLINE COMMENTS > Alphare wrote in status.rs:29-38 > I was fixing conflicts and prefer this style. `rustfmt` does not nest already > separate imports. If that's an issue I suppose I can change it. This is not an issue, but this add noise that distract from the

D8089: py3: __repr__ needs to return str, not bytes

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added a comment. marmoute accepted this revision. looks good. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8089/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8089 To: spectral, #hg-reviewers, marmoute Cc: marmoute, mercurial-devel

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
This revision is now accepted and ready to land. martinvonz added inline comments. martinvonz accepted this revision. INLINE COMMENTS > martinvonz wrote in path_auditor.rs:86 > Well, you already have different errors for `InsideDotHg` and > `IsInsideNestedRepo`, so I think you're good. I was

D8083: archival: use walk() instead of matches() on manifest

2020-02-06 Thread durin42 (Augie Fackler)
Closed by commit rHG2d1b2ad3705b: archival: use walk() instead of matches() on manifest (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D7965: py3: catch AttributeError too with ImportError

2020-02-06 Thread pulkit (Pulkit Goyal)
Closed by commit rHG9a92b29cf930: py3: catch AttributeError too with ImportError (authored by pulkit). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D7867: rust-hg-path: add useful methods to `HgPath`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > hg_path.rs:195 > +pub fn parent() -> { > +let inner = self.as_bytes(); > +HgPath::new(match inner.iter().rposition(|b| *b == b'/') { Might be good to add an `assert!` here in case my assertion (that `HgPath` should never

D7870: rust-utils: add `Escaped` trait

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19958. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7870?vs=19348=19958 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7870/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7870

D7869: rust-dirs-multiset: add `DirsChildrenMultiset`

2020-02-06 Thread Raphaël Gomès
Closed by commit rHG2dca0d76358c: rust-dirs-multiset: add `DirsChildrenMultiset` (authored by Alphare). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D8089: py3: __repr__ needs to return str, not bytes

2020-02-06 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8089 AFFECTED FILES mercurial/bundle2.py mercurial/linelog.py

D7927: rust-status: add util for listing a directory

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added inline comments. INLINE COMMENTS > Alphare wrote in status.rs:74 > I'm not entirely sure I understand your question. If I understand you code correctly you currently do: filenames = listdir() result = [(f, entry(f)) for f in filenames] result.sort() Would it make sense to

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > Alphare wrote in path_auditor.rs:86 > Good idea. I'm rewriting my patches, I will soon send an update for all of > them. Well, you already have different errors for `InsideDotHg` and `IsInsideNestedRepo`, so I think you're good. I was just

D8079: manifest: remove `.new()` from the interface

2020-02-06 Thread durin42 (Augie Fackler)
Closed by commit rHGc86256bd4eb8: manifest: remove `.new()` from the interface (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D7870: rust-utils: add `Escaped` trait

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
This revision now requires changes to proceed. martinvonz added a comment. martinvonz requested changes to this revision. I'm also not sure about the name, but I don't have a better proposal. We can revisit that later when it's clearer how it will be used. INLINE COMMENTS > utils.rs:154-157

D7870: rust-utils: add `Escaped` trait

2020-02-06 Thread Raphaël Gomès
Closed by commit rHGaa0fc32ece9e: rust-utils: add `Escaped` trait (authored by Alphare). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE LAST

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > path_auditor.rs:191 > +auditor.audit_path(path), > +Err(HgPathError::ContainsIllegalComponent(path.to_owned())) > +); This test now fails. I'll fix it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in path_auditor.rs:191 > This test now fails. I'll fix it. Right, sorry! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7866/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7866

D7867: rust-hg-path: add useful methods to `HgPath`

2020-02-06 Thread Raphaël Gomès
Closed by commit rHGe1ba9c5d5e78: rust-hg-path: add useful methods to `HgPath` (authored by Alphare). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D7982: rust-utils: introduce `subslice_index` function

2020-02-06 Thread Raphaël Gomès
Alphare updated this revision to Diff 19959. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7982?vs=19547=19959 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7982/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7982

D8083: archival: use walk() instead of matches() on manifest

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. Oops, I queued this one out of order because I wanted to think more about the previous two patches first, but that made `test-subrepo-deep-nested-change.t` fail. I should have known there was a reason for the order in this series. I'll de-queue this one for now,

D7871: rust-utils: add util for canonical path

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
This revision now requires changes to proceed. martinvonz added inline comments. martinvonz requested changes to this revision. INLINE COMMENTS > files.rs:207-216 > +let name = if !name.is_absolute() { > +root.join().join() > +} else { > +name.to_owned() > +}; > +

mercurial@44246: 4 new changesets (4 on stable)

2020-02-06 Thread Mercurial Commits
4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/238790674d69 changeset: 44243:238790674d69 branch: stable user:Pierre-Yves David date:Tue Feb 04 12:31:19 2020 +0100 summary: config: add a function in `rcutil` to abstract

D8080: context: use manifest.walk() instead of manifest.match() to get file list

2020-02-06 Thread durin42 (Augie Fackler)
Closed by commit rHGbeea86e4d332: context: use manifest.walk() instead of manifest.match() to get file list (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

2020-02-06 Thread Raphaël Gomès
Closed by commit rHGa540e96b9029: rust-pathauditor: add Rust implementation of the `pathauditor` (authored by Alphare). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7870: rust-utils: add `Escaped` trait

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in utils.rs:154-157 > i.e. `self.iter().flat_map(|item| item.escaped_bytes()).collect()`? Sometimes I forget about `flat_map`. Thanks! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7982: rust-utils: introduce `subslice_index` function

2020-02-06 Thread Raphaël Gomès
Alphare added a comment. Alphare abandoned this revision. I was certain to have pruned this one. I'll do it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7982/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7982 To: Alphare, #hg-reviewers,

D8089: py3: __repr__ needs to return str, not bytes

2020-02-06 Thread mharbison72 (Matt Harbison)
mharbison72 added inline comments. INLINE COMMENTS > bundle2.py:1018 > def __repr__(self): > cls = b"%s.%s" % (self.__class__.__module__, self.__class__.__name__) > return b'<%s object at %x; id: %s; type: %s; mandatory: %s>' % ( Aren't `self.__class__.__module__` and

D8078: copies: add a new test dedicated to testing chain of changeset with merge

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D8078#119493 , @marmoute wrote: > oops, this one got out by mistake. But now it's ready for review (seems ready to me)? Thanks for adding these tests. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7962: lfs: fix the stall and corruption issue when concurrently uploading blobs

2020-02-06 Thread mharbison72 (Matt Harbison)
Closed by commit rHG43eea17ae7b3: lfs: fix the stall and corruption issue when concurrently uploading blobs (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7992: clean: delete obsolete unlinking of .hg/graftstate

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHG3245cdea2c63: clean: delete obsolete unlinking of .hg/graftstate (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D7630: absorb: make the absorbed changeset be automatically "evolved"

2020-02-06 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 19982. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7630?vs=19980=19982 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7630/new/ REVISION DETAIL

D8071: copies: avoid filtering by short-circuit dirstate-only copies earlier

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHG30862e226339: copies: avoid filtering by short-circuit dirstate-only copies earlier (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7631: absorb: allowing committed changes to be absorbed into their ancestors

2020-02-06 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 19979. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=19811=19979 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7963: lfs: enable workers by default

2020-02-06 Thread mharbison72 (Matt Harbison)
Closed by commit rHG87167caa2989: lfs: enable workers by default (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE LAST

D8091: py3: fully fix bundlepart.__repr__ to return str not bytes

2020-02-06 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY My previous fix did not fully fix the issue: it would attempt to use %-formatting to combine two strs into a bytes, which won't work. Let's just switch the

D7961: lfs: add a method to the local blobstore to convert OIDs to file paths

2020-02-06 Thread mharbison72 (Matt Harbison)
Closed by commit rHG06de4a673f48: lfs: add a method to the local blobstore to convert OIDs to file paths (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7631: absorb: allowing committed changes to be absorbed into their ancestors

2020-02-06 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 19981. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=19979=19981 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7630: absorb: make the absorbed changeset be automatically "evolved"

2020-02-06 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 19980. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7630?vs=19812=19980 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7630/new/ REVISION DETAIL

D7871: rust-utils: add util for canonical path

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > files.rs:231 > +} > +auditor.audit_path(path_to_hg_path_buf(name)?)?; > +return Ok(name.to_owned()); Related to the comment above, this seems to (generally) return an absolute parent directory

D8070: tests: add test showing that repo filter is calculated for `hg st --copies`

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHG66dab0d9a78e: tests: add test showing that repo filter is calculated for `hg st --copies` (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D8089: py3: __repr__ needs to return str, not bytes

2020-02-06 Thread spectral (Kyle Lippincott)
Closed by commit rHGc443b9ba6f63: py3: __repr__ needs to return str, not bytes (authored by spectral). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES

D8089: py3: __repr__ needs to return str, not bytes

2020-02-06 Thread spectral (Kyle Lippincott)
spectral added inline comments. INLINE COMMENTS > mharbison72 wrote in bundle2.py:1018 > Aren't `self.__class__.__module__` and `self.__class__.__name__` str? Yep, so this instance fails for other reasons as well. Sigh. I've sent a followup (D8091 ). This

D7901: merge: introduce a revert_to() for that use-case

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHGc791ed6a2154: merge: introduce a revert_to() for that use-case (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D7902: merge: introduce a clean_update() for that use-case

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHGf546d2170b0f: merge: introduce a clean_update() for that use-case (authored by martinvonz). martinvonz marked an inline comment as done. This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state

D7871: rust-utils: add util for canonical path

2020-02-06 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in files.rs:207-216 > Might be worth having a fast path for when `name` is not absolute (including > "") and neither `name` nor `cwd` contains "../"so we don't do `let name = > root.join().join()` immediately followed by `let

D7871: rust-utils: add util for canonical path

2020-02-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > Alphare wrote in files.rs:220-222 > I could reword this sentence if you feel that it does not convey the same > meaning. It fits the Python implementation better, that's for sure. To me, the current sentence very much makes it sound like it

D8078: copies: add a new test dedicated to testing chain of changeset with merge

2020-02-06 Thread marmoute (Pierre-Yves David)
marmoute added a comment. Yeah, not it is. I added extra comment and output to review and clarify things. FYI, coming next on this topic is fixing some inconsistency and then fixing then changeset centric behavior. (but do not hold your breath, nodemap has an higher priority)

D8083: archival: use walk() instead of matches() on manifest

2020-02-06 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 19966. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8083?vs=19952=19966 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8083/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8083

D8090: archival: use walk() instead of matches() on manifest

2020-02-06 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY All we care about is the filepaths, so this avoids a pointless copy of the manifest that we only used to extract matching filenames. REPOSITORY rHG Mercurial

D8081: manifest: fix _very_ subtle bug with exact matchers passed to walk()

2020-02-06 Thread durin42 (Augie Fackler)
Closed by commit rHG48a1a974a92c: manifest: fix _very_ subtle bug with exact matchers passed to walk() (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY