D626: merge: move cwd-missing detection to helper functions

This revision was automatically updated to reflect the committed changes. Closed by commit rHG24bf823377fc: merge: move cwd-missing detection to helper functions (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D449: merge: pass wctx to premerge, filemerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc0ce60459d84: merge: pass wctx to premerge, filemerge (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D449?vs=1670=1768

D674: filemerge: use arbitraryfilectx for backup files

phillco added a subscriber: sid0. phillco added inline comments. INLINE COMMENTS > martinvonz wrote in test-dirstate-race.t:85 > Why did this change? It's caused by the addition of this block into `abstractfilectx`. if isinstance(fctx, abstractfilectx): return self.data() !=

D674: filemerge: use arbitraryfilectx for backup files

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in filemerge.py:744 > The documentation for filecmp.cmp() says > > Unless shallow is given and is false, files with identical os.stat() > signatures are taken to be equal. > > Are we losing out on that optimization with this

Re: [PATCH 1 of 8] py3: fix type of regex literals in patch.py

On Sun, Sep 03, 2017 at 11:36:19PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1504422735 -32400 > # Sun Sep 03 16:12:15 2017 +0900 > # Node ID 313ecdde1470bb3a0e1f9beced7e596b8004e456 > # Parent

mercurial@34127: 7 new changesets

7 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ae95853c250a changeset: 34121:ae95853c250a user:Boris Feld date:Mon Sep 11 18:07:29 2017 +0200 summary: cmdutil: fix amend when passing a date

D626: merge: move cwd-missing detection to helper functions

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

D694: tests: split test-revset.t in half

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaf13097b44dd: tests: split test-revset.t in half (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D694?vs=1767=1773 REVISION

D694: tests: split test-revset.t in half

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This test has gotten so large that running it can exceed the normal timeout on systems under load (like if we're running all the tests in parallel). This patch

Re: [PATCH] extensions: fix wrapcommand/function of class instance

On Sun, Sep 10, 2017 at 11:47:02PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1505054234 -32400 > # Sun Sep 10 23:37:14 2017 +0900 > # Node ID 283ecec363f4901ec8948dbdc7dba564296d8582 > # Parent

Re: Hgweb.cgi throws ssl error

On Fri, Sep 08, 2017 at 09:38:23AM +0200, akos tajti wrote: > Dear List Members, > > this is our situation. We have a java web application that enables the users > to browse the contents of a mercurial repository. This is a simple servlet > that executes mercurial commands. All mercurial

Re: [PATCH 2 of 2] debuginstall: do not pass exception object to formatter (issue5676)

On Thu, Sep 07, 2017 at 10:54:29PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1504791414 -32400 > # Thu Sep 07 22:36:54 2017 +0900 > # Node ID 3573b95ec1f32805bde3a08b1f4f7dca8e3d699f > # Parent

Re: [PATCH 11 of 11] doctest: enable tests by default on Python 3

On Tue, Sep 05, 2017 at 12:08:30AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1504418944 -32400 > # Sun Sep 03 15:09:04 2017 +0900 > # Node ID 626afe0652a1ab7de424aecc1f3d125bf306c8cb > # Parent

D673: merge: flush any deferred writes just before recordupdates()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG57dc78d757ff: merge: flush any deferred writes just before recordupdates() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D650: blackbox: do not cache file objects

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcf04db16f583: blackbox: do not cache file objects (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D650?vs=1653=1752 REVISION DETAIL

D651: blackbox: remove _bbvfs state

This revision was automatically updated to reflect the committed changes. Closed by commit rHG029b33adbd17: blackbox: remove _bbvfs state (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D651?vs=1654=1753 REVISION DETAIL

D616: context: add overlayworkingcontext and overlayworkingfilectx

durin42 added a comment. This is already pushed, but please consider breaking up context.py into a package in the near future - it's far too large to comprehend, and I think it'd help organization if we had each of the various file{ctx} types (mem, working, overlay) in their own file and

mercurial@34104: 13 new changesets

13 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8a8e7a94ba07 changeset: 34092:8a8e7a94ba07 user:Jun Wu date:Wed Sep 06 12:40:00 2017 -0700 summary: rebase: do not crash rebasing merge with a parent having hidden successor

[Bug 5677] New: subrepo change can no longer be amended

https://bz.mercurial-scm.org/show_bug.cgi?id=5677 Bug ID: 5677 Summary: subrepo change can no longer be amended Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED

mercurial@34091: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/bbdca7e460c0 changeset: 34091:bbdca7e460c0 bookmark:@ tag: tip parent: 34088:a763c891f36e user:Durham Goode date:Wed Sep 06 18:33:55 2017 -0700 summary: changegroup: fix to

D691: cmdutil: fix amend when passing a date

singhsrb accepted this revision. singhsrb added a comment. @lothiraldan: Thanks for taking care of this and adding the corresponding tests. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D691 To: lothiraldan, #hg-reviewers, singhsrb Cc: singhsrb,

D652: blackbox: remove _partialinit

quark added a comment. Good catch! I should have been aware of that since that's part of the experience working on chg. I still want to simplify the interface. Maybe we can remove `__init__` and `copy` instead. REPOSITORY rHG Mercurial REVISION DETAIL

D680: scmutil: handle conflicting files and dirs in origbackuppath

durham accepted this revision. durham added inline comments. INLINE COMMENTS > scmutil.py:581 > +ui.note(_('removing conflicting directory: %s\n') % fullorigpath) > +repo.vfs.rmtree(fullorigpath, forcibly=True) > + I tried to think of where this could go wrong or be abused. I

D690: changegroup: avoid creating empty changegroup part

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously this check happened in the changegroup code itself. Since it's refactor, this logic needs to move out to callers that care about it, such as this one.

Office hours Sept. 13, 2017

Hey folks, I'm going to try and do another round of office hours tomorrow. I'm tentatively reserving 1300-1430 America/New_York (1700-1830 UTC, but if I got that wrong the America/New_York is canonical) for that, figuring that I can talk to people for 30 minute slots. If you'd like to reserve

D691: cmdutil: fix amend when passing a date

This revision was automatically updated to reflect the committed changes. Closed by commit rHGae95853c250a: cmdutil: fix amend when passing a date (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D691?vs=1763=1765

D612: directaccess: add a hiddenlevel argument to registrar.command

smf added a comment. Has there been discussion around extensions using this? Should there be discussion now? Specifically, I'm trying to figure out how external things will use this feature. Should it be a try/except? Or should modules set the access level before looking for a (potentially)

D694: tests: split test-revset.t in half

durham added a comment. Yay for phabricator showing that the only changes in each copy are deletes! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D694 To: durham, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel

D650: blackbox: do not cache file objects

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. > Having the blackbox file objects cached in ui._bbfp could in theory be > troublesome if multiple processes (ex. chg servers) have file objects > referring to a same file. (Although I

Re: [PATCH 1 of 6] configitems: register the 'patchbomb.bundletype' config

On Mon, 11 Sep 2017 15:31:48 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498787017 -7200 > # ven. juin 30 03:43:37 2017 +0200 > # Node ID f6e0ac2346b8b5dc54560eb5e9b235dcbec9c3b2 > # Parent a763c891f36e55f4869f443c220227d1da747d18 >

Re: [PATCH 1 of 3] configitems: register the 'eol.fix-trailing-newline' config

On Mon, 11 Sep 2017 15:44:21 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498786761 -7200 > # ven. juin 30 03:39:21 2017 +0200 > # Node ID e5c4424dc0dabfa817f41fc81a49b4232fda05e6 > # Parent a763c891f36e55f4869f443c220227d1da747d18 >

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

On Mon, 11 Sep 2017 15:50:32 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498787154 -7200 > # ven. juin 30 03:45:54 2017 +0200 > # Node ID 34ae7b710192ced203102f80f6a1f73e42341d3b > # Parent a763c891f36e55f4869f443c220227d1da747d18 >

D648: blackbox: fix rotation with chg

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. > I think the original patch was trying to make different `ui` objects use a same file object if their `blackbox.log` path is the same. In theory it could also be problematic in the rotation

D652: blackbox: remove _partialinit

yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. uisetup() only replaces the `__class__`. Can we be sure that `blackboxui.__init__()` was called prior to `ui.log()` ? REPOSITORY rHG Mercurial REVISION DETAIL

D649: blackbox: inline _bbwrite

This revision was automatically updated to reflect the committed changes. Closed by commit rHG50df6cf22717: blackbox: inline _bbwrite (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D649?vs=1652=1751 REVISION DETAIL

D648: blackbox: fix rotation with chg

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4f60720cf0df: blackbox: fix rotation with chg (authored by quark). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D648?vs=1651=1750#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D647: test-blackbox: make it compatible with chg

This revision was automatically updated to reflect the committed changes. Closed by commit rHG06eb3de47649: test-blackbox: make it compatible with chg (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D647?vs=1650=1749 REVISION DETAIL

D612: directaccess: add a hiddenlevel argument to registrar.command

durham requested changes to this revision. durham added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > registrar.py:149 > +norepo=False, optionalrepo=False, inferrepo=False, > +hiddenlevel='UNRECOVERABLE_WRITE'): >

mercurial@34120: 16 new changesets

16 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c037fd655b47 changeset: 34105:c037fd655b47 user:Durham Goode date:Mon Sep 11 15:59:18 2017 -0700 summary: ssh: fix flakey ssh errors on BSD systems

Re: [PATCH 4 of 4] client: raise ResponseError in _readchannel()

> On Aug 30, 2017, at 09:50, Gábor STEFANIK wrote: > >> -Original Message- >> From: Augie Fackler [mailto:r...@durin42.com] >> Sent: Monday, August 28, 2017 8:32 PM >> To: Gábor STEFANIK >> Cc: mercurial-devel@mercurial-scm.org >>

D691: cmdutil: fix amend when passing a date

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Following https://phab.mercurial-scm.org/D636, passing the same date that the changeset to amend would results in no new commits but the output changed