[PATCH 2 of 2] py3: replace str.format(x) with `str % x` in githelp

2018-05-23 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1527128700 14400 # Wed May 23 22:25:00 2018 -0400 # Node ID c3960c7e66fad7436f1a550ef1de693a635faa3a # Parent cfa93fbbe9b4ee98d66a7dc55cb0224c4cf03e9f py3: replace str.format(x) with `str % x` in githelp diff --git

[PATCH 1 of 2] githelp: drop the trailing period from single sentence output for consistency

2018-05-23 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1527128224 14400 # Wed May 23 22:17:04 2018 -0400 # Node ID cfa93fbbe9b4ee98d66a7dc55cb0224c4cf03e9f # Parent 53cc81a8caf6106ca0cb7ae1d67586236c3bf4fc githelp: drop the trailing period from single sentence output for

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

2018-05-23 Thread Gregory Szorc
On Tue, May 22, 2018 at 1:08 AM, Paul Morelle wrote: > > 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

Re: [PATCH 1 of 2 STABLE] lock: add internal config to not replace signal handlers while locking

2018-05-23 Thread Gregory Szorc
On Wed, May 23, 2018 at 7:46 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526646246 -32400 > # Fri May 18 21:24:06 2018 +0900 > # Branch stable > # Node ID d99bba4101af58e3e83dab60b644bb687794e6d9 > # Parent

Re: [PATCH 1 of 8] hgweb: wrap {entries}* of bookmarks with mappinggenerator

2018-05-23 Thread Gregory Szorc
On Mon, May 21, 2018 at 5:22 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1522840791 -32400 > # Wed Apr 04 20:19:51 2018 +0900 > # Node ID 56e8ac64a7a3d529a596778d16ffc442a87f96e6 > # Parent

how to import tags?

2018-05-23 Thread Hollis Blanchard
I run a mirror from Perforce into Mercurial. I use p4fastimport to do the actual conversion, but it doesn't handle P4's labels for me, so I have to look them up and commit them later. Also, my hg repositories are bare (no working directory). When I import tags, after the regular commits, I

[PATCH 1 of 2 STABLE] lock: add internal config to not replace signal handlers while locking

2018-05-23 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526646246 -32400 # Fri May 18 21:24:06 2018 +0900 # Branch stable # Node ID d99bba4101af58e3e83dab60b644bb687794e6d9 # Parent d46a38c07b1a2ba451e22e57aa22fd1308f2046f lock: add internal config to not replace signal handlers

[PATCH 2 of 2 STABLE] hgweb: do not try to replace signal handlers while locking

2018-05-23 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526646725 -32400 # Fri May 18 21:32:05 2018 +0900 # Branch stable # Node ID 4c0f3860696a150ad71d58ac9fdebe58963b9c64 # Parent d99bba4101af58e3e83dab60b644bb687794e6d9 hgweb: do not try to replace signal handlers while locking

D3648: show: Get rid of extraneous space if `tip` also has other bookmarks

2018-05-23 Thread yuja (Yuya Nishihara)
yuja added a comment. > -names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " ({label('log.{colorname}', join(names % "{ifeq(name, 'tip', '', name)}", ' '))})")}' > +names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " ({label('log.{colorname}', separate(names %

Re: D3648: show: Get rid of extraneous space if `tip` also has other bookmarks

2018-05-23 Thread Yuya Nishihara
> -names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " > ({label('log.{colorname}', join(names % "{ifeq(name, 'tip', '', name)}", ' > '))})")}' > +names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " > ({label('log.{colorname}', separate(names % "{ifeq(name, 'tip', '', name)}",

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

2018-05-23 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2b8cb0ab231c: localrepo: add docstring to _makedirstate to make it less likely to be removed (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3644: state: raise CorruptedState error isntead of ProgrammingError

2018-05-23 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGdce718404ce6: state: raise CorruptedState error isntead of ProgrammingError (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs

2018-05-23 Thread Yuya Nishihara
On Wed, 23 May 2018 10:48:58 +0200, David Demelier wrote: > # HG changeset patch > # User David Demelier > # Date 1526387741 -7200 > # Tue May 15 14:35:41 2018 +0200 > # Node ID 7f4a064834b8647f2986305cc5d8c0f5376e2340 > # Parent

Re: [PATCH] githelp: cleanup one more abort message

2018-05-23 Thread Yuya Nishihara
On Wed, 23 May 2018 00:00:19 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1527047288 14400 > # Tue May 22 23:48:08 2018 -0400 > # Node ID e951e2017229ef3e84bef144fb50546de058d93b > # Parent

[PATCH] scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs

2018-05-23 Thread David Demelier
# HG changeset patch # User David Demelier # Date 1526387741 -7200 # Tue May 15 14:35:41 2018 +0200 # Node ID 7f4a064834b8647f2986305cc5d8c0f5376e2340 # Parent 37ef6ee87488ac0095f8dedf75284f64d1d54455 scmutil: move repair.stripbmrevset as scmutil.bookmarkrevs diff -r

D3648: show: Get rid of extraneous space if `tip` also has other bookmarks

2018-05-23 Thread tom.prince (Tom Prince)
tom.prince 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/D3648 AFFECTED FILES mercurial/templates/map-cmdline.show CHANGE DETAILS diff --git

Re: [PATCH 5 of 5] githelp: lowercase the start of output messages for consistency

2018-05-23 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, May 21, 2018 at 8:17 PM Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526958268 14400 > # Mon May 21 23:04:28 2018 -0400 > # Node ID d6ecb77cc36283d5141cef8f87b014619322132a > # Parent