[PATCH] githelp: cleanup one more abort message

# HG changeset patch # User Matt Harbison # Date 1527047288 14400 # Tue May 22 23:48:08 2018 -0400 # Node ID e951e2017229ef3e84bef144fb50546de058d93b # Parent a6bed2a6eafea7d89af7e12696169c754c9bf64a githelp: cleanup one more abort message This makes the string

[PATCH] terse: pconvert() entries added to the temporary terse dict for Windows

# HG changeset patch # User Matt Harbison # Date 1527045735 14400 # Tue May 22 23:22:15 2018 -0400 # Node ID a6bed2a6eafea7d89af7e12696169c754c9bf64a # Parent c65931d23baf101780d00f027bf57dbe0af5e8cc terse: pconvert() entries added to the temporary terse dict for

D3644: state: raise CorruptedState error isntead of ProgrammingError

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There are old state files which don't have a version number in top of them and hence we have to read them to check whether they are good or not. ProgrammingError

Re: [PATCH] githelp: do not concatenate i18n messages dynamically so they can be collected

On Tue, May 22, 2018 at 5:21 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526989422 -32400 > # Tue May 22 20:43:42 2018 +0900 > # Node ID 4640b4e1027f5060caa11e7eb23c2524a9a354c4 > # Parent

mercurial@38033: 6 new changesets (2 on stable)

6 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d1134ca5b1a3 changeset: 38028:d1134ca5b1a3 user:Joerg Sonnenberger date:Sat May 12 23:44:08 2018 +0200 summary: notify: add option to include function names in the diff

D3643: localrepo: add docstring to _makedirstate to make it less likely to be removed

spectral 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/D3643 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git a/mercurial/localrepo.py

[Bug 5892] New: `hg showconfig ui.interactive` returns incorrect value

https://bz.mercurial-scm.org/show_bug.cgi?id=5892 Bug ID: 5892 Summary: `hg showconfig ui.interactive` returns incorrect value Product: Mercurial Version: default branch Hardware: PC OS: All Status: UNCONFIRMED

D3579: state: write the version number in plain text on top of state files

martinvonz added a comment. In https://phab.mercurial-scm.org/D3579#57298, @yuja wrote: > > mercurial/state.py:65: undefined name 'iv' > > mercurial/state.py:73: local variable 'version' is assigned to but never used > > Queued the fixes. Thanks! REPOSITORY rHG

mercurial@38027: 27 new changesets

27 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d9185fa1e868 changeset: 38001:d9185fa1e868 parent: 37999:514605777244 user:Gregory Szorc date:Sat May 12 10:53:53 2018 -0700 summary: contrib: remove fixpax.py

D3559: narrow: only wrap dirstate functions once, instead of per-reposetup

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1cba497491be: narrow: only wrap dirstate functions once, instead of per-reposetup (authored by spectral, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3559?vs=8744=8871#toc

D3559: narrow: only wrap dirstate functions once, instead of per-reposetup

yuja added a comment. Queued, thanks. > - a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -778,6 +778,9 @@ > > @repofilecache('dirstate') def dirstate(self): +return self._makedirstate() + +def _makedirstate(self): Can you add a docstring so we wouldn't

Re: D3559: narrow: only wrap dirstate functions once, instead of per-reposetup

Queued, thanks. > --- a/mercurial/localrepo.py > +++ b/mercurial/localrepo.py > @@ -778,6 +778,9 @@ > > @repofilecache('dirstate') > def dirstate(self): > +return self._makedirstate() > + > +def _makedirstate(self): Can you add a docstring so we wouldn't remove this

D3640: state: fix usage of an unassigned variable

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbdc4079ceb16: state: fix usage of an unassigned variable (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3640?vs=8862=8869

Re: D3579: state: write the version number in plain text on top of state files

> mercurial/state.py:65: undefined name 'iv' > mercurial/state.py:73: local variable 'version' is assigned to but never used Queued the fixes. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D3641: state: temporary silence pyflakes warning by removing variable assignment

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb7e5c53a779e: state: temporary silence pyflakes warning by removing variable assignment (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] export: add -B option to select a bookmark

On Tue, 22 May 2018 09:30:39 +0200, David Demelier wrote: > On Mon, 2018-05-14 at 21:16 +0900, Yuya Nishihara wrote: > > FWIW, stripbmrevset() will have to be moved somewhere. Maybe scmutil? > > Yes when we will find an appropriate name. Anyone has idea? > > Few ideas: > > scmutil.brevset >

[PATCH] githelp: do not concatenate i18n messages dynamically so they can be collected

# HG changeset patch # User Yuya Nishihara # Date 1526989422 -32400 # Tue May 22 20:43:42 2018 +0900 # Node ID 4640b4e1027f5060caa11e7eb23c2524a9a354c4 # Parent 6ef01102ebfff6e1fdfa54bff6ebaebe27e37b7b githelp: do not concatenate i18n messages dynamically so they can be

D3556: run-tests: update the test case name format

lothiraldan added a comment. I fixed the issue, it was a last minute style fix that turns out to not be equivalent to the previous code. Anyway, here is the updated version that was rebased on top of hg-commited. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 2 of 2 STABLE] httppeer: declare 'dgb' at the function level

On Mon, 21 May 2018 16:40:07 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1526908486 -7200 > # Mon May 21 15:14:46 2018 +0200 > # Branch stable > # Node ID 06458d4a1ca84506d04280052d0288221b2701f0 > # Parent

D3556: run-tests: update the test case name format

lothiraldan updated this revision to Diff 8868. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3556?vs=8678=8868 REVISION DETAIL https://phab.mercurial-scm.org/D3556 AFFECTED FILES tests/run-tests.py tests/test-run-tests.t CHANGE DETAILS diff

D3555: run-tests: add support for running specific test cases

lothiraldan updated this revision to Diff 8867. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3555?vs=8677=8867 REVISION DETAIL https://phab.mercurial-scm.org/D3555 AFFECTED FILES tests/run-tests.py tests/test-run-tests.t CHANGE DETAILS diff

D3635: py3: add support for NoneType in stringutil.pprint()

yuja added a comment. >> --- a/mercurial/utils/stringutil.py > > +++ b/mercurial/utils/stringutil.py > > @@ -29,6 +29,8 @@ > > if bprefix: > > return "b'%s'" % escapestr(o) > > return "'%s'" % escapestr(o) > > +elif o is None: > > +

Re: D3635: py3: add support for NoneType in stringutil.pprint()

> > --- a/mercurial/utils/stringutil.py > > +++ b/mercurial/utils/stringutil.py > > @@ -29,6 +29,8 @@ > > if bprefix: > > return "b'%s'" % escapestr(o) > > return "'%s'" % escapestr(o) > > +elif o is None: > > +return 'None' > > Should be handled by

Re: D3635: py3: add support for NoneType in stringutil.pprint()

> --- a/mercurial/utils/stringutil.py > +++ b/mercurial/utils/stringutil.py > @@ -29,6 +29,8 @@ > if bprefix: > return "b'%s'" % escapestr(o) > return "'%s'" % escapestr(o) > +elif o is None: > +return 'None' Should be handled by `b'%r' % o`.

D3635: py3: add support for NoneType in stringutil.pprint()

yuja added a comment. > - a/mercurial/utils/stringutil.py +++ b/mercurial/utils/stringutil.py @@ -29,6 +29,8 @@ if bprefix: return "b'%s'" % escapestr(o) return "'%s'" % escapestr(o) +elif o is None: +return 'None' Should be handled by `b'%r' % o`. REPOSITORY rHG

Re: D3631: py3: use pycompat.fsencode to convert path to bytes

> --- a/contrib/hg-ssh > +++ b/contrib/hg-ssh > @@ -39,6 +39,7 @@ > > from mercurial import ( > dispatch, > +pycompat, > ui as uimod, > ) > > @@ -69,7 +70,7 @@ > path = cmdargv[2] > repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) >

D3631: py3: use pycompat.fsencode to convert path to bytes

yuja added a comment. > - a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -39,6 +39,7 @@ > > from mercurial import ( dispatch, +pycompat, ui as uimod, ) > > @@ -69,7 +70,7 @@ path = cmdargv[2] repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) if repo in

D3637: py3: add b'' prefixes in tests/test-revset2.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdbea87a2d7e8: py3: add b prefixes in tests/test-revset2.t (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3637?vs=8845=8866

D3642: py3: use encoding.strfromlocal() instead of pycompat.sysstr()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd6d939a3676f: py3: use encoding.strfromlocal() instead of pycompat.sysstr() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: D3579: state: write the version number in plain text on top of state files

> -def save(self, data): > +def save(self, version, data): > """write all the state data stored to .hg/ file > > we use third-party library cbor to serialize data to write in the > file. > """ > +if not isinstance(version, int): > +raise

D3579: state: write the version number in plain text on top of state files

yuja added a comment. > - def save(self, data): +def save(self, version, data): """write all the state data stored to .hg/ file > > we use third-party library cbor to serialize data to write in the file. """ +if not isinstance(version, int): +raise

Re: D3636: py3: use pycompat.fsencode() to convert user value to bytes

On Sun, 20 May 2018 13:40:10 +, pulkit (Pulkit Goyal) wrote: > --- a/mercurial/debugcommands.py > +++ b/mercurial/debugcommands.py > @@ -1400,7 +1400,7 @@ > try: > st = vfs.lstat(name) > age = now - st[stat.ST_MTIME] > -user =

Re: [PATCH V2] tests: stabilize test-patch.t on Windows

On Mon, 21 May 2018 21:45:42 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526871918 14400 > # Sun May 20 23:05:18 2018 -0400 > # Node ID 589535dae225b24312ef6d86a54865314a9acebd > # Parent

Re: [PATCH 1 of 5] githelp: fail gracefully in a couple cases where arguments are missing

On Tue, May 22, 2018 at 8:47 AM Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526956335 14400 > # Mon May 21 22:32:15 2018 -0400 > # Node ID a34bed7475cc8237665aa8a3febc1237a090bc20 > # Parent

Re: [PATCH 3 of 5] githelp: make several strings localizable

On Tue, May 22, 2018 at 8:47 AM Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526957717 14400 > # Mon May 21 22:55:17 2018 -0400 > # Node ID d00bfbf24df05e8b8e21acf1444ea24f265a6123 > # Parent

Re: [PATCH 1 of 6] revlog: in _getcandidaterevs, shorten revlog._generaldelta to gdelta

On 22/05/18 01:12, Gregory Szorc wrote: > On Mon, May 21, 2018 at 2:47 PM, Paul Morelle > > wrote: > > # HG changeset patch > # User Paul Morelle > > # Date

[PATCH 2 of 2 V2] revlog: make chainbase cache its result for the correct revision

# HG changeset patch # User Paul Morelle # Date 1524324477 -7200 # Sat Apr 21 17:27:57 2018 +0200 # Node ID 787f2b0636c6d6f44235dcd8436f6d8fc5f1a6cb # Parent c0ac96176ebefaf19cd2d368281c180c575c31f2 # EXP-Topic semi-snapshots # Available At

[PATCH 1 of 2 V2] revlog: make getcandidaterevs more consistent about updating tested revs set

# HG changeset patch # User Paul Morelle # Date 1520417422 -3600 # Wed Mar 07 11:10:22 2018 +0100 # Node ID c0ac96176ebefaf19cd2d368281c180c575c31f2 # Parent 90e02bd8c4473fec03639f26f3d1b2d30d9861d3 # EXP-Topic semi-snapshots # Available At

Re: [PATCH] export: add -B option to select a bookmark

On Mon, 2018-05-14 at 21:16 +0900, Yuya Nishihara wrote: > FWIW, stripbmrevset() will have to be moved somewhere. Maybe scmutil? Yes when we will find an appropriate name. Anyone has idea? Few ideas: scmutil.brevset scmutil.bmrevset scmutil.bookmarkrevset Regards, -- David