D8786: templater: make templatepaths() return a single path, or None

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8786 AFFECTED FILES mercurial/debugcommands.py

D8788: hgweb: simplify now that we always have a single path

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Both `templatedir()` and `web.templatepath` are now always a single path (or None). REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8787: templater: simplify stylemap() now that templatedir() returns a single path

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8787 AFFECTED FILES mercurial/templater.py CHANGE DETAILS diff --git

D8785: templater: simplify templatepaths() to avoid iterating a singleton list

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The function iterates over a hard-coded list of one element since d844e220792a

[Bug 6382] New: Ctrl-c at the "wrong" time can cause corrupted evolvestate file

https://bz.mercurial-scm.org/show_bug.cgi?id=6382 Bug ID: 6382 Summary: Ctrl-c at the "wrong" time can cause corrupted evolvestate file Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS

D8784: tags: adjust file node cache to have space for 32 bytes node ids

joerg.sonnenberger created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The .hgtags processing uses two different caches. The first cache is essentially a global version of all .hgtags files and a textual format without

D8783: storageutil: allow modern hash sizes for fileids

joerg.sonnenberger created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8783 AFFECTED FILES mercurial/utils/storageutil.py CHANGE DETAILS

D8782: tests: make flag parsing test more future safe

joerg.sonnenberger created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The revlog format contains a number of feature flags, e.g. if general deltas are active. When testing that unknown flags are rejected, use bits

mercurial@45185: 13 new changesets (5 on stable)

13 new changesets (5 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/2bc5d1531235 changeset: 45173:2bc5d1531235 user:Yuya Nishihara date:Sun Jul 19 17:24:16 2020 +0900 summary: revlog: fix excessive decref on tuple creation failure in parse_index2()

D8781: infinitepush: fix `{get,put}_args` formatting on Python 3

sheehan created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Calling `.format()` on a byte-string does not work, thus causing an exception on Python 3. This commit adds a function to paper over the difference.

D8780: infinitepush: replace `NamedTemporaryFile` with `pycompat.namedtempfile`

sheehan created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Fixes a Python 3 compat error when using the external bundle store. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL

mercurial@45172: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/04c428e93770 changeset: 45172:04c428e93770 bookmark:@ tag: tip user:Manuel Jacob date:Mon Jul 20 17:38:01 2020 +0200 summary: tests: correctly match clang-format version >= 10 -- Repository

Re: [PATCH STABLE] chgserver: discard buffered output before restoring fds (issue6207)

queued for stable, thanks > On Jul 21, 2020, at 08:42, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1595244684 -32400 > # Mon Jul 20 20:31:24 2020 +0900 > # Branch stable > # Node ID 88f93fc8cb3263a3c10143557cb9626dfcf23f4c > # Parent

Re: [PATCH STABLE] hghave: fix possible int('') in has_clang_format()

queued for stable, thanks > On Jul 21, 2020, at 08:56, Manuel Jacob wrote: > > On 2020-07-21 14:44, Yuya Nishihara wrote: >> # HG changeset patch >> # User Yuya Nishihara >> # Date 1595332145 -32400 >> # Tue Jul 21 20:49:05 2020 +0900 >> # Branch stable >> # Node ID

D8777: rhg: Ask the error message from `CommandError`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Avoid repeating the display part of the same error in different commands. For example, a lot of commands while use the `FindRoot` `Operation`, rather than

D8778: rhg: add a `Files` `Command` to prepare the `rhg files` subcommand

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8778 AFFECTED FILES rust/rhg/src/commands.rs rust/rhg/src/commands/files.rs

D8779: rhg: add a limited `rhg files` subcommand

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8779 AFFECTED FILES rust/rhg/src/main.rs CHANGE DETAILS diff --git

D8776: rhg: Do not return error when when we really mean ok in commands

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before when a command was successfull `Err(CommandErrorKind::Ok.into())` was returned which is an oxymoron. Using `Ok(())` when everything is ok seems more

D8775: hg-core: implement `Operation` for `ListTrackedFiles`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Use `parse_dirstate` to list the files tracked in the working directory. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8774: hg-core: make parse_dirstate return result rather than update inplace

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Return a vec rather than updating a hashmap which is faster when then hashmap is not needed like in `hg files` which just list tracked files. REPOSITORY rHG

D8773: hg-core: define a `ListTrackedFiles` `Operation`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY List files under Mercurial control in the working directory by reading the dirstate at .hg/dirstate. REPOSITORY rHG Mercurial BRANCH default REVISION

D8772: localrepo: abort creating a shared repo if the source does not have store

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We cannot create a shared repository without a store IIUC. Let's abort in such cases. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

Re: [PATCH STABLE] hghave: fix possible int('') in has_clang_format()

On 2020-07-21 14:44, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1595332145 -32400 # Tue Jul 21 20:49:05 2020 +0900 # Branch stable # Node ID 31be0ead4581fab624902b53b4a4d2c1d9a8c82a # Parent 88f93fc8cb3263a3c10143557cb9626dfcf23f4c hghave: fix possible int('')

[PATCH STABLE] hghave: fix possible int('') in has_clang_format()

# HG changeset patch # User Yuya Nishihara # Date 1595332145 -32400 # Tue Jul 21 20:49:05 2020 +0900 # Branch stable # Node ID 31be0ead4581fab624902b53b4a4d2c1d9a8c82a # Parent 88f93fc8cb3263a3c10143557cb9626dfcf23f4c hghave: fix possible int('') in has_clang_format() diff --git

[PATCH STABLE] chgserver: discard buffered output before restoring fds (issue6207)

# HG changeset patch # User Yuya Nishihara # Date 1595244684 -32400 # Mon Jul 20 20:31:24 2020 +0900 # Branch stable # Node ID 88f93fc8cb3263a3c10143557cb9626dfcf23f4c # Parent f91f0dfccf9b0a928e22bf0041b310712c93903c chgserver: discard buffered output before restoring fds (issue6207) On

[Bug 6381] New: histedit should inform hg summary about its plan and current state

https://bz.mercurial-scm.org/show_bug.cgi?id=6381 Bug ID: 6381 Summary: histedit should inform hg summary about its plan and current state Product: Mercurial Version: stable branch Hardware: PC OS: Linux

[Bug 6380] New: histedit should give more information when a merge conflict is encountered

https://bz.mercurial-scm.org/show_bug.cgi?id=6380 Bug ID: 6380 Summary: histedit should give more information when a merge conflict is encountered Product: Mercurial Version: stable branch Hardware: PC OS:

[Bug 6379] New: editmerge should be an internal tool

https://bz.mercurial-scm.org/show_bug.cgi?id=6379 Bug ID: 6379 Summary: editmerge should be an internal tool Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

[Bug 6378] New: hg summary should give more details about in progress evolution

https://bz.mercurial-scm.org/show_bug.cgi?id=6378 Bug ID: 6378 Summary: hg summary should give more details about in progress evolution Product: Mercurial Version: stable branch Hardware: PC OS: Linux

D8771: localrepo: only use BOOKMARKS_IN_STORE_REQUIRMENT is we have a store

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This adds check that if we are using store and if we are not, we skip adding the BOOKMARKS_IN_STORE_REQUIREMENT. REPOSITORY rHG Mercurial BRANCH default

mercurial@45171: 23 new changesets

23 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/87047efbc6a6 changeset: 45149:87047efbc6a6 user:Augie Fackler date:Wed Apr 01 08:42:00 2020 -0500 summary: debugcommands: create new debugantivirusrunning command

Re: Proposal for cleaning up error reporting

On Thu, Jul 16, 2020 at 9:09 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > The first time I saw this proposal I though: > > - That is a great idea, I have been unhappy about these return for a > long time - The backward compatibility breakage implication might be huge. We >