D522: revlog: abort on attempt to write null revision

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY My repo got corrupted yesterday by something that ended up writing the null revision to the revlog (nullid hash, not nullrev

D382: simplemerge: make context parameters non-optional

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in simplemerge.py:428 > Can this still be true? I.e., is it valid to pass None instead of one of the > contexts? Sent as https://phab.mercurial-scm.org/D520. REPOSITORY rHG Mercurial REVISION DETAIL

D403: filemerge: reduce creation of tempfiles until needed

phillco updated this revision to Diff 1307. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D403?vs=1224=1307 REVISION DETAIL https://phab.mercurial-scm.org/D403 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D444: merge: move some of the logic in batchget() to workingfilectx

phillco updated this revision to Diff 1309. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1226=1309 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git

D401: filemerge: add `_workingpath`

phillco updated this revision to Diff 1306. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1223=1306 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D400: filemerge: move a util copy call to filectx.write

phillco updated this revision to Diff 1305. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D400?vs=1218=1305 REVISION DETAIL https://phab.mercurial-scm.org/D400 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D399: filemerge: eliminate most uses of tempfiles

phillco updated this revision to Diff 1304. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D399?vs=1222=1304 REVISION DETAIL https://phab.mercurial-scm.org/D399 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D522: revlog: abort on attempt to write null revision

quark accepted this revision. quark added a comment. Looks good to me. Maybe we also want to blacklist the working copy node. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D522 To: martinvonz, indygreg, #hg-reviewers, quark Cc: quark, mercurial-devel

D523: revset: improve documentation about ordering handling

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The old documentation is a bit confusing. Namely, it's unclear whether `define` means "I should ALWAYS define a new order", or "I should SOMETIMES define a new

D451: revset: remove order information from tree

quark updated this revision to Diff 1317. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1108=1317 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D388: filemerge: extract _maketemp and _makebackup

phillco updated this revision to Diff 1302. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D388?vs=1221=1302 REVISION DETAIL https://phab.mercurial-scm.org/D388 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D403: filemerge: reduce creation of tempfiles until needed

phillco updated this revision to Diff 1311. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D403?vs=1307=1311 REVISION DETAIL https://phab.mercurial-scm.org/D403 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D404: filemerge: add _restorebackup

phillco updated this revision to Diff 1312. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D404?vs=1308=1312 REVISION DETAIL https://phab.mercurial-scm.org/D404 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D521: simplemerge: refactor _picklabels to be more compact

This revision was automatically updated to reflect the committed changes. Closed by commit rHG39d253d088a9: simplemerge: refactor _picklabels to be more compact (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D521?vs=1301=1314

D401: filemerge: add `_workingpath`

phillco updated this revision to Diff 1310. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=1306=1310 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

[Bug 5667] New: Pressing m key to edit commit message during record inoperable

https://bz.mercurial-scm.org/show_bug.cgi?id=5667 Bug ID: 5667 Summary: Pressing m key to edit commit message during record inoperable Product: Mercurial Version: 4.3 Hardware: Macintosh OS: Mac OS

D449: merge: pass wctx to premerge, filemerge

phillco planned changes to this revision. phillco added a comment. Will reintroduce later, closer to changes further up the stack. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D449 To: phillco, #hg-reviewers Cc: mercurial-devel

D450: filemerge: add wctx to all internal tools

phillco planned changes to this revision. phillco added a comment. Will reintroduce later, closer to changes further up the stack. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D450 To: phillco, #hg-reviewers Cc: mercurial-devel

D449: merge: pass wctx to premerge, filemerge

phillco updated this revision to Diff 1298. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D449?vs=1236=1298 REVISION DETAIL https://phab.mercurial-scm.org/D449 AFFECTED FILES hgext/largefiles/overrides.py mercurial/filemerge.py mercurial/merge.py

D450: filemerge: add wctx to all internal tools

phillco updated this revision to Diff 1299. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D450?vs=1238=1299 REVISION DETAIL https://phab.mercurial-scm.org/D450 AFFECTED FILES contrib/phabricator.py mercurial/filemerge.py mercurial/tagmerge.py

D521: simplemerge: refactor _picklabels to be more compact

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Use @martinvonz's suggestion from https://phab.mercurial-scm.org/D376. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D521 AFFECTED

D520: simplemerge: remove check for null context

phillco 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/D520 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py

D522: revlog: abort on attempt to write null revision

quark resigned from this revision. quark added a comment. Actually, I think it's better to do this in `_addrevision`, which could cover more code paths in theory. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D522 To: martinvonz, indygreg, #hg-reviewers, quark

D487: test-extension: enable demandimport explicitly

martinvonz added a comment. https://phab.mercurial-scm.org/rHG4b50e1f922a0c6863649dffd222dfa2ceb2f7305 says something about test failures with ironpython (which I don't even know what it is) and demandimport. Maybe we should do "#require demandimport" instead to skip running the tests when

D522: revlog: abort on attempt to write null revision

martinvonz updated this revision to Diff 1319. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D522?vs=1315=1319 REVISION DETAIL https://phab.mercurial-scm.org/D522 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --git a/mercurial/revlog.py

D524: changelog: abort on attempt to write wdir revision

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Similar to the previous patch which prevented writing the null revision to any revlog, but this is for the wdir revision. Thanks to Jun for pointing this

D487: test-extension: enable demandimport explicitly

martinvonz added a comment. In https://phab.mercurial-scm.org/D487#8462, @martinvonz wrote: > https://phab.mercurial-scm.org/rHG4b50e1f922a0c6863649dffd222dfa2ceb2f7305 says something about test failures with ironpython (which I don't even know what it is) and demandimport. Maybe we

D522: revlog: abort on attempt to write null revision

martinvonz added a comment. In https://phab.mercurial-scm.org/D522#8435, @quark wrote: > Looks good to me. Maybe we also want to blacklist the working copy node. Makes sense. It's slightly different since it only applies to the changelog (but there are also several other magic

Re: [PATCH 4 of 9 V4] template: add minimal obsfate template function

On Wed, 23 Aug 2017 17:18:38 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1502987171 -7200 > # Thu Aug 17 18:26:11 2017 +0200 > # Node ID c2702967b47010d10ee0b8cf9ee633928d4b6214 > # Parent e8087ac6f8c52088233f5d499133de7f881a0c12 > #

Re: [PATCH 5 of 9 V4] template: compute verb in obsfateverb

On Wed, 23 Aug 2017 17:18:39 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1499088807 -7200 > # Mon Jul 03 15:33:27 2017 +0200 > # Node ID 8c1da4748240142e1ee62521279cf8556192c79e > # Parent c2702967b47010d10ee0b8cf9ee633928d4b6214 > #

Re: [PATCH 4 of 4] test-doctest: normalize b'', u'' and exception name on Python 3

On Fri, 25 Aug 2017 00:20:43 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1503581608 -32400 > # Thu Aug 24 22:33:28 2017 +0900 > # Node ID 098312faf83c46ea590c0c865874ccfc2f1b4df7 > # Parent a9b6c464c13b6a6d7dce4e8adf88d0e80dc96003 >

Re: [PATCH 4 of 9 V4] template: add minimal obsfate template function

On Fri, 25 Aug 2017 22:59:11 +0900, Yuya Nishihara wrote: > On Wed, 23 Aug 2017 17:18:38 +0200, Boris Feld wrote: > > +def successorsandmarkers(repo, ctx): > > +"""compute the raw data needed for computing obsfate > > +Returns a list of dict, one dict per successors set > > +""" > > +

Re: [PATCH 7 of 9 V4] template: compute dates in obsfatedate

On Wed, 23 Aug 2017 17:18:41 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1499088850 -7200 > # Mon Jul 03 15:34:10 2017 +0200 > # Node ID b8b8b5bd728a5fb9fa847d56dd489c77a054b5ee > # Parent fc257b24c35c492591f348b039d9e3f9488118a8 > #

Re: [PATCH] bookmarks: allow deleting active bookmark using '.'

On Fri, 25 Aug 2017 08:19:50 +0200, David Demelier wrote: > # HG changeset patch > # User David Demelier > # Date 1503559386 -7200 > # Thu Aug 24 09:23:06 2017 +0200 > # Node ID 2c11d8e1d6c442e14d1b31ed5d6ce325717c8531 > # Parent

Re: [PATCH 1 of 9] tests: blacklist some more entries in module import checks

On Thu, 24 Aug 2017 10:33:22 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1503425716 14400 > # Tue Aug 22 14:15:16 2017 -0400 > # Node ID ee1f4dd1c3a53cd08e5329b80ba5d93811ab5d1c > # Parent 10f1809ab98f18e7ad3284fcf5d3ec9b699c6e15 >

D517: journal: do not use atomictemp

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Flagged as (issue5338) and queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D517 To: quark, #hg-reviewers, yuja Cc: yuja, mercurial-devel

[PATCH] bookmarks: allow deleting active bookmark using '.'

# HG changeset patch # User David Demelier # Date 1503559386 -7200 # Thu Aug 24 09:23:06 2017 +0200 # Node ID 2c11d8e1d6c442e14d1b31ed5d6ce325717c8531 # Parent 546e72c2f4134145b4a91d6e03c1b0ff70b2bd9a bookmarks: allow deleting active bookmark using '.' diff -r

[PATCH] tests: update test-bisect to pass our module import checker

# HG changeset patch # User Augie Fackler # Date 1503428319 14400 # Tue Aug 22 14:58:39 2017 -0400 # Node ID f98d4752474fd7a49a42944c6a8e611595af6e25 # Parent a1744af43ccb894b35751fad0fa8062ecfcbe1d0 tests: update test-bisect to pass our module import checker diff --git

[PATCH] tests: update test-bookmarks to pass the import checker

# HG changeset patch # User Augie Fackler # Date 1503428654 14400 # Tue Aug 22 15:04:14 2017 -0400 # Node ID 0d21f0d60eb5b398cf622081f631cff647f1e6b7 # Parent f98d4752474fd7a49a42944c6a8e611595af6e25 tests: update test-bookmarks to pass the import checker diff --git

[PATCH] tests: update test-archive to pass our module import checker

# HG changeset patch # User Augie Fackler # Date 1503428301 14400 # Tue Aug 22 14:58:21 2017 -0400 # Node ID a1744af43ccb894b35751fad0fa8062ecfcbe1d0 # Parent 3de9e0de7e638f8be9c990ed440a14cdadd4493e tests: update test-archive to pass our module import checker diff --git

[PATCH] tests: update test-command-template to pass our import checker

# HG changeset patch # User Augie Fackler # Date 1503431394 14400 # Tue Aug 22 15:49:54 2017 -0400 # Node ID d0b32a5f82e4e278e05e6363997bb79510aa9717 # Parent bcbb163bf16907feefb69363b5540d6b2e5c8028 tests: update test-command-template to pass our import checker diff

[PATCH] tests: update test-bundle2-pushback to pass the import checker

# HG changeset patch # User Augie Fackler # Date 1503428676 14400 # Tue Aug 22 15:04:36 2017 -0400 # Node ID c9ae2f7cc20684a9340322dd949302bcf76fd70d # Parent 0d21f0d60eb5b398cf622081f631cff647f1e6b7 tests: update test-bundle2-pushback to pass the import checker diff

[PATCH] tests: update test-bundle2-format to pass import checker

# HG changeset patch # User Augie Fackler # Date 1503428751 14400 # Tue Aug 22 15:05:51 2017 -0400 # Node ID 450e5c68b4f71f36ff011d972656c04416529dc4 # Parent c9ae2f7cc20684a9340322dd949302bcf76fd70d tests: update test-bundle2-format to pass import checker diff --git

[PATCH] tests: update test-convert-clonebranches to pass our import checker

# HG changeset patch # User Augie Fackler # Date 1503431427 14400 # Tue Aug 22 15:50:27 2017 -0400 # Node ID a7e8ce268f15dd160effdd476171467f84add1a1 # Parent 52b9e56c37c1e62ce338fc0f6cae1d50790186ce tests: update test-convert-clonebranches to pass our import checker diff

[PATCH] tests: update test-annotate to pass our module import checker

# HG changeset patch # User Augie Fackler # Date 1503428290 14400 # Tue Aug 22 14:58:10 2017 -0400 # Node ID 3de9e0de7e638f8be9c990ed440a14cdadd4493e # Parent e6d4215669062a7e49d736d46aa9fbc6fe2f51b6 tests: update test-annotate to pass our module import checker diff --git

[PATCH] tests: update test-commit to pass our import checker

# HG changeset patch # User Augie Fackler # Date 1503431401 14400 # Tue Aug 22 15:50:01 2017 -0400 # Node ID 52b9e56c37c1e62ce338fc0f6cae1d50790186ce # Parent d0b32a5f82e4e278e05e6363997bb79510aa9717 tests: update test-commit to pass our import checker diff --git

D451: revset: remove order information from tree

yuja added a comment. First, I'm tired of discussing this. Perhaps, you would be the same (guessing from the initial reply.) I don't think this should be a blocker of your previous series which optimizes `draft() ...` something. If you want to move things forward, please split

Re: Handling path conflicts

To follow up to my earlier message, I’m going to start looking at implementing https://www.mercurial-scm.org/wiki/PathConflictsPlan when I return from vacation in a week and a half’s time. I’ll respond to any more comments anyone has then. At Ryan’s request, I’m also going to take a look at

D477: revlog: add option to mmap revlog index

quark added inline comments. INLINE COMMENTS > test-revlog-mmapindex.t:15 > + > [extensions] > + > verbosemmap=$TESTDIR/verbosemmap.py > + > EOF In this case `verbosemmap.py` is not very useful in other tests. The common pattern is to make it inside the `.t` file: $ cat > verbosemmap.py

D517: journal: do not use atomictemp

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe6d421566906: journal: do not use atomictemp (issue5338) (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D517?vs=1281=1293 REVISION DETAIL

Re: [PATCH 3 of 4] run-tests: pass unicode to Pygments

On Fri, Aug 25, 2017 at 12:20:42AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1503580802 -32400 > # Thu Aug 24 22:20:02 2017 +0900 > # Node ID a9b6c464c13b6a6d7dce4e8adf88d0e80dc96003 > # Parent

Re: [PATCH 5 of 5] encoding: add fast path of from/toutf8b() for ASCII strings

On Fri, Aug 18, 2017 at 11:14:13PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1492920538 -32400 > # Sun Apr 23 13:08:58 2017 +0900 > # Node ID 04fd41cda7ed93b480f59f62cd4d4278d365dd0e > # Parent

D477: revlog: add option to mmap revlog index

mbthomas updated this revision to Diff 1294. mbthomas added a comment. Make mmap test check for mmapping by making util.mmapread verbose REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D477?vs=1245=1294 BRANCH mmap-revlog (bookmark) on default

D435: simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf39ba8237ed6: simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D434: context: add `decodeddata()` to basefilectx

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf488223a87ab: context: add `decodeddata()` to basefilectx (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D434?vs=1219=1282 REVISION DETAIL

D378: contrib: make simplemerge script pass context-like objects

This revision was automatically updated to reflect the committed changes. Closed by commit rHGed6f64173121: contrib: make simplemerge script pass context-like objects (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=1277=1284

D382: simplemerge: make context parameters non-optional

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1ad3085239ad: simplemerge: make context parameters non-optional (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D382?vs=1042=1288 REVISION

D383: simplemerge: simplify code now that we always write to a context

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4074de97b512: simplemerge: simplify code now that we always write to a context (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D381: simplemerge: stop accepting, and passing, file parameters

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfa6309c5761d: simplemerge: stop accepting, and passing, file parameters (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=1278=1287

D379: simplemerge: use context paths for default labels instead of file paths

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1915a5e809ca: simplemerge: use context paths for default labels instead of file paths (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D380: simplemerge: stop reading from, and writing to, files

This revision was automatically updated to reflect the committed changes. Closed by commit rHG61b267a99fea: simplemerge: stop reading from, and writing to, files (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D380?vs=1040=1285

D451: revset: remove order information from tree

quark added a comment. Don't worry about that optimization patch. I'll refactor this series and use `maybedefine`. Thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D451 To: quark, #hg-reviewers Cc: martinvonz, yuja, mercurial-devel

Re: Accessing hidden commits by hash (directaccess extension)

This is great. I've been hitting my head against this ever since I started using evolve, and I'll be thrilled to have this functionality. A couple of questions: - If a revision range is given that ends (or begins, I suppose) with a hidden changeset, will any intervening hidden changesets