Re: [PATCH 4 of 5] templater: use named function to named template against mapping dict (API)

2018-03-17 Thread Yuya Nishihara
On Sun, 18 Mar 2018 05:45:30 +, Martin von Zweigbergk wrote: > On Sat, Mar 17, 2018 at 9:39 PM Yuya Nishihara wrote: > > > diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py > > --- a/mercurial/hgweb/webutil.py > > +++ b/mercurial/hgweb/webutil.py > > @@

Re: [PATCH 4 of 5] templater: use named function to named template against mapping dict (API)

2018-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Sat, Mar 17, 2018 at 9:39 PM Yuya Nishihara wrote: > diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py > --- a/mercurial/hgweb/webutil.py > +++ b/mercurial/hgweb/webutil.py > @@ -243,12 +243,18 @@ def nodebranchnodefault(ctx): > return branches > > def

Re: [PATCH 4 of 5] templater: use named function to named template against mapping dict (API)

2018-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Sat, Mar 17, 2018 at 9:46 PM Yuya Nishihara wrote: > On Sun, 18 Mar 2018 13:39:40 +0900, Yuya Nishihara wrote: > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1521203972 -32400 > > # Fri Mar 16 21:39:32 2018 +0900 > > # Node ID

[PATCH 2 of 5] templater: rename .render(mapping) to .renderdefault(mapping) (API)

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521253384 -32400 # Sat Mar 17 11:23:04 2018 +0900 # Node ID 3cc6b81c3c742e32662b35c74ccc81e1950c5ecb # Parent 8d89720b2d9c819d3357c4c82e31fb7eceb79e66 templater: rename .render(mapping) to .renderdefault(mapping) (API) I'm

[PATCH 4 of 5] templater: use named function to named template against mapping dict (API)

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521203972 -32400 # Fri Mar 16 21:39:32 2018 +0900 # Node ID 73de63e4c72042110b744e0838556421c7acaba8 # Parent 38286983261c9f01bb71cd7994033cd3f96e8d38 templater: use named function to named template against mapping dict (API)

[PATCH 1 of 5] templater: fix invalid reference of runsymbol in doctest

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521267734 -32400 # Sat Mar 17 15:22:14 2018 +0900 # Node ID 8d89720b2d9c819d3357c4c82e31fb7eceb79e66 # Parent a81427a2726fb71ae6cfbb5501734f69b7866aea templater: fix invalid reference of runsymbol in doctest Oversight at

[PATCH] cmdutil: drop redundant import of merge module

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521345243 -32400 # Sun Mar 18 12:54:03 2018 +0900 # Node ID a81427a2726fb71ae6cfbb5501734f69b7866aea # Parent 395f0824cb28c050ab650011c95a514c750f6400 cmdutil: drop redundant import of merge module diff --git

[PATCH 3 of 5] templater: factor out helper that renders named template as string

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521203052 -32400 # Fri Mar 16 21:24:12 2018 +0900 # Node ID 38286983261c9f01bb71cd7994033cd3f96e8d38 # Parent 3cc6b81c3c742e32662b35c74ccc81e1950c5ecb templater: factor out helper that renders named template as string This

mercurial@36978: new changeset

2018-03-17 Thread Mercurial Commits
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c479692690ef changeset: 36978:c479692690ef bookmark:@ tag: tip parent: 36977:a82fc3922446 parent: 36845:ff2370a70fe8 user:Augie Fackler date:Sat Mar 17 21:46:17 2018

[PATCH 3 of 3 V2] annotate: pack line content into annotateline object (API)

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1521343699 -32400 # Sun Mar 18 12:28:19 2018 +0900 # Node ID 395f0824cb28c050ab650011c95a514c750f6400 # Parent edba0c7df0a076dc383824f39c3ec16a0849b189 annotate: pack line content into annotateline object (API) Just for code

[PATCH 1 of 3 V2] annotate: do not construct attr.s object per line while computing history

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520855110 -32400 # Mon Mar 12 20:45:10 2018 +0900 # Node ID 2d8154d8b27e0452aee52f45d48370c7ca9f837b # Parent 66e64681e0a8ccbf3576d99ceb51f7259e352689 annotate: do not construct attr.s object per line while computing history

[PATCH 2 of 3 V2] annotate: drop linenumber flag from fctx.annotate() (API)

2018-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520947086 -32400 # Tue Mar 13 22:18:06 2018 +0900 # Node ID edba0c7df0a076dc383824f39c3ec16a0849b189 # Parent 2d8154d8b27e0452aee52f45d48370c7ca9f837b annotate: drop linenumber flag from fctx.annotate() (API) Now

mercurial@36977: 3 new changesets

2018-03-17 Thread Mercurial Commits
3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/795eb53f1d3e changeset: 36975:795eb53f1d3e user:Martin von Zweigbergk date:Thu Mar 15 13:19:55 2018 -0700 summary: rebase: allow in-memory merge of the working copy parent

D2676: tests: stop over-specifying tempfile name

2018-03-17 Thread durin42 (Augie Fackler)
durin42 added a comment. Friendly ping. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2676 To: durin42, pulkit, #hg-reviewers Cc: indygreg, mercurial-devel ___ Mercurial-devel mailing list

D2676: tests: stop over-specifying tempfile name

2018-03-17 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 7096. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2676?vs=6732=7096 REVISION DETAIL https://phab.mercurial-scm.org/D2676 AFFECTED FILES contrib/python3-whitelist tests/test-merge-tools.t CHANGE DETAILS

D2876: rebase: allow in-memory merge of the working copy parent

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG795eb53f1d3e: rebase: allow in-memory merge of the working copy parent (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2882: hgweb: convert an assert to a ProgrammingError

2018-03-17 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa82fc3922446: hgweb: convert an assert to a ProgrammingError (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2886: filemerge: give some variables in _xmerge more descriptive names

2018-03-17 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa4a95bd7158d: filemerge: give some variables in _xmerge more descriptive names (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[Bug 5824] New: Bugbot should only mark bugs TESTING if listed in the summary

2018-03-17 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5824 Bug ID: 5824 Summary: Bugbot should only mark bugs TESTING if listed in the summary Product: Mercurial project Version: unspecified Hardware: All OS: All

mercurial@36974: 63 new changesets

2018-03-17 Thread Mercurial Commits
63 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/543afbdc8e59 changeset: 36912:543afbdc8e59 user:Yuya Nishihara date:Thu Mar 08 22:20:36 2018 +0900 summary: templater: move function table to the "context" object

D2729: copyfile: preserve stat info (mtime, etc.) when doing copies/renames

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D2729#45787, @spectral wrote: > In https://phab.mercurial-scm.org/D2729#45664, @indygreg wrote: > > > I'm sorry, but we cannot ship this as is. > > > > The reason is mtime based build systems, like GNU make. > > > >

D2891: uncommit: simplify condition for keeping commit

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6c263f319e89: uncommit: simplify condition for keeping commit (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2890: uncommit: document when the commit will be pruned

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4cfa249f9e23: uncommit: document when the commit will be pruned (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

mercurial@36911: 12 new changesets

2018-03-17 Thread Mercurial Commits
12 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/219b23359f4c changeset: 36900:219b23359f4c user:Gregory Szorc date:Sun Mar 11 15:33:56 2018 -0700 summary: hgweb: support constructing URLs from an alternate base URL

D2890: uncommit: document when the commit will be pruned

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D2890 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS diff --git

D2891: uncommit: simplify condition for keeping commit

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We used to keep the commit if it would have become empty and --keep was not passed. Since we just changed it so we also keep it if any patterns were passed

mercurial@36899: 14 new changesets

2018-03-17 Thread Mercurial Commits
14 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/563fd95a6efb changeset: 36886:563fd95a6efb user:Gregory Szorc date:Sat Mar 10 19:57:08 2018 -0800 summary: hgweb: pass modern request type into various webutil functions

D2816: hgweb: remove unused **map argument

2018-03-17 Thread yuja (Yuya Nishihara)
yuja added a comment. For the record, `**map` was necessary to be an old-style template keyword function, which takes all properties passed to `tmpl()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2816 To: indygreg, #hg-reviewers, durin42 Cc: yuja,

D2815: hgweb: extract entries() to standalone function

2018-03-17 Thread yuja (Yuya Nishihara)
yuja added a comment. > Essentially, the inline function was being executed with default arguments > because a function reference was passed as-is into the templater. That > seemed odd. So now we pass an explicit generator of the function > result. This move is wrong because a

D2862: uncommit: leave empty commit if all files are uncommitted

2018-03-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG29b9325d7f4d: uncommit: leave empty commit if all files are uncommitted (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2862: uncommit: leave empty commit if all files are uncommitted

2018-03-17 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Queuing this many thanks. Can you please send a followup with documenting the behavior of command related to pruning the empty changeset? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2862 To: martinvonz, #hg-reviewers, durham, ryanmce

Re: [PATCH 1 of 3] test-template-engine: deduplicate methods of custom template engine

2018-03-17 Thread Pulkit Goyal
On Fri, Mar 16, 2018 at 9:32 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521112254 -32400 > # Thu Mar 15 20:10:54 2018 +0900 > # Node ID a305e7f025b030a74ca178f722e7502d6c012d6a > # Parent