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

2019-07-04 Thread yuja (Yuya Nishihara)
yuja added a comment. > impl DirsMultiset { > > /// Initializes the multiset from a dirstate or a manifest. > /// > > @@ -132,6 +123,22 @@ > > Ok(()) > } > > + > +pub fn contains_key(, key: &[u8]) -> bool { > +self.inner.contains_key(key) > +

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

2019-07-04 Thread Yuya Nishihara
> impl DirsMultiset { > /// Initializes the multiset from a dirstate or a manifest. > /// > @@ -132,6 +123,22 @@ > > Ok(()) > } > + > +pub fn contains_key(, key: &[u8]) -> bool { > +self.inner.contains_key(key) > +} > + > +pub fn iter() -> Iter, u32>

Re: [PATCH evolve-ext v2] py3: broad pass for python3 compatibility

2019-07-04 Thread Ludovic Chabant
> > Should opts[x], opts.get(x), etc really use bytes? They usually get passed as > **opts, which means their keys are str, I think. > Sounds OK to me -- there's probably a whole bunch of places that might need to be excluded. It might be worth exploring doing the opposite approach, i.e.

D6588: abort: added support for merge

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15770. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15761=15770 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

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15768. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15756=15768 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6582: abort: added support for histedit

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15769. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15754=15769 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6582 AFFECTED

D6567: abort: added support for graft

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15766. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15751=15766 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 AFFECTED

D6568: abort: added support for rebase

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15767. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15752=15767 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 AFFECTED

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15765. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15764=15765 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15764. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15693=15764 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479

D6606: statecheck: updated docstrings related to afterresolvedstates

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 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/D6606 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

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

2019-07-04 Thread Martin von Zweigbergk via Mercurial-devel
Wow, Phabricator decides to send the email almost two full days after the review was created. Anyone knows what's going on? On Thu, Jul 4, 2019, 09:13 martinvonz (Martin von Zweigbergk) < phabrica...@mercurial-scm.org> wrote: > martinvonz created this revision. > Herald added a subscriber:

D6588: abort: added support for merge

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > test-commit-unresolved.t:48 > +#if abortflag >$ hg merge --abort >abort: no merge in progress `hg abort` can be used. we can case the output here. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6605: unshelve: rename _dounshelve() to dounshelve()

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 3de4f17f4824 . REPOSITORY rHG Mercurial

D6588: abort: added support for merge

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15761. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15760=15761 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

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > test-commit-unresolved.t:1 > +#testcases hgabort abortflag > + `abortcommand` will be better name instead of `hgabort` as that will match the way we named `abortflag` and will be more easier to realise the difference between them. REPOSITORY

D6588: abort: added support for merge

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > test-commit-unresolved.t:45 >[255] > +#endif > + since there are only two cases, you can use `#else` here. > test-commit-unresolved.t:169 > > +#if abortflag >$ hg merge --abort We can put only the command in `if` and `else` part. The

D6588: abort: added support for merge

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15760. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15755=15760 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6594: RFC dirstatemap

2019-07-04 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > dirstate_map.rs:47 > + > +impl Default for DirstateMap { > +fn default() -> Self { Can you just `#[derive(Default)]`? > dirstate_map.rs:95 > +filename: &[u8], > +old_state: u8, > +entry: DirstateEntry, This should

D6553: shelve: move shelve extension to core

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > pulkit wrote in commands.py:6207 > I just noticed that the function `_dounshelve()` still has `_` prefix. We > generally have that to mark if functions are local to that file or class.

D6430: rust-discovery: using from Python code

2019-07-04 Thread marmoute (Pierre-Yves David)
marmoute added a comment. In the couple of last version, we already saved minutes in real life use case simply by improving pure CPU processing time client side. Can you elaborate on what other types of evidences you need to convince you there exist CPU bound case for discovery? REPOSITORY

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. In D6479#96318 , @pulkit wrote: > Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core? Doing that right away! REPOSITORY rHG

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: add interactive mode (issue6162)" to "unshelve: make unshelve accept files (issue6162)". navaneeth.suresh updated this revision to Diff 15757. REPOSITORY rHG Mercurial CHANGES SINCE

D6595: changelog: fix handling of empty copy entries in changeset

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHGe3df1e15bee9: changelog: fix handling of empty copy entries in changeset (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6590: relnotes: document the new --force-close-branch flag

2019-07-04 Thread khanchi97 (Sushil khanchi)
Closed by commit rHG4cafbd3b50c6: relnotes: document the new --force-close-branch flag (authored by khanchi97). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6590?vs=15726=15758

D6579: abort: added support for unshelve

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15756. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15753=15756 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

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15755. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15749=15755 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:990 > To have this patch in a good state to be reviewed, it will be nice you take > out the addition of interactive flag to the patch where you add that >

D6579: abort: added support for unshelve

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15753. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15734=15756 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6566: abort: added logic for of hg abort

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "abort: first prototype of hg abort" to "abort: added logic for of hg abort". taapas1128 updated this revision to Diff 15750. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6568: abort: added support for rebase

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. @pulkit I have updated the descriptions. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 To: taapas1128, martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel

D6582: abort: added support for histedit

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15754. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15735=15754 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL

D6568: abort: added support for rebase

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15752. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15733=15752 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL

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

2019-07-04 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. pulkit added a comment. Can you add link of mailing list thread in your commit message? Link from markmail or

D6567: abort: added support for graft

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "abort: added functionality for graft" to "abort: added support for graft". taapas1128 updated this revision to Diff 15751. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6588: abort: added support for merge

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15749. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15706=15755 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6551: statecheck: added support for cmdutil.afterresolvedstates

2019-07-04 Thread av6 (Anton Shestakov)
av6 added inline comments. INLINE COMMENTS > cmdutil.py:3303 > > afterresolvedstates tuples define a .hg/{file} and the corresponding > command needed to finish it. Now that afterresolvedstates has been removed, you need to update this docstring. > cmdutil.py:3322 > > If

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

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Can you add link of mailing list thread in your commit message? Link from markmail or https://www.mercurial-scm.org/pipermail/mercurial-devel/. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6597/new/ REVISION DETAIL

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL

D6588: abort: added support for merge

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > hg.py:964 > +ui = repo.ui > +stats = abortmerge(ui, repo, labels=labels, asflag=True) > we can directly pass repo.ui here. No need to have a ui variable > hg.py:964 > +ui = repo.ui > +stats = abortmerge(ui, repo,

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > navaneeth.suresh wrote in shelve.py:990 > will fix this in the next-to-next revision. To have this patch in a good state to be reviewed, it will be nice you take out the addition of interactive flag to the patch where you add that functionality.

D6579: abort: added support for unshelve

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > shelve.py:630 > +if not state: > +try: > +state = shelvedstate.load(repo) Let's take this code out into a new function and reuse that function at both the places instead of duplicating code. REPOSITORY rHG Mercurial

D6553: shelve: move shelve extension to core

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > commands.py:6207 > +with repo.wlock(): > +return shelvemod._dounshelve(ui, repo, *shelved, **opts) > + I just noticed that the function `_dounshelve()` still has `_` prefix. We generally have that to mark if functions are local to

D6582: abort: added support for histedit

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > histedit.py:1891 > +if not state: > +state = histeditstate(repo) > +with repo.wlock(), repo.lock(): you need to set locks for the state too. Refer line 1685 in this file. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6568: abort: added support for rebase

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Since we both are discussing and working on this, we can understand why this patch does what it does. It will be nice to have more explained commit descriptions which explain why we need to have an function independent of rebase-runtime-state object. This applies to

D6567: abort: added support for graft

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > taapas1128 wrote in commands.py:2738 > @pulkit the wlock is activated later in `graft --abort` during cleanup. That > is same in the case of `hg abort` `_dograft()` is called after taking the lock. `_abortgraft` before taking the lock does a lot

D6566: abort: added logic for of hg abort

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > commands.py:166 > + > +if nobackup: > +arglist = inspect.getargspec(abortstate.abortfunc)[0] Arguments for abort can increase in future. Rather pass the opts directly to abort functions for now and make related functions look for flag

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As in the previous patch, consider these two histories: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1

D6430: rust-discovery: using from Python code

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D6430#96225 , @marmoute wrote: > The ×2.5 speedup is the kind of things that motivate this series. Even if the mozilla-unified/mozilla-try is just and example it triggers the kind of pathological case we

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D6602 AFFECTED FILES mercurial/copies.py CHANGE DETAILS diff --git a/mercurial/copies.py

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We had a test where the destination of a copy was removed and then added back. This patch adds similar cases where the break in history instead happens to

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I want to split up _chainandfilter() more so the call to _filter() consistently happens at the end of pathcopies(). This prepares for that change.

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'd like to move the filtering of copies we do after chaining to the end of all chaining (in a single place in pathcopies()). One problem that came up when

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15739. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15738=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION

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

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I've realized only recently how many cases there are where a file is treated differently if it's considered "related" to another file (not deleted and

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. navaneeth.suresh updated this revision to Diff 15738. pulkit added a comment. navaneeth.suresh updated this revision to Diff 15739. navaneeth.suresh marked an inline comment

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 15738. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15737=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

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

2019-07-04 Thread Raphaël Gomès
Alphare updated this revision to Diff 15740. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6593?vs=15729=15740 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6593/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6593 AFFECTED FILES

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:990 > The interactive flag should work the same way as it work for revert, commit > and shelve commands. That's either ask hunk by hunk or pop up a curses UI. > > As you suggested before, maybe we can have `-f`

D6596: unshelve: make unshelve accept files (issue6162)

2019-07-04 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Didn't look at the actual implementation yet. INLINE COMMENTS > shelve.py:990 > +filesinclude = [] > +if interactive: > +for file in files: The interactive flag should work the same way as it work for revert, commit and shelve commands.

D6566: abort: added logic for of hg abort

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15731. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15646=15750 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6566 AFFECTED

D6579: abort: added support for unshelve

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15734. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15666=15756 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6430: rust-discovery: using from Python code

2019-07-04 Thread marmoute (Pierre-Yves David)
marmoute added a comment. The ×2.5 speedup is the kind of things that motivate this series. Even if the mozilla-unified/mozilla-try is just and example it triggers the kind of pathological case we encounter in real life: large undecided set. We keep finding such pathological case from time

D6594: RFC dirstatemap

2019-07-04 Thread Raphaël Gomès
Alphare added a comment. If that helps, I just wrote an article on sharing references between Rust and Python: https://raphaelgomes.dev/blog/articles/2019-07-01-sharing-references-between-python-and-rust.html. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6595: changelog: fix handling of empty copy entries in changeset

2019-07-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. pulkit accepted this revision. This revision is now accepted and ready to land. REVISION SUMMARY Before this patch, when an empty value was found in the changeset, we would get

D6579: abort: added support for unshelve

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. I have rebased it. 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: pulkit, mercurial-devel

D6567: abort: added support for graft

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:2738 > Directly calling `_abortgraft` is not safe. `graft --abort` takes wlock first > and then calls it. We skipped taking the lock in case of `hg abort`. @pulkit the wlock is activated later in `graft --abort`

D6582: abort: added support for histedit

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15735. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15686=15754 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6582 AFFECTED

D6567: abort: added support for graft

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15732. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15647=15751 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 AFFECTED

D6568: abort: added support for rebase

2019-07-04 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 15733. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15648=15752 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 AFFECTED

D6591: rust-minor-fixes: run rfmt on all hg-core/hg-cpython code

2019-07-04 Thread Raphaël Gomès
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/D6591 AFFECTED FILES rust/hg-core/src/dirstate/dirs_multiset.rs

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

2019-07-04 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. Alphare updated this revision to Diff 15740. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6593 AFFECTED FILES

D6592: rust-minor-fixes: simplify overly complicated expression

2019-07-04 Thread Raphaël Gomès
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/D6592 AFFECTED FILES rust/hg-cpython/src/dirstate.rs CHANGE DETAILS diff --git

D6394: rust-dirstate: add "dirs" rust-cpython binding

2019-07-04 Thread Raphaël Gomès
Alphare added a comment. In D6394#96189 , @yuja wrote: >> To my eyes, the point of `Deref` is to make the `struct` act as a "fat pointer" from the outer interface code, but maybe this does not really help that much? > > I feel

D6394: rust-dirstate: add "dirs" rust-cpython binding

2019-07-04 Thread yuja (Yuya Nishihara)
yuja added a comment. > To my eyes, the point of `Deref` is to make the `struct` act as a "fat pointer" from the outer interface code, but maybe this does not really help that much? I feel DirsMultiset isn't a HashMap, but is implemented by using a HashMap. For example,