Re: [PATCH V2] context: name files relative to cwd in warning messages

2017-07-15 Thread Yuya Nishihara
On Sat, 15 Jul 2017 00:27:53 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1499748029 14400 > # Tue Jul 11 00:40:29 2017 -0400 > # Node ID c2549b5ffd77029d78ef92d8fb5cd5b5bdbbb254 > # Parent

Re: [PATCH] run-tests: disable color on Windows

2017-07-15 Thread Yuya Nishihara
On Sat, 15 Jul 2017 00:55:13 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1500094356 14400 > # Sat Jul 15 00:52:36 2017 -0400 > # Node ID 00e59d5ca0a7c5610695250a7955615ef49138ee > # Parent

Re: [PATCH 2 of 2] commandserver: use selector2

2017-07-15 Thread Yuya Nishihara
On Fri, 14 Jul 2017 21:18:48 -0700, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-07-15 12:37:39 +0900: > > On Fri, 14 Jul 2017 20:27:27 -0700, Jun Wu wrote: > > > # HG changeset patch > > > # User Jun Wu > > > # Date 1500089181 25200 > > > # Fri Jul 14

[Differential] [Request, 92 lines] D92: drawdag: include files from both parents in merge commits

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Consider a graph like this: D |\ B C |/ A drawdag will add a file called A in commit A, file B in B, file C in C. That's fine and

[Differential] [Request, 5 lines] D93: tests: simplify config in test-rebase-detach.t

2017-07-15 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/D93 AFFECTED FILES tests/test-rebase-detach.t CHANGE DETAILS Index: tests/test-rebase-detach.t

[Differential] [Request, 537 lines] D94: tests: rewrite test-rebase-detach.t using drawdag

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes it much clearer because each test case can have exactly the graph it wants (no extra cruft just because other tests want it). REPOSITORY rHG

Re: [PATCH] templates: add substring and string length operations

2017-07-15 Thread Yuya Nishihara
On Fri, 14 Jul 2017 20:40:36 -0700, Martin von Zweigbergk wrote: > On Jul 14, 2017 8:19 PM, "Yuya Nishihara" wrote: > > On Fri, 14 Jul 2017 19:50:34 -0700, Rodrigo Damazio wrote: > > > On Fri, 14 Jul 2017 16:27:49 -0700, Rodrigo Damazio via Mercurial-devel > > > >

[PATCH 09 of 10] bookmark: deprecate direct set of a bookmark value

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499716054 -7200 # Mon Jul 10 21:47:34 2017 +0200 # Node ID 381e25bcfa028238ac3c27c30b7cc36f90ef2b60 # Parent a041b7fd158ab0a5dda7ef970aa0a238103e896b # EXP-Topic tr.changes.bookmarks bookmark: deprecate direct set of a

[PATCH 01 of 10] bookmark: remove a useless 'recordchange' in the amend code

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499701713 -7200 # Mon Jul 10 17:48:33 2017 +0200 # Node ID 982526b815da34df7d0335b246afcbe48df3d112 # Parent 1adcb594eb6b075a9f3b676a1da5b56ed9e2a2ae # EXP-Topic tr.changes.bookmarks bookmark: remove a useless

[PATCH 04 of 10] bookmark: use 'divergent2delete' when updating a bookmark

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499706745 -7200 # Mon Jul 10 19:12:25 2017 +0200 # Node ID 08c2a3d309e8619e0cc3ec16c4ae02722b9a1118 # Parent 2cb988ee601bd857ed1fe29d1cc36acf1617ac5f # EXP-Topic tr.changes.bookmarks bookmark: use 'divergent2delete' when

[PATCH 08 of 10] bookmark: track bookmark changes at the transaction level

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499711213 -7200 # Mon Jul 10 20:26:53 2017 +0200 # Node ID a041b7fd158ab0a5dda7ef970aa0a238103e896b # Parent 94da61e581672f5c9616f1ad1336cfaadbdc96a9 # EXP-Topic tr.changes.bookmarks bookmark: track bookmark changes at

[PATCH 05 of 10] bookmark: use 'divergent2delete' in checkconflict

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499709752 -7200 # Mon Jul 10 20:02:32 2017 +0200 # Node ID 3c70ad3b3daaeb8b2386b9d8760ac69e6dce0ecc # Parent 08c2a3d309e8619e0cc3ec16c4ae02722b9a1118 # EXP-Topic tr.changes.bookmarks bookmark: use 'divergent2delete' in

[PATCH 07 of 10] bookmark: deprecate 'recordchange' in favor of 'applychanges'

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499710203 -7200 # Mon Jul 10 20:10:03 2017 +0200 # Node ID 94da61e581672f5c9616f1ad1336cfaadbdc96a9 # Parent d8f4f481d22c4fd4b606c2635c9b2f0fada67e8c # EXP-Topic tr.changes.bookmarks bookmark: deprecate 'recordchange' in

[PATCH 02 of 10] bookmark: split out target computation from 'deletedivergent'

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499706497 -7200 # Mon Jul 10 19:08:17 2017 +0200 # Node ID 95035db0c9c8e55bf75165d098e38286784e4a6c # Parent 982526b815da34df7d0335b246afcbe48df3d112 # EXP-Topic tr.changes.bookmarks bookmark: split out target

[PATCH 10 of 10] bookmark: deprecate direct del of a bookmark value

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499716177 -7200 # Mon Jul 10 21:49:37 2017 +0200 # Node ID 0175d9abed800cfc4efc7831f7db8c22b68ef1af # Parent 381e25bcfa028238ac3c27c30b7cc36f90ef2b60 # EXP-Topic tr.changes.bookmarks bookmark: deprecate direct del of a

[PATCH 06 of 10] bookmark: drop deletedivergent

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499709975 -7200 # Mon Jul 10 20:06:15 2017 +0200 # Node ID d8f4f481d22c4fd4b606c2635c9b2f0fada67e8c # Parent 3c70ad3b3daaeb8b2386b9d8760ac69e6dce0ecc # EXP-Topic tr.changes.bookmarks bookmark: drop deletedivergent It

[PATCH 03 of 10] bookmark: use 'divergent2delete' in 'scmutil.cleanupnode'

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1499706613 -7200 # Mon Jul 10 19:10:13 2017 +0200 # Node ID 2cb988ee601bd857ed1fe29d1cc36acf1617ac5f # Parent 95035db0c9c8e55bf75165d098e38286784e4a6c # EXP-Topic tr.changes.bookmarks bookmark: use 'divergent2delete' in

Re: [PATCH 1 of 2] selector2: vendor selector2 library

2017-07-15 Thread Yuya Nishihara
On Fri, 14 Jul 2017 20:27:26 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1500088786 25200 > # Fri Jul 14 20:19:46 2017 -0700 > # Node ID 5664763de82b48ca6882bbb624d01d467b4920d0 > # Parent 0407a51b9d8c3ade36b6495f44897c7a70e20975 > # Available At

Re: Experimenting with Phabricator for reviews

2017-07-15 Thread Augie Fackler
> On Jul 14, 2017, at 7:30 PM, Sean Farley wrote: > > > Jun Wu writes: > >> Excerpts from Sean Farley's message of 2017-07-14 16:26:34 -0700: >>> Huh? But that's the thing, isn't it? Previously, comments about code >>> review are on the list. One can peruse them

[Differential] [Accepted] D93: tests: simplify config in test-rebase-detach.t

2017-07-15 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. Nice! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D93 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel

Re: [PATCH 2 of 2] commandserver: use selector2

2017-07-15 Thread Sean Farley
Yuya Nishihara writes: > On Fri, 14 Jul 2017 21:18:48 -0700, Jun Wu wrote: >> Excerpts from Yuya Nishihara's message of 2017-07-15 12:37:39 +0900: >> > On Fri, 14 Jul 2017 20:27:27 -0700, Jun Wu wrote: >> > > # HG changeset patch >> > > # User Jun Wu >> > > # Date

[PATCH 8 of 9] extensions: expand the builtins extensions declaration

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1500121014 -7200 # Sat Jul 15 14:16:54 2017 +0200 # Node ID f170c4ba9c21f40248b83b511e064474080a0060 # Parent 07c4317cc5f9e3ae8d357c7013743a07227eb89f # EXP-Topic cleanup.color extensions: expand the builtins extensions

[PATCH 7 of 9] debugextensions: drop the color from the test

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1500143512 -7200 # Sat Jul 15 20:31:52 2017 +0200 # Node ID 07c4317cc5f9e3ae8d357c7013743a07227eb89f # Parent 0320a1820f8fcea0709ded92b788ffdb438f1e20 # EXP-Topic cleanup.color debugextensions: drop the color from the

[PATCH 9 of 9] color: drop the now useless color extension

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1500121055 -7200 # Sat Jul 15 14:17:35 2017 +0200 # Node ID bb3703129b5035a162fd8ad8eee364295b9ce9d0 # Parent f170c4ba9c21f40248b83b511e064474080a0060 # EXP-Topic cleanup.color color: drop the now useless color extension

[PATCH 2 of 9] configitems: register the 'ui.forcecwd' config

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1498787085 -7200 # Fri Jun 30 03:44:45 2017 +0200 # Node ID 16b7d5ec9fb0e85e2f4a1f018f031439bc4500ab # Parent ffbd58343a63d0ddf02ba8d79ae52d216dc3fe83 # EXP-Topic config.register.ui configitems: register the 'ui.forcecwd'

[PATCH 3 of 9] color: drop the _enabledbydefault module variable

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1500120886 -7200 # Sat Jul 15 14:14:46 2017 +0200 # Node ID 151a6237b3445206b8547da91545bdc21a023bb9 # Parent 16b7d5ec9fb0e85e2f4a1f018f031439bc4500ab # EXP-Topic config.register.special-case color: drop the

[PATCH 4 of 9] configitems: register the 'ui.color' config

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1500120893 -7200 # Sat Jul 15 14:14:53 2017 +0200 # Node ID 789783a6db854e810b3381d2e0b9e4252238851c # Parent 151a6237b3445206b8547da91545bdc21a023bb9 # EXP-Topic config.register.special-case configitems: register the

[PATCH 1 of 9] configitems: register the 'ui.fallbackencoding' config

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1498787083 -7200 # Fri Jun 30 03:44:43 2017 +0200 # Node ID ffbd58343a63d0ddf02ba8d79ae52d216dc3fe83 # Parent 7008f6819002bc01bcc8626f2ff41af0949096c4 # EXP-Topic config.register.ui configitems: register the

[PATCH 5 of 9] configitems: register the 'ui.mergemarkertemplate' config

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1498787096 -7200 # Fri Jun 30 03:44:56 2017 +0200 # Node ID 6a5f9dfdcb30a627d914d4b9fdbe767231253288 # Parent 789783a6db854e810b3381d2e0b9e4252238851c # EXP-Topic config.register.special-case configitems: register the

[PATCH 6 of 9] configitems: register the 'bugzilla.notify' config

2017-07-15 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1498786213 -7200 # Fri Jun 30 03:30:13 2017 +0200 # Node ID 0320a1820f8fcea0709ded92b788ffdb438f1e20 # Parent 6a5f9dfdcb30a627d914d4b9fdbe767231253288 # EXP-Topic config.register.special-case configitems: register the

Re: [PATCH remotenames] locks: take wlock for file writes

2017-07-15 Thread Sean Farley
Durham Goode writes: > # HG changeset patch > # User Durham Goode > # Date 1500070111 25200 > # Fri Jul 14 15:08:31 2017 -0700 > # Node ID 1c7d5c611f3fb5ba790eca5ca9d41c3398ba730d > # Parent 75df1d072f09392fb0b7314c856fb9689daa7c91 > locks: take wlock for

Re: Potential BC changes to sparse before freeze

2017-07-15 Thread Gregory Szorc
On Tue, Jul 11, 2017 at 1:47 PM, Siddharth Agarwal wrote: > On 7/11/17 1:17 PM, Martin von Zweigbergk via Mercurial-devel wrote: > >> I think I'm against this. I think it's clearer that excludes trump >> includes if they appear after. Of course,*I* can continue to write it

Re: Potential BC changes to sparse before freeze

2017-07-15 Thread Sean Farley
Martin von Zweigbergk via Mercurial-devel writes: > On Tue, Jul 11, 2017 at 12:44 PM, Durham Goode wrote: >> >> >> On 7/11/17 11:01 AM, Gregory Szorc wrote: >>> >>> Durham, et al: >>> >>> 4.3 freeze is in a few days. While we have declared

Re: Potential BC changes to sparse before freeze

2017-07-15 Thread Gregory Szorc
On Sat, Jul 15, 2017 at 1:28 PM, Sean Farley wrote: > > Martin von Zweigbergk via Mercurial-devel scm.org> writes: > > > On Tue, Jul 11, 2017 at 12:44 PM, Durham Goode wrote: > >> > >> > >> On 7/11/17 11:01 AM, Gregory Szorc wrote: >

[Differential] [Request, 18 lines] D95: sparse: use set for capturing profiles

2017-07-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Order doesn't need to be preserved. A set is acceptable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D95 AFFECTED FILES

[Differential] [Request, 31 lines] D96: sparse: require [section] in sparse config files (BC)

2017-07-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, [include] was implicit and pattern lines before a [section] were added to includes. Because the format may change in the future and explicit

[PATCH] debugignore: eliminate inconsistencies with `hg status` (issue5222)

2017-07-15 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1500146609 14400 # Sat Jul 15 15:23:29 2017 -0400 # Node ID f836762f582c84040ca31be86b48e2768351e79d # Parent 27d23fe32887279db649eccae244f261452be7ac debugignore: eliminate inconsistencies with `hg status`

[Differential] [Commented On] D92: drawdag: include files from both parents in merge commits

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D92#1383, @quark wrote: > I think you can self-push these so I can rebase my work on top of it. I don't think I've ever pushed my own patches, so I'm not comfortable doing that for these either. > Otherwise we can

Re: Potential BC changes to sparse before freeze

2017-07-15 Thread Sean Farley
Gregory Szorc writes: > On Sat, Jul 15, 2017 at 1:28 PM, Sean Farley wrote: > >> >> Martin von Zweigbergk via Mercurial-devel > scm.org> writes: >> >> > On Tue, Jul 11, 2017 at 12:44 PM, Durham Goode wrote:

Re: Experimenting with Phabricator for reviews

2017-07-15 Thread Phillip Cohen
I think (and it seems like most people agree here) that we should take an axe to Phabricator's default e-mails and strip out the cruft. I don't think that'd be impossibly hard to do (says somebody about to go on PTO), either by YOLO patching the code for now or writing an extension, or just using

Re: [PATCH 04 of 14] obsstore: let read marker API take a range of offsets

2017-07-15 Thread Sean Farley
Boris Feld writes: > # HG changeset patch > # User Jun Wu > # Date 1496595729 25200 > # Sun Jun 04 10:02:09 2017 -0700 > # Node ID e73d330f6fdb0cf1635920f4302b61b321ec58e2 > # Parent ff2ebc11f12a26a4e0bda3ccf5fde63f5f690813 > # EXP-Topic obs-cache >

[Differential] [Commented On] D98: revset: support reading aliases from a .hgrevsets file

2017-07-15 Thread indygreg (Gregory Szorc)
indygreg added a comment. This should probably be considered an RFC patch, especially given how late in the cycle it is. I'm not opposed to punting this to the next cycle. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D98 EMAIL PREFERENCES

Re: Community video chats?

2017-07-15 Thread Phillip Cohen
I'll be on PTO in the mountains then (and I think Durham is in London, but he might still be able to attend), but I hope it goes well (and hopefully somebody takes notes :). On Sat, Jul 15, 2017 at 3:25 AM, Boris Feld wrote: > I've put a reminder in my calendar for 19pm

[Differential] [Updated, 535 lines] D94: tests: rewrite test-rebase-detach.t using drawdag

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 184. martinvonz marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D94?vs=178=184 REVISION DETAIL https://phab.mercurial-scm.org/D94 AFFECTED FILES tests/test-rebase-detach.t

[Differential] [Updated, 91 lines] D92: drawdag: include files from both parents in merge commits

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 183. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D92?vs=176=183 REVISION DETAIL https://phab.mercurial-scm.org/D92 AFFECTED FILES tests/drawdag.py tests/test-bundle-phases.t tests/test-drawdag.t

Re: [PATCH] Update README to discuss remote pull, rsync, and the hg repo

2017-07-15 Thread Matthieu Laneuville
Sorry about sending that patch, I misused 'hg email'. 2017-07-16 14:06 GMT+09:00 : > # HG changeset patch > # User m...@selenic.com > # Date 1115155633 28800 > # Tue May 03 13:27:13 2005 -0800 > # Node ID 273ce12ad8f155317b2c078ec75a4eba507f1fba > # Parent

Re: [PATCH] scmutil: remove duplicated import of i18n._()

2017-07-15 Thread Sean Farley
Yuya Nishihara writes: > # HG changeset patch > # User Yuya Nishihara > # Date 1500098489 -32400 > # Sat Jul 15 15:01:29 2017 +0900 > # Node ID e908d626523b83cba404d52ad6ed870eafe05bc3 > # Parent 15e6b9401135d5e5d71c40f4c4c6f83731ea944e > scmutil: remove

[PATCH] Update README to discuss remote pull, rsync, and the hg repo

2017-07-15 Thread mlaneuville
# HG changeset patch # User m...@selenic.com # Date 1115155633 28800 # Tue May 03 13:27:13 2005 -0800 # Node ID 273ce12ad8f155317b2c078ec75a4eba507f1fba # Parent 9117c6561b0bd7792fa13b50d28239d51b78e51f Update README to discuss remote pull, rsync, and the hg repo add a .hgignore file diff

[PATCH] run-tests: make sure to check if pygments is installed before using it

2017-07-15 Thread mlaneuville
# HG changeset patch # User Matthieu Laneuville # Date 1500181438 -32400 # Sun Jul 16 14:03:58 2017 +0900 # Node ID 97ec8637d261a97c30944d9242ee1ccdbf536cb3 # Parent 389536aff376d32d38f13305021c127245d4126a run-tests: make sure to check if pygments is

[Differential] [Request, 149 lines] D98: revset: support reading aliases from a .hgrevsets file

2017-07-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It is common for projects or companies to define/recommend common customizations for Mercurial. However, distributing these customizations can be difficult

[Differential] [Request, 10 lines] D97: revset: pass repo when passing ui

2017-07-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The repo instance is currently only used to provide a changeset lookup function as part of parsing revsets. I /think/ this allows node fragments to resolve.

Re: [PATCH 2 of 2] match: implement __repr__() and update users (API)

2017-07-15 Thread Matt Harbison
On Mon, 22 May 2017 14:22:33 -0400, Martin von Zweigbergk via Mercurial-devel wrote: # HG changeset patch # User Martin von Zweigbergk # Date 1495476498 25200 # Mon May 22 11:08:18 2017 -0700 # Node ID

[PATCH] test-phase-exchange: stabilize for Windows

2017-07-15 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1500176793 14400 # Sat Jul 15 23:46:33 2017 -0400 # Node ID 21904723f1ce9ea0fc6541ee48611ba3ef7128fb # Parent 389536aff376d32d38f13305021c127245d4126a test-phase-exchange: stabilize for Windows diff --git

[Differential] [Commented On] D94: tests: rewrite test-rebase-detach.t using drawdag

2017-07-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > quark wrote in test-rebase-detach.t:86 > This test case seems removable. The `--detach` option was added by > https://phab.mercurial-scm.org/rHG66d954e76ffb621a4a54aad3705bb28528b71da9, > and removed by >

[Differential] [Commented On] D92: drawdag: include files from both parents in merge commits

2017-07-15 Thread quark (Jun Wu)
quark added a comment. I think you can self-push these so I can rebase my work on top of it. Otherwise we can defer multi-dest feature to after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D92 EMAIL PREFERENCES