D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added inline comments. INLINE COMMENTS > JordiGH wrote in localrepo.py:2658 > Not all merges can be detected by checking for p2 being non-null; p1 being > null but p2 being non-null is perfectly acceptable everywhere else, although > normally hg won't produce commits like

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. In D6613#96908 , @mharbison72 wrote: > In D6613#96822 , @valentin.gatienbaron wrote: > >> Ok. Maybe it would be simpler or more robust to do the direct

Re: [PATCH 1 of 2] rust-dirstate: add helper to iterate ancestor paths

On Wed, 10 Jul 2019 07:36:26 -0700, Martin von Zweigbergk wrote: > On Sun, Jun 30, 2019, 04:17 Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1561887163 -32400 > > # Sun Jun 30 18:32:43 2019 +0900 > > # Node ID 72ab74c704053b2212b874a902574fedadad4252

[PATCH V2] rust-dirstate: leverage find_dirs() iterator in DirsMultiset

# HG changeset patch # User Yuya Nishihara # Date 1561887644 -32400 # Sun Jun 30 18:40:44 2019 +0900 # Node ID 7bf692513e86d829ab4d0a7e37c503767eeeb2f9 # Parent 3bc400ccbf996fac16ef2b608f6c47552eaf6c56 rust-dirstate: leverage find_dirs() iterator in DirsMultiset diff --git

D6613: commit: improve the files field of changelog for merges (RFC)

JordiGH added inline comments. INLINE COMMENTS > localrepo.py:2658 > del m[f] > +if p2.rev() != nullrev: > +@util.cachefunc Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being non-null is

D6611: blackbox: disable extremely verbose logging (issue6110)

valentin.gatienbaron added inline comments. valentin.gatienbaron marked an inline comment as done. INLINE COMMENTS > durin42 wrote in blackbox.py:97 > Let's make this configurable, and this is the default. Maybe blackbox.ignore, > with a default of the things you've specified? I made the

D6611: blackbox: disable extremely verbose logging (issue6110)

valentin.gatienbaron updated this revision to Diff 15887. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6611?vs=15787=15887 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6611/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6611

D6638: abort: removed labels argument from abortmerge()

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Labels are used to label the code that belongs to `working copy` and `merge rev` in case of a conflicted state. However when merge is aborted there is no

D6588: abort: added support for merge

Closed by commit rHG3bc400ccbf99: abort: added support for merge (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6588?vs=15880=15883#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6579: abort: added support for unshelve

Closed by commit rHG3fb0493812c0: abort: added support for unshelve (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15866=15882 CHANGES SINCE LAST

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

Closed by commit rHG8ddfdcce4bd6: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15880. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15879=15880 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6588: abort: added support for merge

This revision is now accepted and ready to land. pulkit added inline comments. pulkit accepted this revision. INLINE COMMENTS > pulkit wrote in hg.py:987 > Here the user is already running `hg merge --abort`, so we should not show > this message. > > Ideally, this `if` condition should not

D6625: rust-cargo: reorder dependencies

Alphare added a comment. Alphare abandoned this revision. In D6625#96944 , @durin42 wrote: > Why? Before it was sorted, and now it's not. You're right, that makes no sense. I must have missed something during splitting. Sorry for the

D6588: abort: added support for merge

pulkit added inline comments. INLINE COMMENTS > hg.py:987 > +if stats.unresolvedcount: > +repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " > + "or 'hg merge --abort' to abandon\n")) Here the user is already running `hg merge --abort`, so

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15879. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15867=15879 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6588: abort: added support for merge

This revision now requires changes to proceed. pulkit added inline comments. pulkit requested changes to this revision. INLINE COMMENTS > pulkit wrote in hg.py:985 > We lost `return stats.unresolvedcount > 0` in this code movement. This is not yet addressed. REPOSITORY rHG Mercurial CHANGES

D6548: mq: fix for merge detection methods

Closed by commit rHG51e52a495214: mq: fix for merge detection methods (authored by taapas1128). 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

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 added a comment. Fixed the message. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6636/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6636 To: taapas1128, #hg-reviewers, pulkit Cc: mercurial-devel

D6572: subrepos: make last line of prompts <40 english chars (issue6158)

Closed by commit rHGf6540aba8e3e: subrepos: make last line of prompts 40 english chars (issue6158) (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

D6603: copies: filter invalid copies only at end of pathcopies() (issue6163)

Closed by commit rHGd013099c551b: copies: filter invalid copies only at end of pathcopies() (issue6163) (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".

D6623: py3: store _origdoc as str

Closed by commit rHG83666f011679: py3: store _origdoc as str (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 CHANGES SINCE LAST

D6604: copies: follow copies across merge base without source file (issue6163)

Closed by commit rHG819712deac69: copies: follow copies across merge base without source file (issue6163) (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".

D6602: copies: inline _chainandfilter() to prepare for next patch

Closed by commit rHG11ceb1b8fd74: copies: inline _chainandfilter() to prepare for next patch (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

D6601: copies: remove most early returns from pathcopies() and _forwardcopies()

Closed by commit rHGa48f6f18dc6d: copies: remove most early returns from pathcopies() and _forwardcopies() (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".

D6571: largefiles: make last line of prompts <40 english chars (issue6158)

Closed by commit rHG421fdf30c37c: largefiles: make last line of prompts 40 english chars (issue6158) (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

D6600: copies: move short-circuiting of dirstate copies out of _forwardcopies()

Closed by commit rHGbcb4b5c5964b: copies: move short-circuiting of dirstate copies out of _forwardcopies() (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".

D6599: tests: add more tests of copy tracing with removed and re-added files

Closed by commit rHGab416b5d9b91: tests: add more tests of copy tracing with removed and re-added files (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". CHANGED

D6598: tests: split out tests for unrelated copy source/target into separate file

Closed by commit rHG67bf11597eb8: tests: split out tests for unrelated copy source/target into separate file (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".

D6611: blackbox: disable extremely verbose logging (issue6110)

durin42 added inline comments. INLINE COMMENTS > blackbox.py:97 > self._trackedevents = set(ui.configlist('blackbox', 'track')) > +self._untrackedevents = {'chgserver', 'cmdserver', 'extension'} > self._maxfiles = ui.configint('blackbox', 'maxfiles') Let's make this

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15867. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15864=15867 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15866. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15863=15866 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15865. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6636?vs=15856=15865 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6636/new/ REVISION DETAIL

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15864. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15858=15864 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15863. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15861=15863 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6637: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the message type of Corruptedstate error in case of `hg unshelve --abort` to error.Abort from warning message. This is done so as to avoid the

D6573: prompt: add develwarn about last line of prompt >45 chars (issue6158)

durin42 added a comment. Per your note that this will probably make other localizations sad, let's just give up on this for now? Sigh. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6573/new/ REVISION DETAIL

D6625: rust-cargo: reorder dependencies

durin42 added a comment. Why? Before it was sorted, and now it's not. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6625/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6625 To: Alphare, #hg-reviewers Cc: durin42, mercurial-devel

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15861. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15860=15861 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6579: abort: added support for unshelve

pulkit added inline comments. INLINE COMMENTS > shelve.py:648 > +'please update to some commit\n')) > +return (state, opts) > + we can prevent returning opts here. One user does not need it and other one is passing by reference. REPOSITORY rHG Mercurial

D6579: abort: added support for unshelve

taapas1128 added a comment. updated that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 To: taapas1128, #hg-reviewers Cc: mharbison72, pulkit, mercurial-devel

D6579: abort: added support for unshelve

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15860. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15859=15860 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6579: abort: added support for unshelve

pulkit added a comment. The commit message is outdated. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 To: taapas1128, #hg-reviewers Cc: mharbison72, pulkit, mercurial-devel

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

pulkit added a comment. > This is fone so as to avoid the return statement s/fone/done in flight INLINE COMMENTS > shelve.py:884 > shelvedstate.clear(repo) > -return > +raise error.Abort(_('could not read shelved state file, your > ' > +

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15859. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15857=15859 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15858. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15835=15858 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 marked 5 inline comments as done. taapas1128 updated this revision to Diff 15857. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15833=15857 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the message type of Corruptedstate error in case of `hg unshelve --abort` to error.Abort from warning message. This is fone so as to avoid the

[Bug 6170] New: error: pretxnchangegroup.access hook raised an exception: 'derivedrepo:/var/lib/mercurial-server/repos/util

https://bz.mercurial-scm.org/show_bug.cgi?id=6170 Bug ID: 6170 Summary: error: pretxnchangegroup.access hook raised an exception: 'derivedrepo:/var/lib/mercurial-server/repos/utilhttps://mercurial-scm.org/wiki/BugTracker remote: **

D6588: abort: added support for merge

pulkit added inline comments. INLINE COMMENTS > hg.py:985 > +labels=labels) > +_showstats(repo, stats) > + We lost `return stats.unresolvedcount > 0` in this code movement. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6579: abort: added support for unshelve

pulkit added inline comments. INLINE COMMENTS > shelve.py:628 > > -def unshelveabort(ui, repo, state, opts): > +def _loadshelvedstate(ui, repo, continuef=False, abortf=False, **opts): > +try: continuef and abortf can be read from opts, no need to pass them separately. Also, `opts` should

D6613: commit: improve the files field of changelog for merges (RFC)

mharbison72 added a comment. mharbison72 added a subscriber: yuja. In D6613#96822 , @valentin.gatienbaron wrote: > Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as

D6623: py3: store _origdoc as str

martinvonz updated this revision to Diff 15855. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6623?vs=15827=15855 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6623/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6623 AFFECTED

D6623: py3: store _origdoc as str

martinvonz added inline comments. INLINE COMMENTS > show.py:463 > for key in sorted(showview._table.keys()): > -entries.append(pycompat.sysstr('%s %s' % ( > -key.ljust(longest), showview._table[key]._origdoc))) > +entries.append(pycompat.sysstr('%s

D6594: RFC dirstatemap

Alphare added a comment. I have updated and split this RFC into a new series (https://phab.mercurial-scm.org/D6625, see the Stack tab). This differential can be considered outdated. @kevincox: I will try my best to take into account the comments you've already left here after the new

D6635: rust-utils: add docstrings and doctests for utils.rs

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6635 AFFECTED FILES rust/hg-core/src/lib.rs rust/hg-core/src/utils.rs CHANGE

D6594: RFC dirstatemap

kevincox added a comment. In D6594#96518 , @yuja wrote: > Yes, so we'll probably want to minimize the data exchanged between Rust > and Python. This means we'll eventually move more logic to Rust side, which > hopefully reduce the number of

D6593: rust-minor-fixes: remove Deref in favor of explicit methods

kevincox added inline comments. INLINE COMMENTS > dirs_multiset.rs:131 > + > +pub fn iter() -> Iter, u32> { > +self.inner.iter() Returning a `std::collections::hash_map::Iter` binds you to this implementation. I would recommend instead returning `impl Iterator`. REPOSITORY rHG

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

Alphare edited the summary of this revision. Alphare updated this revision to Diff 15853. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6597?vs=15741=15853 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6597/new/ REVISION DETAIL

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

Alphare added inline comments. INLINE COMMENTS > kevincox wrote in utils.rs:3 > This could really use a doc comment. I'll address those points in a separate (parent) changeset. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6597/new/ REVISION DETAIL

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

Alphare added a comment. In D6597#96317 , @pulkit wrote: > Can you add link of mailing list thread in your commit message? Link from markmail or https://www.mercurial-scm.org/pipermail/mercurial-devel/. Sure, will amend. REPOSITORY rHG

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

Alphare added a comment. In D6597#96881 , @kevincox wrote: > Is the SliceExt change related to the 2018 change? If not could you split the two? It is indeed related to 2018: `mod.rs` files are not needed anymore and this makes it both

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

kevincox added a comment. kevincox accepted this revision. Is the SliceExt change related to the 2018 change? If not could you split the two? INLINE COMMENTS > utils.rs:3 > + > +pub fn replace_slice(buf: [T], from: &[T], to: &[T]) > +where This could really use a doc comment. >

Re: [PATCH 1 of 2] rust-dirstate: add helper to iterate ancestor paths

On Sun, Jun 30, 2019, 04:17 Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1561887163 -32400 > # Sun Jun 30 18:32:43 2019 +0900 > # Node ID 72ab74c704053b2212b874a902574fedadad4252 > # Parent 904e0da2e195d2a29977ceccdd25480233c34d7a > rust-dirstate: add

D6634: rust-dirstate: call rust dirstatemap from Python

Alphare created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since Rust-backed Python classes cannot be used as baseclasses (for rust-cpython anyway), we use composition rather than inheritance. This also allows us to

D6633: rust-dirstate: rust-cpython bridge for dirstatemap

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This change also showcases the limitations of the `py_shared_ref!` macro. See the previous commit 'rust-dirstate: rust implementation of

D6632: rust-dirstate: rust implementation of dirstatemap

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The `dirstatemap` is one of the last building blocks needed to get to a `dirstate.walk` Rust implementation. Disclaimer: This change is

Re: [PATCH 1 of 2] rust-dirstate: add helper to iterate ancestor paths

On Sun, Jun 30, 2019 at 2:16 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1561887163 -32400 > # Sun Jun 30 18:32:43 2019 +0900 > # Node ID 72ab74c704053b2212b874a902574fedadad4252 > # Parent 904e0da2e195d2a29977ceccdd25480233c34d7a > rust-dirstate: add

D6566: abort: added logic for of hg abort

Closed by commit rHGbb135a784b70: abort: added logic for of hg abort (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15836=15845 CHANGES SINCE LAST

D6567: abort: added support for graft

Closed by commit rHG5171937ad0f9: abort: added support for graft (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15831=15846 CHANGES SINCE LAST

D6582: abort: added support for histedit

Closed by commit rHGdb5560c07a28: abort: added support for histedit (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6582?vs=15834=15848#toc REPOSITORY rHG Mercurial CHANGES SINCE

D6624: tests: update test-commit-interactive.t for no-execbit platforms

Closed by commit rHGebf353aa4385: tests: update test-commit-interactive.t for no-execbit platforms (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6568: abort: added support for rebase

Closed by commit rHGb9bc47211cf5: abort: added support for rebase (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6568?vs=15832=15847#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6582: abort: added support for histedit

This revision is now accepted and ready to land. pulkit added inline comments. pulkit accepted this revision. INLINE COMMENTS > test-histedit-no-backup.t:63 > Enable config option: > + >$ cat >>$HGRCPATH

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input and reuse them blindly in the resulting commit, when doing a hg->hg conversion without filemap. (btw, a tweak to

D6631: rust-cpython: add macro for sharing references

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Following an experiment done by Georges Racinet, we now have a working way of sharing references between Python and Rust. This is needed in many

D6628: rust-parsers: switch to parse/pack_dirstate to mutate-on-loop

Alphare created this revision. Herald added subscribers: mercurial-devel, mjpieters, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Both `parse_dirstate` and `pack_dirstate` can operate directly on the data they're passed, which prevents the creation of

D6629: rust-dirstate: use EntryState enum instead of literals

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This improves code readability quite a bit, while also adding a layer of safety because we're checking the state byte against the enum.

D6630: rust-docstrings: add missing module docstrings

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6630 AFFECTED FILES rust/hg-core/src/filepatterns.rs

D6627: rust-parsers: move parser bindings to their own file and Python module

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This tidies up the Rust side while simplifying the Python side. REPOSITORY rHG Mercurial REVISION DETAIL

D6626: rust-dirstate: create dirstate submodule in hg-cpython

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This module will soon hold multiple files, this change is to make the review process easier. REPOSITORY rHG Mercurial REVISION DETAIL

D6625: rust-cargo: reorder dependencies

Alphare created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6625 AFFECTED FILES rust/Cargo.lock rust/hg-core/Cargo.toml CHANGE DETAILS diff --git