# HG changeset patch
# User Christophe de Vienne
# Date 1504023891 -7200
# Tue Aug 29 18:24:51 2017 +0200
# Node ID 06bc5adebc48cfb657cdefda41704a96f686fae7
# Parent b2eb0aa445cbe7cadc8b7691c6266908adfc5057
command options: abort on unicode defaults
If the
Wrong flag (I am not familiar with hg email yet), please ignore.
My apologies.
Le 01/09/2017 à 09:43, Christophe de Vienne a écrit :
> # HG changeset patch
> # User Christophe de Vienne
> # Date 1504023891 -7200
> # Tue Aug 29 18:24:51 2017 +0200
> # Node ID
# HG changeset patch
# User Christophe de Vienne
# Date 1504023891 -7200
# Tue Aug 29 18:24:51 2017 +0200
# Node ID 06bc5adebc48cfb657cdefda41704a96f686fae7
# Parent b2eb0aa445cbe7cadc8b7691c6266908adfc5057
command options: abort on unicode defaults
If the
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> phabricator.py:443
> +drevdesc = ui.label('D%s' % newrevid, 'phabricator.drev')
> +actiondesc = ui.label(_(action), 'phabricator.action.%s' %
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued the series, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D576
To: quark, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
The logic looks correct. Can you add some tests?
INLINE COMMENTS
> branchmap.py:225
> for bn, heads in self.iteritems():
> yield (bn, heads) +
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D552
To: quark, #hg-reviewers, yuja
Cc: yuja, ryanmce, mercurial-devel
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D567
To: pulkit, #hg-reviewers, lothiraldan, yuja
Cc: yuja, lothiraldan, mercurial-devel
On Fri, 01 Sep 2017 09:44:24 +0200, Christophe de Vienne wrote:
> # HG changeset patch
> # User Christophe de Vienne
> # Date 1504023891 -7200
> # Tue Aug 29 18:24:51 2017 +0200
> # Node ID 06bc5adebc48cfb657cdefda41704a96f686fae7
> # Parent
(replying to this thread to see if the response shows up in Phabricator, Kevin
just configured that)
> On Sep 1, 2017, at 02:16, Adrian Buehlmann wrote:
>
> Ugh. Can I reply to a phabricator notification by email?
>
> Adding gregory.sz...@gmail.com
durin42 added a comment.
Relevant continuous build failure:
https://buildbot.mercurial-scm.org/builders/FreeBSD%20hg%20tests/builds/909/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio
- @mbolin could I get you to take a look?
REPOSITORY
rHG Mercurial
REVISION DETAIL
the31k planned changes to this revision.
the31k added a comment.
In https://phab.mercurial-scm.org/D583#9714, @yuja wrote:
> The logic looks correct. Can you add some tests?
Ok, I will try to.
INLINE COMMENTS
> yuja wrote in branchmap.py:225
> `iterbranches()` could have
Sometimes after hg pull i have files, which are marked as modified although i
konw that i havent modified these files.
It seems that in dirstate is a wrong mode.
For example:
hg stat -m
M pkplan/pkp_core.c
hg diff -g pkplan/pkp_core.c
'shows nothing
ls -la pkplan/pkp_core.c
-rwxrwxr-x 1 user1
# HG changeset patch
# User Christophe de Vienne
# Date 1504023891 -7200
# Tue Aug 29 18:24:51 2017 +0200
# Node ID 44e9719c499dae04eca36178ddfb2c5eddec6beb
# Parent b2eb0aa445cbe7cadc8b7691c6266908adfc5057
command options: prohibit unicode defaults
If the
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc0170d88ed2b: patch: take messages out of the function so
that extensions can add entries (authored by pulkit).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D567?vs=1436=1537#toc
REPOSITORY
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbc2535238de2: import-checker: allow relative import a
module being checked (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D552?vs=1517=1533
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG40313c63da87: run-tests: allow bisecting a different repo
(authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D578?vs=1465=1536
REVISION DETAIL
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG85bfd6a0bdbf: run-tests: extract prefix of bisect commands
to a variable (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D577?vs=1464=1535
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG72b23c9452d6: run-tests: pass --with-hg to run-tests.py
command used by bisect (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
yuja added inline comments.
INLINE COMMENTS
> cmdutil.py:344
> reviewedpatch = ui.edit(patchtext, "",
> -extra={"suffix": ".diff"},
> +action="diff",
>
durin42 added inline comments.
INLINE COMMENTS
> yuja wrote in cmdutil.py:344
> Sorry for late review, but doesn't it change the suffix from
> `.diff` to `.diff.hg.txt`?
Argh, yes it does. @mbolin can you send a follow-up to fix that?
REPOSITORY
rHG Mercurial
REVISION DETAIL
yuja added inline comments.
INLINE COMMENTS
> the31k wrote in branchmap.py:225
> I have thought about it, but reasoning in terms of `hg branches` code we
> actually are not allowed to filter out closed tip. Command needs to get
> closed tip if it is there.
>
> Also, we need to do heads
phillco abandoned this revision.
phillco added a comment.
I'll revisit later.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D369
To: phillco, #hg-reviewers, durin42
Cc: durin42, lothiraldan, mercurial-devel
___
martinvonz added a comment.
In https://phab.mercurial-scm.org/D600#9766, @quark wrote:
> LGTM. Maybe include some timing data in commit message:
>
> In [3]: _winreservednames = b'''con prn aux nul
> ...: com1 com2 com3 com4 com5 com6 com7 com8 com9
> ...: lpt1
quark accepted this revision.
quark added a comment.
LGTM. Out of curious, which profiler did you use?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D588
To: indygreg, #hg-reviewers, quark
Cc: quark, mercurial-devel
mbolin added inline comments.
INLINE COMMENTS
> durin42 wrote in cmdutil.py:344
> Argh, yes it does. @mbolin can you send a follow-up to fix that?
OK, I have a fix in https://phab.mercurial-scm.org/D607 and I'm working on an
integration test.
REPOSITORY
rHG Mercurial
REVISION DETAIL
mbolin updated this revision to Diff 1551.
mbolin added a comment.
Added integration test.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D607?vs=1550=1551
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D607
AFFECTED FILES
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG834d08c17e57: simplemerge: remove unused `repo` parameter
(authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D602?vs=1541=1557#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE
phillco 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/D603
AFFECTED FILES
contrib/simplemerge
CHANGE DETAILS
diff --git a/contrib/simplemerge
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is now no longer used or needed thanks to the `decodeddata()` context
function.
REPOSITORY
rHG Mercurial
REVISION DETAIL
durin42 added a comment.
https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-September/104093.html
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D588
To: indygreg, #hg-reviewers, quark
Cc: durin42, quark, mercurial-devel
martinvonz added inline comments.
INLINE COMMENTS
> context.py:2389
> +
> +class arbitraryfilectx(object):
> +"""Allows you to use filectx-like functions on a file in an arbitrary
Maybe indygreg will come and make this extend an abstract abc class one day :-)
REPOSITORY
rHG Mercurial
mbolin added inline comments.
INLINE COMMENTS
> test-editor-filename.t:7
> +
> + $ cat > editor.sh << EOF
> + > #!/bin/bash
I think this has to change to:
$ cat > $TESTTMP/editor.sh << EOF
to fix the FreeBSD build.
REPOSITORY
rHG Mercurial
REVISION DETAIL
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG244e2e937b73: context: add arbitraryfilectx, which can
represent files outside the workdir (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG872d20fca015: simplemerge: remove unused `filtereddata`
parameter (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D603?vs=1542=1558
mbolin created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is a follow-up to https://phab.mercurial-scm.org/D464 that introduced the
new file extension behavior. It erroneously changed `.diff` to `.diff.hg.txt`.
TEST
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As far as I can tell, this interface originally used 'return' here, so the
"fallthrough" to self._abort made sense. When it was switched to 'yield' this
didn't
On Thu, Aug 31, 2017 at 11:42:14PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1503147843 -32400
> # Sat Aug 19 22:04:03 2017 +0900
> # Node ID 167fea06d67ff144461c38799ba8cecaaddd0228
> # Parent
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Not sure why, but I got `phabsend` hang on work network pretty frequently.
The traceback indicates it hangs at `_sslobj.do_handshake()`:
File
quark updated this revision to Diff 1546.
quark marked an inline comment as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D515?vs=1280=1546
REVISION DETAIL
https://phab.mercurial-scm.org/D515
AFFECTED FILES
contrib/phabricator.py
CHANGE
On Fri, Sep 01, 2017 at 04:30:47PM +0200, Christophe de Vienne wrote:
> # HG changeset patch
> # User Christophe de Vienne
> # Date 1504023891 -7200
> # Tue Aug 29 18:24:51 2017 +0200
> # Node ID 44e9719c499dae04eca36178ddfb2c5eddec6beb
> # Parent
quark added inline comments.
INLINE COMMENTS
> mbolin wrote in test-editor-filename.t:7
> I think this has to change to:
>
> $ cat > $TESTTMP/editor.sh << EOF
>
> to fix the FreeBSD build.
This is not the root test. `run-tests.py` guarantees the current directory is
at `$TESTTMP` when the
martinvonz added a comment.
I reflowed the lines in filemerge.py in flight.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D602
To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing
mbolin updated this revision to Diff 1556.
mbolin added a comment.
Remove bin/bash shebang as @quark says this should fix the FreeBSD issue and
should generally be banned from integration tests.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
On 2017-09-01 08:16, Adrian Buehlmann wrote:
> Ugh. Can I reply to a phabricator notification by email?
>
> Adding gregory.sz...@gmail.com manually, as I'm not sure replaying to
> those nasty phabricator emails is going to work...
>
> On 2017-09-01 00:32, indygreg (Gregory Szorc) wrote:
>> diff
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
https://phab.mercurial-scm.org/D466 allows output to be conditionally matched
by test name. This patch
changes test-amend.t to use that feature, instead of
durham added a comment.
I'd probably fold this together with the next commit. Splitting commits is
good when it increases readability or increases bisect ability. This change is
so small I think readability is fine in one commit, and the feature change is
only in one commit anyway so
mbolin added a comment.
@durin42 looking
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D464
To: mbolin, quark, durin42, #hg-reviewers, ryanmce
Cc: yuja, smf, ryanmce, mercurial-devel
___
Mercurial-devel mailing list
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
BSD `egrep` does not like it. So let's forbid it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D610
AFFECTED FILES
quark updated this revision to Diff 1570.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D441?vs=1075=1570
REVISION DETAIL
https://phab.mercurial-scm.org/D441
AFFECTED FILES
mercurial/dagop.py
mercurial/revset.py
mercurial/revsetlang.py
singhsrb abandoned this revision.
singhsrb added a comment.
Please see https://phab.mercurial-scm.org/D594 instead. This commit has been
merged into that commit.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D593
To: singhsrb, #hg-reviewers
Cc: durham,
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Some platforms (ex. FreeBSD) do not have `bash` by default. Therefore it
should not be used in test scripts.
REPOSITORY
rHG Mercurial
REVISION DETAIL
quark accepted this revision.
quark added a comment.
LGTM. I have checked there are no other suspicious `_abort` in this file.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D608
To: spectral, #hg-reviewers, quark
Cc: quark, mercurial-devel
quark updated this revision to Diff 1568.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D605?vs=1548=1568
REVISION DETAIL
https://phab.mercurial-scm.org/D605
AFFECTED FILES
contrib/phabricator.py
CHANGE DETAILS
diff --git a/contrib/phabricator.py
singhsrb added inline comments.
INLINE COMMENTS
> cmdutil.py:3083
> # Recompute copies (avoid recording a -> b -> a)
> -copied = copies.pathcopies(base, ctx)
> +copied = copies.pathcopies(base, wctx)
> if old.p2:
This code can be optimized by
singhsrb updated this revision to Diff 1562.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D598?vs=1530=1562
REVISION DETAIL
https://phab.mercurial-scm.org/D598
AFFECTED FILES
mercurial/cmdutil.py
tests/test-amend.t
tests/test-commit-amend.t
singhsrb updated this revision to Diff 1561.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D593?vs=1525=1561
REVISION DETAIL
https://phab.mercurial-scm.org/D593
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py
singhsrb updated this revision to Diff 1564.
singhsrb edited the summary of this revision.
singhsrb edited the test plan for this revision.
singhsrb retitled this revision from "cmdutil: remove redundant if block and
fix indentation in amend" to "cmdutil: removing redundant if condition in
singhsrb updated this revision to Diff 1565.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D596?vs=1528=1565
REVISION DETAIL
https://phab.mercurial-scm.org/D596
AFFECTED FILES
tests/test-commit-amend.t
CHANGE DETAILS
diff --git
quark requested changes to this revision.
quark added a comment.
This revision now requires changes to proceed.
I can confirm `os.unlink` may succeed without actually removing the file:
>>> from mercurial import util
>>> f=util.posixfile('c:\\users\\quark\\a.txt', 'w')
>>>
quark updated this revision to Diff 1571.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D441?vs=1570=1571
REVISION DETAIL
https://phab.mercurial-scm.org/D441
AFFECTED FILES
mercurial/dagop.py
mercurial/revset.py
mercurial/revsetlang.py
durham accepted this revision.
durham added a comment.
This series went through an initial review internally as well. Just fyi that
there's been some eyes on it already.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D598
To: singhsrb, #hg-reviewers, durham
quark updated this revision to Diff 1548.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D605?vs=1547=1548
REVISION DETAIL
https://phab.mercurial-scm.org/D605
AFFECTED FILES
contrib/phabricator.py
CHANGE DETAILS
diff --git a/contrib/phabricator.py
durin42 added a comment.
From the list:
On Sep 1, 2017, at 02:16, Adrian Buehlmann wrote:
> Ugh. Can I reply to a phabricator notification by email?
>
> Adding gregory.sz...@gmail.com manually, as I'm not sure replaying to
> those nasty phabricator emails
durham added inline comments.
INLINE COMMENTS
> test-commit-amend.t:1185
> +the amended commit against its parent commit.
> + $ hg init testfileinclusions
> + $ cd testfileinclusions
I think you're inside a repo at this point. You may need to `cd ../` to get
out of it before you init a new
Le 31/08/2017 à 23:50, Jun Wu a écrit :
> Excerpts from Christophe de Vienne's message of 2017-08-31 23:26:58 +0200:
>> # HG changeset patch
>> # User Christophe de Vienne
>> # Date 1504023891 -7200
>> # Tue Aug 29 18:24:51 2017 +0200
>> # Node ID
Le 01/09/2017 à 09:31, Christophe de Vienne a écrit :
>
>
> Le 31/08/2017 à 23:50, Jun Wu a écrit :
>> Excerpts from Christophe de Vienne's message of 2017-08-31 23:26:58 +0200:
[...]
>>>
>>> diff -r b2eb0aa445cb -r 5bbb2d585a96 mercurial/dispatch.py
>>> --- a/mercurial/dispatch.pyTue Aug
Ugh. Can I reply to a phabricator notification by email?
Adding gregory.sz...@gmail.com manually, as I'm not sure replaying to
those nasty phabricator emails is going to work...
On 2017-09-01 00:32, indygreg (Gregory Szorc) wrote:
> indygreg created this revision.
> Herald added a subscriber:
68 matches
Mail list logo