On Fri, 6 Jan 2017 21:29:43 -0500, Matt Harbison wrote:
> > On Jan 6, 2017, at 11:19 AM, Pierre-Yves David
> > wrote:
> >> On 01/04/2017 07:04 PM, Matt Harbison wrote:
> >> # HG changeset patch
> >> # User Matt Harbison
> >> # Date 1483550016 18000
> >> # Wed Jan 04 12:13:36 2017 -0500
> >>
> On Jan 6, 2017, at 11:19 AM, Pierre-Yves David
> wrote:
>
>
>
>> On 01/04/2017 07:04 PM, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison
>> # Date 1483550016 18000
>> # Wed Jan 04 12:13:36 2017 -0500
>> # Node ID 76d95ab94b9e206363629059fb7824002e19a9e5
>> # Paren
On 12/24/16 12:16 PM, Augie Fackler wrote:
(+martinvonz, durham for manifest questions)
On Sun, Dec 18, 2016 at 05:07:58PM -0800, Gregory Szorc wrote:
# HG changeset patch
# User Gregory Szorc
# Date 1482106614 28800
# Sun Dec 18 16:16:54 2016 -0800
# Node ID 8c7cd8a43f9e9b230bc125e57b80d
On Fri, Jan 06, 2017 at 11:36:32AM -0800, Sean Farley wrote:
> Gregory Szorc writes:
>
> > # HG changeset patch
> > # User Gregory Szorc
> > # Date 1483729033 28800
> > # Fri Jan 06 10:57:13 2017 -0800
> > # Node ID 1901566ab484a56b177b88ff080d635840e0912c
> > # Parent 3de9df6ee5bf7601aa38
Gregory Szorc writes:
> On Fri, Jan 6, 2017 at 11:48 AM, Sean Farley wrote:
>
>> Gregory Szorc writes:
>>
>> > On Fri, Jan 6, 2017 at 11:36 AM, Sean Farley wrote:
>> >
>> >> Gregory Szorc writes:
>> >>
>> >> > # HG changeset patch
>> >> > # User Gregory Szorc
>> >> > # Date 1483729033 28800
On Fri, Jan 6, 2017 at 11:48 AM, Sean Farley wrote:
> Gregory Szorc writes:
>
> > On Fri, Jan 6, 2017 at 11:36 AM, Sean Farley wrote:
> >
> >> Gregory Szorc writes:
> >>
> >> > # HG changeset patch
> >> > # User Gregory Szorc
> >> > # Date 1483729033 28800
> >> > # Fri Jan 06 10:57:13 20
https://bz.mercurial-scm.org/show_bug.cgi?id=5460
Bug ID: 5460
Summary: AttributeError: 'module' object has no attribute 'Cmd'
Product: Mercurial
Version: 3.7.3
Hardware: PC
OS: Linux
Status: UNCONFIRMED
S
Martin von Zweigbergk via Mercurial-devel
writes:
> Still only 9 people signed up. The signup table on the wiki only
> mentioned the weekend dates until just now, but I can't remember
> deciding that we only do it on Saturday to Sunday, so it's still
> presumably Friday to Sunday. The wiki is now
Gregory Szorc writes:
> On Fri, Jan 6, 2017 at 11:36 AM, Sean Farley wrote:
>
>> Gregory Szorc writes:
>>
>> > # HG changeset patch
>> > # User Gregory Szorc
>> > # Date 1483729033 28800
>> > # Fri Jan 06 10:57:13 2017 -0800
>> > # Node ID 1901566ab484a56b177b88ff080d635840e0912c
>> > # P
Still only 9 people signed up. The signup table on the wiki only
mentioned the weekend dates until just now, but I can't remember
deciding that we only do it on Saturday to Sunday, so it's still
presumably Friday to Sunday. The wiki is now updated accordingly, and
hopefully people's availability is
Pierre-Yves David writes:
> On 12/31/2016 10:45 PM, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley
>> # Date 1483220517 21600
>> # Sat Dec 31 15:41:57 2016 -0600
>> # Node ID e461e74f54822fef345ffb79bc806e32f03e93fe
>> # Parent bd762c3d68423f7fa9e5e2b97425ed7108e0b8fc
>>
On Fri, Jan 6, 2017 at 11:36 AM, Sean Farley wrote:
> Gregory Szorc writes:
>
> > # HG changeset patch
> > # User Gregory Szorc
> > # Date 1483729033 28800
> > # Fri Jan 06 10:57:13 2017 -0800
> > # Node ID 1901566ab484a56b177b88ff080d635840e0912c
> > # Parent 3de9df6ee5bf7601aa3870f18304
Gregory Szorc writes:
> # HG changeset patch
> # User Gregory Szorc
> # Date 1483729033 28800
> # Fri Jan 06 10:57:13 2017 -0800
> # Node ID 1901566ab484a56b177b88ff080d635840e0912c
> # Parent 3de9df6ee5bf7601aa3870f18304bbeb3ce351af
> convert: add config option to control saving Git commi
Jun Wu writes:
> # HG changeset patch
> # User Jun Wu
> # Date 1482711944 0
> # Mon Dec 26 00:25:44 2016 +
> # Node ID 8e614304b040537dbc735acb6c3999a05efd258c
> # Parent 011122b3b1c42374fb0489d107418e1be3665ca6
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #
Jun Wu writes:
> # HG changeset patch
> # User Jun Wu
> # Date 1483719292 0
> # Fri Jan 06 16:14:52 2017 +
> # Node ID 779b9e867ff7f6e0c0b12e700195dff97408a16d
> # Parent 703fee4099efac592f6ae1c48bfebf806dfd95bf
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #
# HG changeset patch
# User Gregory Szorc
# Date 1483729033 28800
# Fri Jan 06 10:57:13 2017 -0800
# Node ID 1901566ab484a56b177b88ff080d635840e0912c
# Parent 3de9df6ee5bf7601aa3870f18304bbeb3ce351af
convert: add config option to control saving Git committer in message
As part of converting
Stanislau Hlebik writes:
> # HG changeset patch
> # User Stanislau Hlebik
> # Date 1483717320 28800
> # Fri Jan 06 07:42:00 2017 -0800
> # Node ID 043090278718e0b82f6b3d8f7258d56080209d40
> # Parent c65e41aef8dc18f29f8652f9d71a9c0d028fd95d
> remotenames: lazily read remotenames file
>
> re
Yuya Nishihara writes:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1483710604 -32400
> # Fri Jan 06 22:50:04 2017 +0900
> # Node ID d19726fc559971501161eba3552f96a93a3a5c25
> # Parent b5247f031aed69bb2f7c6a3a8d1c9b076a7384d5
> commit: fix unmodified message detection for the "-
On Thu, 5 Jan 2017 at 17:50 Remi Chaintron wrote:
> # HG changeset patch
> # User Remi Chaintron
> # Date 1483636648 0
> # Thu Jan 05 17:17:28 2017 +
> # Node ID 8701df1c04340e9951481dc4c366ba550b4e790f
> # Parent a93b1ff78332f4f78e77ec9aaa2c63f7f975399c
> revlog: flag processor
>
> Ad
# HG changeset patch
# User Jun Wu
# Date 1482711944 0
# Mon Dec 26 00:25:44 2016 +
# Node ID 8e614304b040537dbc735acb6c3999a05efd258c
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/qu
On Fri, Jan 6, 2017 at 7:12 AM, Pierre-Yves David
wrote:
>
>
> On 01/04/2017 10:47 PM, Martin von Zweigbergk wrote:
>>
>> On Wed, Jan 4, 2017 at 11:40 AM, Pierre-Yves David
>> wrote:
>>>
>>> On 01/04/2017 05:38 PM, Martin von Zweigbergk wrote:
On Wed, Jan 4, 2017 at 4:53 AM, Pierre-Yves
On 01/06/2017 05:20 PM, Jun Wu wrote:
# HG changeset patch
# User Jun Wu
# Date 1483719581 0
# Fri Jan 06 16:19:41 2017 +
# Node ID 50ad6dbc71c76ab1a9e684b59720d8fa7fbd6797
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
# Available At https://bitbucket.org/quark-zju/hg-draft
#
# HG changeset patch
# User Jun Wu
# Date 1483719581 0
# Fri Jan 06 16:19:41 2017 +
# Node ID 50ad6dbc71c76ab1a9e684b59720d8fa7fbd6797
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/qu
On 01/04/2017 07:04 PM, Matt Harbison wrote:
# HG changeset patch
# User Matt Harbison
# Date 1483550016 18000
# Wed Jan 04 12:13:36 2017 -0500
# Node ID 76d95ab94b9e206363629059fb7824002e19a9e5
# Parent 0064a1eb28e246ded9b726c696d048143d1b23f1
revset: introduce the summary predicate
Th
# HG changeset patch
# User Jun Wu
# Date 1483719063 0
# Fri Jan 06 16:11:03 2017 +
# Node ID 530b32a20c085fd9819bad3235ffbca5f98095ea
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/qu
# HG changeset patch
# User Jun Wu
# Date 1483719292 0
# Fri Jan 06 16:14:52 2017 +
# Node ID 779b9e867ff7f6e0c0b12e700195dff97408a16d
# Parent 703fee4099efac592f6ae1c48bfebf806dfd95bf
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/qu
# HG changeset patch
# User Jun Wu
# Date 1483719145 0
# Fri Jan 06 16:12:25 2017 +
# Node ID 703fee4099efac592f6ae1c48bfebf806dfd95bf
# Parent 530b32a20c085fd9819bad3235ffbca5f98095ea
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.org/qu
On 01/06/2017 04:32 PM, Denis Laxalde wrote:
# HG changeset patch
# User Denis Laxalde
# Date 1483709722 -3600
# Fri Jan 06 14:35:22 2017 +0100
# Node ID 3a382f7173808665968de416db145ade8c56672c
# Parent 1d9bdfeb0afded737513f51e75cefa11e9231fdf
# EXP-Topic evolve-ui
summary: add evolutio
# HG changeset patch
# User Stanislau Hlebik
# Date 1483717320 28800
# Fri Jan 06 07:42:00 2017 -0800
# Node ID 043090278718e0b82f6b3d8f7258d56080209d40
# Parent c65e41aef8dc18f29f8652f9d71a9c0d028fd95d
remotenames: lazily read remotenames file
remotenames file is read every time even if it
note: you sent a V4, before we solved the question in this email. On a
general basis it is better to wait for open question to be solved before
sending a new version. It is now a huge deal but it help reduce
confusion on my side. I'll reply to this email based on V3.
On 01/06/2017 09:48 AM, Va
# HG changeset patch
# User Denis Laxalde
# Date 1483714102 -3600
# Fri Jan 06 15:48:22 2017 +0100
# Node ID 6825cb51c2e830cbd28ca326587d1771dadf2cf2
# Parent 8cb7662ab0192840380a3ce8f521b9ff38a0bbb2
# EXP-Topic evolve-ui
test: test "trouble: " line in log output with multiple troubles
Foll
# HG changeset patch
# User Denis Laxalde
# Date 1483709674 -3600
# Fri Jan 06 14:34:34 2017 +0100
# Node ID 1d9bdfeb0afded737513f51e75cefa11e9231fdf
# Parent 87399b8a6ae5a1c38c4969d705a358ba17d7dffd
# EXP-Topic evolve-ui
summary: use the same labels as log command in "parent: " line
Re-use
# HG changeset patch
# User Denis Laxalde
# Date 1483707016 -3600
# Fri Jan 06 13:50:16 2017 +0100
# Node ID bf1e87a41962c793ae1c0ce361cd79aac3f98f1c
# Parent 6825cb51c2e830cbd28ca326587d1771dadf2cf2
# EXP-Topic evolve-ui
templatekw: add a "troubles" template keyword
The "troubles" template
# HG changeset patch
# User Denis Laxalde
# Date 1483702581 -3600
# Fri Jan 06 12:36:21 2017 +0100
# Node ID 8cb7662ab0192840380a3ce8f521b9ff38a0bbb2
# Parent 13d94304c8daa1fea0551ffb39b2ca3da40e92d7
# EXP-Topic evolve-ui
cmdutil: add missing "i18n" comment about "trouble: " line
Follow-up
# HG changeset patch
# User Denis Laxalde
# Date 1483709722 -3600
# Fri Jan 06 14:35:22 2017 +0100
# Node ID 3a382f7173808665968de416db145ade8c56672c
# Parent 1d9bdfeb0afded737513f51e75cefa11e9231fdf
# EXP-Topic evolve-ui
summary: add evolution "troubles" information to summary output
Exten
# HG changeset patch
# User Denis Laxalde
# Date 1483707052 -3600
# Fri Jan 06 13:50:52 2017 +0100
# Node ID 87399b8a6ae5a1c38c4969d705a358ba17d7dffd
# Parent bf1e87a41962c793ae1c0ce361cd79aac3f98f1c
# EXP-Topic evolve-ui
templates: display evolution "troubles" in command line style
diff --
On 01/04/2017 10:47 PM, Martin von Zweigbergk wrote:
On Wed, Jan 4, 2017 at 11:40 AM, Pierre-Yves David
wrote:
On 01/04/2017 05:38 PM, Martin von Zweigbergk wrote:
On Wed, Jan 4, 2017 at 4:53 AM, Pierre-Yves David
wrote:
On 12/18/2016 06:36 PM, Martin von Zweigbergk via Mercurial-devel wro
6 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/5c85c93cdd61
changeset: 30703:5c85c93cdd61
user:Sean Farley
date:Sat Dec 31 15:36:36 2016 -0600
summary: cmdutil: add special string that ignores rest of text
https://www.mercurial-scm.org/repo/hg/rev/
On 01/06/2017 04:11 PM, Valters Vingolds wrote:
# HG changeset patch
# User Valters Vingolds
# Date 1483272989 -3600
# Sun Jan 01 13:16:29 2017 +0100
# Node ID ba648b03fc21c8213d580c8ed193002511e3f872
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
rebase: fail-fast the pull if working
# HG changeset patch
# User Valters Vingolds
# Date 1483272989 -3600
# Sun Jan 01 13:16:29 2017 +0100
# Node ID ba648b03fc21c8213d580c8ed193002511e3f872
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
rebase: fail-fast the pull if working dir is not clean (BC)
Refuse to run 'hg pull --reb
# HG changeset patch
# User Valters Vingolds
# Date 1483701359 -3600
# Fri Jan 06 12:15:59 2017 +0100
# Node ID f9ef0679fabea8ef0ab65aa7f76258e248473a8e
# Parent ba648b03fc21c8213d580c8ed193002511e3f872
rebase tests: verify that we will abort pull early during graft in progress
Created (a b
# HG changeset patch
# User Valters Vingolds
# Date 1483701570 -3600
# Fri Jan 06 12:19:30 2017 +0100
# Node ID 7dbf18edd08f5de0c74df8b3256bc62146081dd0
# Parent f9ef0679fabea8ef0ab65aa7f76258e248473a8e
rebase tests: remove test that touched 'rebasestate' directly
diff --git a/tests/test-re
# HG changeset patch
# User Yuya Nishihara
# Date 1483710279 -32400
# Fri Jan 06 22:44:39 2017 +0900
# Node ID b5247f031aed69bb2f7c6a3a8d1c9b076a7384d5
# Parent 011122b3b1c42374fb0489d107418e1be3665ca6
commit: update test to actually modify template text
We have a check for unmodified commi
# HG changeset patch
# User Yuya Nishihara
# Date 1483710604 -32400
# Fri Jan 06 22:50:04 2017 +0900
# Node ID d19726fc559971501161eba3552f96a93a3a5c25
# Parent b5247f031aed69bb2f7c6a3a8d1c9b076a7384d5
commit: fix unmodified message detection for the "--- >8 " magic
We need the raw edit
On 01/06/2017 10:18 AM, Valters Vingolds wrote:
# HG changeset patch
# User Valters Vingolds
# Date 1483693121 -3600
# Fri Jan 06 09:58:41 2017 +0100
# Node ID 80ce9f02d8481f8d22d057753088283522cc2539
# Parent 62a41fd87dabf0e6fb631a9e9ba1aabfe7e0f801
rebase: replace stray call of 'os.path.
# HG changeset patch
# User Valters Vingolds
# Date 1483693121 -3600
# Fri Jan 06 09:58:41 2017 +0100
# Node ID 80ce9f02d8481f8d22d057753088283522cc2539
# Parent 62a41fd87dabf0e6fb631a9e9ba1aabfe7e0f801
rebase: replace stray call of 'os.path.exists' with repo.vfs.exists at 'hg
summary' hook
Hi, here's my thinking: the default output might be too terse:
$ hg pull --rebase
abort: uncommitted changes
So if a person feels confused by this response ("hold up, what's going
on?"), and passes "--debug" flag they will receive following output:
$ hg pull --rebase --debug
before rebase: ensure
On 01/04/2017 07:06 PM, Gregory Szorc wrote:
On Jan 4, 2017, at 07:37, Pierre-Yves David
wrote:
On 12/28/2016 11:53 PM, Gregory Szorc wrote:
# HG changeset patch
# User Gregory Szorc
# Date 1482965297 25200
# Wed Dec 28 15:48:17 2016 -0700
# Node ID 4a560014d6d64edcefb1d431e882824771c
48 matches
Mail list logo