D623: copytrace: move fast heuristic copytracing algorithm to core

2017-09-14 Thread yuja (Yuya Nishihara)
yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Queued, thanks. > I don't think we can just swap c1 and c2 because what we're calculating > is the copy from c1 to c2, For the record, this statement appears to be wrong, sorry.

D623: copytrace: move fast heuristic copytracing algorithm to core

2017-09-14 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa8d139c37353: copytrace: move fast heuristic copytracing algorithm to core (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D623?vs=1791=1815#toc REPOSITORY

Re: [PATCH 1 of 4] configitems: register the 'mq.git' config

2017-09-14 Thread Yuya Nishihara
On Wed, 13 Sep 2017 08:31:12 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498786994 -7200 > # ven. juin 30 03:43:14 2017 +0200 > # Node ID ea821914bb23ec4365dbd92ca1ef4d25c4e28fb2 > # Parent 24bf823377fcbf49fec9da8adb796924dff91c73 >

Re: [PATCH V2] configitems: register the 'win32mbcs.encoding' config

2017-09-14 Thread Yuya Nishihara
On Wed, 13 Sep 2017 12:30:54 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498787154 -7200 > # ven. juin 30 03:45:54 2017 +0200 > # Node ID 5fb90f89802ce9428913ef67df6a96d66e218d51 > # Parent a763c891f36e55f4869f443c220227d1da747d18 >

[PATCH 1 of 4 evolve-ext] doc: make paragraphs before example code end with "::" for reST syntax

2017-09-14 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1502115897 -32400 # Mon Aug 07 23:24:57 2017 +0900 # Node ID 36c09de6c9765c41393c92298b0455b9491b91dc # Parent 23c9600607e7ea3c6d95cddc5ad134cab4f7d7fe # Available At https://fo...@bitbucket.org/foozy/hgext-evolve

[PATCH 3 of 4 evolve-ext] evolve: use registrar.revsetpredicate to register revset predicate functions

2017-09-14 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1505041612 -32400 # Sun Sep 10 20:06:52 2017 +0900 # Node ID dea894973e8faddafe06cc53fbfe6a4f109c3143 # Parent c89a40ef1e93c733a8ecd2a88efd83c72e5c6ac9 # Available At https://fo...@bitbucket.org/foozy/hgext-evolve

[PATCH 4 of 4 evolve-ext] evolve: use registrar.templatekeyword to register template keyword functions

2017-09-14 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1502115761 -32400 # Mon Aug 07 23:22:41 2017 +0900 # Node ID d24bf49080b751520b734482936566da7421de12 # Parent dea894973e8faddafe06cc53fbfe6a4f109c3143 # Available At https://fo...@bitbucket.org/foozy/hgext-evolve

[PATCH 2 of 4 evolve-ext] topic: use registrar.revsetpredicate to register revset predicate functions

2017-09-14 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1502115433 -32400 # Mon Aug 07 23:17:13 2017 +0900 # Node ID c89a40ef1e93c733a8ecd2a88efd83c72e5c6ac9 # Parent 36c09de6c9765c41393c92298b0455b9491b91dc # Available At https://fo...@bitbucket.org/foozy/hgext-evolve

[PATCH evolve-ext] topic: centralize compatibility logic between hg versions into compat module

2017-09-14 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1505050914 -32400 # Sun Sep 10 22:41:54 2017 +0900 # Node ID 3412cce8dbb22a937e72939a5d726c0949715983 # Parent 23c9600607e7ea3c6d95cddc5ad134cab4f7d7fe # Available At https://fo...@bitbucket.org/foozy/hgext-evolve

D705: bundle2: move exception handling into part iterator

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > bundle2.py:368 > +def __exit__(self, type, exc, tb): > if not self.iterator: > return Doesn't look like this can actually happen (if used properly in a with-statement) > bundle2.py:402 > +if seekerror: >

D663: dirstate: perform transactions with _map using single call, where possible

2017-09-14 Thread mbolin (Michael Bolin)
mbolin added inline comments. INLINE COMMENTS > yuja wrote in dirstate.py:554 > test-add.t fails here. It was `self[d]`, not `self._map[d]`. My bad: fixed without bringing the extra lookup back. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D663 To: mbolin,

D663: dirstate: perform transactions with _map using single call, where possible

2017-09-14 Thread mbolin (Michael Bolin)
mbolin updated this revision to Diff 1817. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D663?vs=1687=1817 REVISION DETAIL https://phab.mercurial-scm.org/D663 AFFECTED FILES mercurial/dirstate.py CHANGE DETAILS diff --git a/mercurial/dirstate.py

D674: filemerge: use arbitraryfilectx for backup files

2017-09-14 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1830. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D674?vs=1724=1830 REVISION DETAIL https://phab.mercurial-scm.org/D674 AFFECTED FILES mercurial/context.py mercurial/filemerge.py CHANGE DETAILS diff --git

D682: merge: allow a custom working context to be passed to update

2017-09-14 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1831. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D682?vs=1726=1831 REVISION DETAIL https://phab.mercurial-scm.org/D682 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 1833. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D715?vs=1829=1833 REVISION DETAIL https://phab.mercurial-scm.org/D715 AFFECTED FILES mercurial/changegroup.py

D714: tests: add test for issue5678

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 1832. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D714?vs=1828=1832 REVISION DETAIL https://phab.mercurial-scm.org/D714 AFFECTED FILES

Re: [PATCH 4 of 4 evolve-ext] evolve: use registrar.templatekeyword to register template keyword functions

2017-09-14 Thread Boris Feld
Thank you for your patches, they have been accepted. On Fri, 2017-09-15 at 01:33 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1502115761 -32400 > #  Mon Aug 07 23:22:41 2017 +0900 > # Node ID

D706: bundle2: move processpart stream maintenance into part iterator

2017-09-14 Thread durham (Durham Goode)
durham updated this revision to Diff 1818. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D706?vs=1802=1818 REVISION DETAIL https://phab.mercurial-scm.org/D706 AFFECTED FILES mercurial/bundle2.py CHANGE DETAILS diff --git a/mercurial/bundle2.py

D707: bundle2: move handler validation out of processpart

2017-09-14 Thread durham (Durham Goode)
durham updated this revision to Diff 1819. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D707?vs=1803=1819 REVISION DETAIL https://phab.mercurial-scm.org/D707 AFFECTED FILES mercurial/bundle2.py CHANGE DETAILS diff --git a/mercurial/bundle2.py

D708: bundle2: remove unnecessary try finally

2017-09-14 Thread durham (Durham Goode)
durham updated this revision to Diff 1820. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D708?vs=1804=1820 REVISION DETAIL https://phab.mercurial-scm.org/D708 AFFECTED FILES mercurial/bundle2.py CHANGE DETAILS diff --git a/mercurial/bundle2.py

D529: uncommit: move fb-extension to core which uncommits a changeset

2017-09-14 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 1823. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D529?vs=1729=1823 REVISION DETAIL https://phab.mercurial-scm.org/D529 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS diff --git

D714: tests: add test for issue5678

2017-09-14 Thread quark (Jun Wu)
quark accepted this revision. quark added inline comments. INLINE COMMENTS > test-rebase-scenario-global.t:392 > + $ hg phase --public > + $ hg log -G -T '{node|shortest} {phase} {desc}\n' > + @ d36c public c Maybe add `{rev}` so the following `hg rebase -s 1 -d 2` becomes easier to read.

D714: tests: add test for issue5678

2017-09-14 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/D714 AFFECTED FILES tests/test-rebase-scenario-global.t CHANGE DETAILS diff --git

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It seems like we used to pick the oldest possible version of the changegroup to use for bundles created by the repair module (used e.g. by "hg strip" and for

[Bug 5679] New: subscription model for phabricator emails

2017-09-14 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5679 Bug ID: 5679 Summary: subscription model for phabricator emails Product: Mercurial Version: unspecified Hardware: PC OS: Windows Status: UNCONFIRMED

Re: [PATCH evolve-ext] topic: centralize compatibility logic between hg versions into compat module

2017-09-14 Thread Boris Feld
Thank you for your patch, they have been accepted. On Fri, 2017-09-15 at 00:31 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1505050914 -32400 > #  Sun Sep 10 22:41:54 2017 +0900 > # Node ID

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread indygreg (Gregory Szorc)
indygreg accepted this revision as: indygreg. indygreg added a comment. This seems reasonable to me. I'm not sure it is appropriate for stable though. The temporary bundles should definitely use the latest available version. But changing the backup bundles (which are persisted after the

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D715#11879, @indygreg wrote: > This seems reasonable to me. I'm not sure it is appropriate for stable though. > > The temporary bundles should definitely use the latest available version. But changing the backup bundles

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 1829. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D715?vs=1827=1829 REVISION DETAIL https://phab.mercurial-scm.org/D715 AFFECTED FILES mercurial/changegroup.py mercurial/repair.py

D714: tests: add test for issue5678

2017-09-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 1828. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D714?vs=1826=1828 REVISION DETAIL https://phab.mercurial-scm.org/D714 AFFECTED FILES tests/test-rebase-scenario-global.t CHANGE DETAILS diff --git

D715: repair: preserve phase also when not using generaldelta (issue5678)

2017-09-14 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. I have been thinking about moving `repo._phasecache.filterunknown(repo)` around, or adding some `if` conditions to skip that for bundles without phases. But that is less cleaner - ex. we also need to revert

D696: registrar: add a enum 'cmdtype' for the type of the command

2017-09-14 Thread durham (Durham Goode)
durham accepted this revision. durham added a comment. I think the name could be better, but that can be bikeshed. Stamping my approval for the concept and pattern. INLINE COMMENTS > registrar.py:148 > > +class cmdtype(object): > +""" enum for the type of command which will tell