D1581: rust: implementation of `hg`

2017-12-07 Thread indygreg (Gregory Szorc)
indygreg marked 6 inline comments as done. indygreg added a comment. I removed the standalone distribution code and cleaned things up a bit. Over 97% of the tests pass with the Rust `hg` on Linux. And the failures seem reasonable. There's a bit of work to be done around packaging, Wi

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco added a comment. OK, kept it in and passing to `man.setflag()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1238 To: phillco, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercu

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4249. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4235&id=4249 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1617: rebase: extract _assignworkingcopy

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4248. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1617?vs=4243&id=4248 REVISION DETAIL https://phab.mercurial-scm.org/D1617 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4245. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4239&id=4245 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git a/me

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4246. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4240&id=4246 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1581: rust: implementation of `hg`

2017-12-07 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 4244. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1581?vs=4241&id=4244 REVISION DETAIL https://phab.mercurial-scm.org/D1581 AFFECTED FILES .hgignore rust/.cargo/config rust/Cargo.lock rust/Cargo.toml r

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4247. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1616?vs=4242&id=4247 REVISION DETAIL https://phab.mercurial-scm.org/D1616 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1617: rebase: extract _assignworkingcopy

2017-12-07 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Slightly cleaner, and makes it easier to hook this in an extension. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1617 AFFECTED FIL

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-07 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As described in the comment, rebasing the working copy parent with in-memory merge, and then updating to the new commit, isn't much faster because of the extra o

D1581: rust: implementation of `hg`

2017-12-07 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 4241. indygreg edited the summary of this revision. indygreg retitled this revision from "[RFC] rust: Rust implementation of `hg` and standalone packaging" to "rust: implementation of `hg`". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://pha

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4240. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4238&id=4240 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4239. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4237&id=4239 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git a/me

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4238. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4214&id=4238 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4236. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4217&id=4236 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4232. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1240?vs=4205&id=4232 REVISION DETAIL https://phab.mercurial-scm.org/D1240 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4230. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=4203&id=4230 REVISION DETAIL https://phab.mercurial-scm.org/D1238 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4237. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4213&id=4237 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git a/me

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4235. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4216&id=4235 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1239: overlayworkingctx: add a no-op ``clearunknown()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4231. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=4204&id=4231 REVISION DETAIL https://phab.mercurial-scm.org/D1239 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4234. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4215&id=4234 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1241: overlayworkingctx: add _auditconflicts to write()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4233. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=4206&id=4233 REVISION DETAIL https://phab.mercurial-scm.org/D1241 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > phillco wrote in context.py:2022 > Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM. *but let me confirm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1238 To: phillco, #hg-reviewers, du

[PATCH 3 of 4] lfs: override walk() in lfsvfs

2017-12-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1512708246 18000 # Thu Dec 07 23:44:06 2017 -0500 # Node ID a6d7005a5cb25a88c37ee3813eaee569b037f2f3 # Parent bde45ffbd15011a829c4bf4b29c864ed864ccab6 lfs: override walk() in lfsvfs In order to fix the missing lfs store after an upgrade, I at

[PATCH 2 of 4] lfs: preserve the 'lfs' requirement across repository upgrades

2017-12-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1512704191 18000 # Thu Dec 07 22:36:31 2017 -0500 # Node ID bde45ffbd15011a829c4bf4b29c864ed864ccab6 # Parent e82fc66d706633cdf7344f682dcc223d16e01c72 lfs: preserve the 'lfs' requirement across repository upgrades This is the same treatment t

[PATCH 4 of 4] lfs: restore the local blob store after a repo upgrade

2017-12-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1512710310 18000 # Fri Dec 08 00:18:30 2017 -0500 # Node ID 20b6661fd23e85200880be4b7a823f71552ad74e # Parent a6d7005a5cb25a88c37ee3813eaee569b037f2f3 lfs: restore the local blob store after a repo upgrade I didn't try tracking down why, but

[PATCH 1 of 4] test-upgrade-repo: glob away a timing value

2017-12-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1512704119 18000 # Thu Dec 07 22:35:19 2017 -0500 # Node ID e82fc66d706633cdf7344f682dcc223d16e01c72 # Parent 483b5dd0f1aa412e9611ab694279c9d3735fee99 test-upgrade-repo: glob away a timing value diff --git a/tests/test-upgrade-repo.t b/tests/

D1606: phases: drop the list with phase of each rev, always comput phase sets

2017-12-07 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. I think this is good enough. We can migrate `revset.py` `public()` implementation later. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1606 To: joerg.sonnenberger, #hg-reviewers, quark Cc: durin42, quark, me

[PATCH] run-tests: if ran outside of tests/, we should not search CWD for hg lib

2017-12-07 Thread matthieu . laneuville
# HG changeset patch # User Matthieu Laneuville # Date 1512650569 -32400 # Thu Dec 07 21:42:49 2017 +0900 # Node ID cd24cca4374384c80700782913c906c375d13e93 # Parent af5507203d01d76ccb1d9ec04b1c9827d6017be9 # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull

D1615: transaction: build changes['revs'] as range instead of a set

2017-12-07 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. Very nice! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1615 To: joerg.sonnenberger, #hg-reviewers, quark Cc: quark, mercurial-devel ___ Mercurial-devel mailing li

D1615: transaction: build changes['revs'] as range instead of a set.

2017-12-07 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Revisions are added consecutively, so a range can easily represent them in the changes list. This saves around 45 Bytes / revision on 64bit platforms

mercurial@35260: 4 new changesets

2017-12-07 Thread Mercurial Commits
4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/3340d46a5c3f changeset: 35257:3340d46a5c3f user:Boris Feld date:Sun Oct 15 14:59:55 2017 +0200 summary: bookmark: add methods to binary encode and decode bookmark values https://www.mercurial-scm.org/r

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > durin42 wrote in context.py:2022 > Er, wait. As I look closer: should this be used down on lines 2025 and 2028? > Will hold on my push until I hear back. Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM. > durin42 wrot

D1606: phases: drop the list with phase of each rev, always comput phase sets

2017-12-07 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger updated this revision to Diff 4228. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1606?vs=4155&id=4228 REVISION DETAIL https://phab.mercurial-scm.org/D1606 AFFECTED FILES mercurial/cext/parsers.c mercurial/cext/revlog.c mercuri

Security Disclosures

2017-12-07 Thread Sean Farley
Steering committee (and others that might have better ideas than I): It was brought to my attention by our security team of how embarrassing it is to report a security bug to Mercurial. For our last security bug, I must agree we really bumbled it. In particular, a user reported this security bug

mercurial@35256: 39 new changesets

2017-12-07 Thread Mercurial Commits
39 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d61f2a3d5e53 changeset: 35218:d61f2a3d5e53 parent: 35216:fcc96cf0983d user:Anton Shestakov date:Fri Dec 01 16:00:40 2017 +0800 summary: hgweb: only include graph-related data in jsdata variable on

Re: [PATCH 2 of 2] push: restrict common discovery to the pushed set

2017-12-07 Thread Augie Fackler
On Thu, Dec 07, 2017 at 01:32:13PM +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1512599581 -3600 > # Wed Dec 06 23:33:01 2017 +0100 > # Node ID eeed65db2847b39998c8a08cfa4e44ec8381b2e9 > # Parent f2fcdbfa1475d055caaa44c9cc23a58284c97e4b > # EXP-Topic discovery

Re: [PATCH 2 of 2] largefiles: allow to run 'debugupgraderepo' on repo with largefiles

2017-12-07 Thread Augie Fackler
On Thu, Dec 07, 2017 at 01:06:10PM +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1512607994 -3600 > # Thu Dec 07 01:53:14 2017 +0100 > # Node ID f8066f6c62b2bd6e0f28dd3ed283c8a265497fc0 > # Parent 858933ee312507ecd05498ff72f7c4f7a4802b80 > # EXP-Topic updaterep

Re: [PATCH 6 of 6] revset: make follow() accept empty startrev

2017-12-07 Thread Augie Fackler
On Fri, Dec 08, 2017 at 12:09:24AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1474540902 -32400 > # Thu Sep 22 19:41:42 2016 +0900 > # Node ID f2a19afb19c146c59956d33d48ab91a7b76896b8 > # Parent 394d25004f912b5b104e2f56a042b3d1a3b2ca14 > revset: make

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa660c1203a9: rebase: do not bail on uncomitted changes if rebasing in-memory (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/

D1235: overlayworkingctx: track copy information in the context

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8b3a636bb341: overlayworkingctx: track copy information in the context (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1235?v

D1237: overlayworkingctx: add `_checkexist(path)`

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbea46aed1e1b: overlayworkingctx: add `_checkexist(path)` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=4202&id=4225

D1236: overlayworkingctx: fix a bad reference to `self._path`

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd4f65050f3c5: overlayworkingctx: fix a bad reference to `self._path` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1236?vs=

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG306a8604741f: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm

D1214: merge: don't check for unknown files in IMM

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5db3c748ce8f: merge: don't check for unknown files in IMM (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1214?vs=4176&id=421

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG482614b3802a: rebase: add the --inmemory option flag; assign a wctx object for the rebase (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercur

D1231: overlayworkingctx: move _wrappedctx out of the constructor

2017-12-07 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f8c476c49fe: overlayworkingctx: move _wrappedctx out of the constructor (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > durin42 wrote in context.py:2022 > pyflakes noticed this wasn't used. I'm cleaning it up in flight. Er, wait. As I look closer: should this be used down on lines 2025 and 2028? Will hold on my push until I hear back. REPOSITORY rHG Mercurial

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > context.py:2022 > + > +flag = self._flagfunc > +for path in self.added(): pyflakes noticed this wasn't used. I'm cleaning it up in flight. > context.py:2034 > +@propertycache > +def _flagfunc(self): > +def f(path):

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread durin42 (Augie Fackler)
durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. Not in love with the code duplication here, but looking at it I don't see a clean way to avoid it either. Bleh. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.or

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > context.py:2242 > +"""Removes keys from the cache that are actually clean, by comparing > +them with the underlting context. > + typo: s/underlting/underlying/ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-s

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > context.py: > +if len(parents) == 1: > +parents = [parents[0], None] > + use a tuple instead of a list here > context.py:2246 > + > +def commit(self, text, parents=None, date=None, extra=None, editor=None, > +

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4217. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4209&id=4217 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4215. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4207&id=4215 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4216. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4208&id=4216 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4207. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4188&id=4207 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1246: rebase: do not update if IMM; instead, set the overlaywctx's parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4211. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1246?vs=4192&id=4211 REVISION DETAIL https://phab.mercurial-scm.org/D1246 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1245: rebase: pass wctx to rebasenode()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4210. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1245?vs=4191&id=4210 REVISION DETAIL https://phab.mercurial-scm.org/D1245 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4205. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1240?vs=4186&id=4205 REVISION DETAIL https://phab.mercurial-scm.org/D1240 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1241: overlayworkingctx: add _auditconflicts to write()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4206. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=4187&id=4206 REVISION DETAIL https://phab.mercurial-scm.org/D1241 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4213. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4194&id=4213 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4209. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4190&id=4209 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4214. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4195&id=4214 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1247: rebase: pass the wctx object (IMM or on-disk) to merge.update

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4212. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1247?vs=4193&id=4212 REVISION DETAIL https://phab.mercurial-scm.org/D1247 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4208. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4189&id=4208 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1237: overlayworkingctx: add `_checkexist(path)`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4202. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=4183&id=4202 REVISION DETAIL https://phab.mercurial-scm.org/D1237 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1239: overlayworkingctx: add a no-op ``clearunknown()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4204. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=4185&id=4204 REVISION DETAIL https://phab.mercurial-scm.org/D1239 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1235: overlayworkingctx: track copy information in the context

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4200. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1235?vs=4181&id=4200 REVISION DETAIL https://phab.mercurial-scm.org/D1235 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1236: overlayworkingctx: fix a bad reference to `self._path`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4201. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1236?vs=4182&id=4201 REVISION DETAIL https://phab.mercurial-scm.org/D1236 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4203. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=4184&id=4203 REVISION DETAIL https://phab.mercurial-scm.org/D1238 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4199. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1234?vs=4180&id=4199 REVISION DETAIL https://phab.mercurial-scm.org/D1234 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1241: overlayworkingctx: add _auditconflicts to write()

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > context.py:2153 > +components = path.split('/') > +for i, _ in enumerate(components): > +component = "/".join(components[0:i]) for i in xrange(len(components)): ... REPOSITORY rHG Mercurial REVISION DETAIL http

D1231: overlayworkingctx: move _wrappedctx out of the constructor

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4197. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231?vs=4177&id=4197 REVISION DETAIL https://phab.mercurial-scm.org/D1231 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4198. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1233?vs=4179&id=4198 REVISION DETAIL https://phab.mercurial-scm.org/D1233 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1527: context: add an abstract base class for filectx

2017-12-07 Thread phillco (Phil Cohen)
phillco added a comment. > What exactly is that cycle? Can we break one of the links with a local import? It's the same filectx -> ctx -> fileset -> merge -> filemerge cycle that frustrated earlier. We can't circumvent it this time (I think) because the import is in the module, not a fu

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > context.py:2061 > +man[path] = addednodeid > +man.setflag(path,'') > +for path in self.modified(): nit: space after comma (will fix in flight) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-s

D1591: visibility: improve the message when accessing filtered obsolete rev

2017-12-07 Thread pulkit (Pulkit Goyal)
pulkit requested changes to this revision. pulkit added a comment. This revision now requires changes to proceed. Apart from the comments, this patch looks good to me. INLINE COMMENTS > context.py:458 > > +def _getobsoletereason(ctx, unfilteredrepo): > +successors = obsutil.successorsse

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

2017-12-07 Thread phillco (Phil Cohen)
phillco added a comment. > Perhaps the option should be flagged experimental then? Good point, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1232 To: phillco, #hg-reviewers, dlax Cc: durin42, dlax, mercurial-devel __

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4196. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1232?vs=4178&id=4196 REVISION DETAIL https://phab.mercurial-scm.org/D1232 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4184. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=3111&id=4184 REVISION DETAIL https://phab.mercurial-scm.org/D1238 AFFEC

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4190. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=3117&id=4190 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFEC

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4195. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=3122&id=4195 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFEC

D1237: overlayworkingctx: add `_checkexist(path)`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4183. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=3110&id=4183 REVISION DETAIL https://phab.mercurial-scm.org/D1237 AFFEC

D1236: overlayworkingctx: fix a bad reference to `self._path`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4182. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1236?vs=3109&id=4182 REVISION DETAIL https://phab.mercurial-scm.org/D1236 AFFEC

D1243: overlayworkingctx: add `_compact()`

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4189. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=3116&id=4189 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFEC

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4194. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=3121&id=4194 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFEC

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4178. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1232?vs=4042&id=4178 REVISION DETAIL https://phab.mercurial-scm.org/D1232 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1241: overlayworkingctx: add _auditconflicts to write()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4187. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=3114&id=4187 REVISION DETAIL https://phab.mercurial-scm.org/D1241 AFFEC

D1245: rebase: pass wctx to rebasenode()

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4191. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1245?vs=3118&id=4191 REVISION DETAIL https://phab.mercurial-scm.org/D1245 AFFEC

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4188. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=3115&id=4188 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFEC

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4186. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1240?vs=3113&id=4186 REVISION DETAIL https://phab.mercurial-scm.org/D1240 AFFEC

D1247: rebase: pass the wctx object (IMM or on-disk) to merge.update

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4193. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1247?vs=3120&id=4193 REVISION DETAIL https://phab.mercurial-scm.org/D1247 AFFEC

D1235: overlayworkingctx: track copy information in the context

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4181. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1235?vs=3108&id=4181 REVISION DETAIL https://phab.mercurial-scm.org/D1235 AFFEC

D1246: rebase: do not update if IMM; instead, set the overlaywctx's parents

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4192. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1246?vs=3119&id=4192 REVISION DETAIL https://phab.mercurial-scm.org/D1246 AFFEC

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4179. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1233?vs=4043&id=4179 REVISION DETAIL https://phab.mercurial-scm.org/D1233 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1231: overlayworkingctx: move _wrappedctx out of the constructor

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4177. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231?vs=4041&id=4177 REVISION DETAIL https://phab.mercurial-scm.org/D1231 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1239: overlayworkingctx: add a no-op ``clearunknown()``

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4185. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=3112&id=4185 REVISION DETAIL https://phab.mercurial-scm.org/D1239 AFFEC

D1354: dirstate: change all writes to dirstatemap._map to go through one method

2017-12-07 Thread durin42 (Augie Fackler)
durin42 added a comment. If you want, I'd be happy to make the dirstatetuple factory a class-level attribute on the dirstatemap - I'm not quite following what the extra logic you need is, but I'd very much like to make Eden easier, you just need to help me understand the constraints better:

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4180. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1234?vs=4044&id=4180 REVISION DETAIL https://phab.mercurial-scm.org/D1234 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/r

D1527: context: add an abstract base class for filectx

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4175. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1527?vs=3903&id=4175 REVISION DETAIL https://phab.mercurial-scm.org/D1527 AFFECTED FILES mercurial/context.py mercurial/filemerge.py CHANGE DETAILS diff --g

  1   2   >