# HG changeset patch
# User David Demelier
# Date 1506407837 -7200
# Tue Sep 26 08:37:17 2017 +0200
# Node ID 49c0882e2c32ac1a4df10a3f7f51171ab1b677be
# Parent 4f969b9e0cf5d4f2cfb7392cef7f43b74d17c5e4
misc: rename README to README.rst
Many hosting services consider README without extension
martinvonz added a comment.
In https://phab.mercurial-scm.org/D542#12108, @quark wrote:
> In https://phab.mercurial-scm.org/D542#11973, @lothiraldan wrote:
>
> > @quark Thank you for reposting your comment here, it's helpful to not
lose track
> > on all these discussions.
> >
14 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/a48b3db0baba
changeset: 34277:a48b3db0baba
user:Augie Fackler
date:Mon Sep 18 13:35:43 2017 -0400
summary: bundle2: stop using %r to quote part names
https://www.mercurial-scm.org/repo/hg/rev/ea7588c1
At Mon, 25 Sep 2017 15:09:32 -0500,
Kevin Bullock wrote:
>
> > On Sep 25, 2017, at 08:04, David Demelier wrote:
> >
> > On Mon, 2017-09-25 at 21:53 +0900, Yuya Nishihara wrote:
> >> On Fri, 22 Sep 2017 15:26:13 +0200, David Demelier wrote:
> >>> # HG changeset patch
> >>> # User David Demelier
quark updated this revision to Diff 2073.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D808?vs=2072&id=2073
REVISION DETAIL
https://phab.mercurial-scm.org/D808
AFFECTED FILES
mercurial/config.py
mercurial/util.py
CHANGE DETAILS
diff --git a/mercu
quark updated this revision to Diff 2072.
quark edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D808?vs=2058&id=2072
REVISION DETAIL
https://phab.mercurial-scm.org/D808
AFFECTED FILES
mercurial/config.py
mercurial/
quark added inline comments.
INLINE COMMENTS
> mbthomas wrote in util.py:602
> Using a boolean means both sides have to copy when they each write - the
> original dict becomes frozen and can't be re-used. If we use a count of
> outstanding copies instead, the last copy can just be used as-is w
quark updated this revision to Diff 2071.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D803?vs=2070&id=2071
REVISION DETAIL
https://phab.mercurial-scm.org/D803
AFFECTED FILES
hgext/extdiff.py
tests/test-extdiff.t
CHANGE DETAILS
diff --git a/tests
quark updated this revision to Diff 2070.
quark edited the summary of this revision.
quark retitled this revision from "extdiff: use pager" to "extdiff: allow pager
to be used".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D803?vs=2046&id=2070
REVISION D
quark updated this revision to Diff 2069.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D807?vs=2054&id=2069
REVISION DETAIL
https://phab.mercurial-scm.org/D807
AFFECTED FILES
contrib/chg/util.c
tests/test-chg.t
CHANGE DETAILS
diff --git a/tests/t
> On Sep 25, 2017, at 10:39, Igor Ippolitov wrote:
>
> I gave it a thought and seems you are right. The function can be written down
> in a better (and shorter) way^
>
> >def mimetextqp(body, subtype, charset):
> >'''Return MIME message.
> >Quoted-printable transfer encoding will be use
> On Sep 25, 2017, at 08:04, David Demelier wrote:
>
> On Mon, 2017-09-25 at 21:53 +0900, Yuya Nishihara wrote:
>> On Fri, 22 Sep 2017 15:26:13 +0200, David Demelier wrote:
>>> # HG changeset patch
>>> # User David Demelier
>>> # Date 1506086724 -7200
>>> # Fri Sep 22 15:25:24 2017 +0200
>>
ryanmce accepted this revision.
ryanmce added a comment.
Looks straightforward.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D783
To: mbthomas, #hg-reviewers, ryanmce
Cc: ryanmce, mercurial-devel
___
Mercurial-devel m
ryanmce accepted this revision.
ryanmce added a comment.
nice improvement
INLINE COMMENTS
> merge.py:741-747
> +if f in pathconflicts:
> +if repo.wvfs.isfileorlink(f):
> +repo.ui.warn(_("%s: untracked file conflicts with
> directory\n")
> +
ryanmce accepted this revision.
ryanmce added a comment.
nice
INLINE COMMENTS
> test-merge1.t:33-43
> + b: untracked file differs
> + abort: untracked files in working directory differ from files in requested
> revision
>[255]
>$ hg ci
> - abort: last update was interrupted
> - (
ryanmce added inline comments.
INLINE COMMENTS
> merge.py:654
> +for p in reversed(list(util.finddirs(f))):
> +if (repo.wvfs.audit.check(p)
> +and repo.wvfs.isfileorlink(p)
Why do we need to audit this path first? If we fail the audit, what happens?
This looks weird
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
It seems like this one should have an externally-testable result. Could you
adda test that shows the new behavior working better than it did before? If
there a bug on bugzilla o
ryanmce added a comment.
Looks good. One question inline.
INLINE COMMENTS
> merge.py:1461
> +repo.dirstate.remove(f0)
> +repo.dirstate.copy(f0, f)
> +
Thanks for remembering to preserve copy information!
Did you test with transitive renames? Something like:
I rename `a` ->
ryanmce accepted this revision.
ryanmce added a comment.
There's some opportunities here but most are definitely outside the scope of
this patch. One inline to consider but do what makes sense to you.
INLINE COMMENTS
> merge.py:1250-1259
> +repo.ui.status(
> +_("%s: path
ryanmce accepted this revision.
ryanmce added a comment.
This looks fine to me. Some future cleanup opportunities but this fits the
current style just fine.
INLINE COMMENTS
> commands.py:4273-4275
> l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
> +
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
Logic looks good to me. Just a couple of inline nits about comments to
improve understanding that I think would be useful.
INLINE COMMENTS
> merge.py:84-87
> +u: unresolved
mbthomas requested changes to this revision.
mbthomas added a comment.
This revision now requires changes to proceed.
Requesting changes for the doc comment typo.
Otherwise looks correct. Up to you whether to follow up on the suggestions.
INLINE COMMENTS
> util.py:592
> +class cow(objec
I gave it a thought and seems you are right. The function can be written
down in a better (and shorter) way^
>def mimetextqp(body, subtype, charset):
>'''Return MIME message.
>Quoted-printable transfer encoding will be used if necessary.
>'''
>cs = email.charset.Charset(charset)
>
On Mon, 25 Sep 2017 16:50:33 +0300, Igor Ippolitov wrote:
> There is a nice small research from Django which states that QP is
> preferred for UTF8 texts: https://code.djangoproject.com/ticket/22561
> Base64 is preferred for binary data.
Okay, then we might want to use QP no matter if there is a l
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGae510d9691ef: uncommit: add a test for uncommit with
uncommitondirtywdir config in merge (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercuria
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0e48813cc106: alias: test duplicated definition earlier
(authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D804?vs=2051&id=2063
RE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbd50aa1aa035: alias: make alias command lazily resolved
(authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D805?vs=2052&id=2065
RE
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
Can you update test-chg.t?
INLINE COMMENTS
> util.c:67
> +struct timeval t;
> +gettimeofday(&t, 0);
> +return t.tv_usec / 1e6 + t.tv_sec;
Nit: s/0/NULL/ is preferred.
RE
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Looks okay. Queued, thanks.
INLINE COMMENTS
> dispatch.py:539
> +
> +def __getitem__(self, n):
> +aliasdef = self._aliasdef
A slice operation would be unlikely for alias commands,
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/D809
To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
_
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
I slightly prefer not moving the command logic to copies.py because
a. copies.py seems to contain core algorithms
b. copies.py is already large enough to not add random features
There is a nice small research from Django which states that QP is
preferred for UTF8 texts: https://code.djangoproject.com/ticket/22561
Base64 is preferred for binary data.
Concerning the "if enc: ... else:" part, I thought you don't have to encode
long lines on your own. But this is still an iss
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> copies.py:397
> +sourcecommitlimit = ui.configint('experimental',
> +'copytrace.sourcecommitlimit', 100)
> +
On Mon, 25 Sep 2017 10:06:44 +0300, Igor Ippolitov wrote:
> I dug a little more and finally realized, that the patch will work nicely
> in python 3.6.
> The compat3.2 we discussed in IRC is not a module, but API which is in the
> class
> This api includes set_payload and set_charset methods. So not
On Sun, 24 Sep 2017 18:44:57 +0200, Ingmar Blonk wrote:
> # HG changeset patch
> # User Ingmar Blonk
> # Date 1506267061 -7200
> # Sun Sep 24 17:31:01 2017 +0200
> # Node ID 9d95751ccea50ed91a457315762c18f3a9cf69f4
> # Parent 575097b4dce054a5b8d992fe15797d9d62ceaf71
> convert: parse quoted k
On Mon, 2017-09-25 at 21:53 +0900, Yuya Nishihara wrote:
> On Fri, 22 Sep 2017 15:26:13 +0200, David Demelier wrote:
> > # HG changeset patch
> > # User David Demelier
> > # Date 1506086724 -7200
> > # Fri Sep 22 15:25:24 2017 +0200
> > # Node ID 274acdd5f4d8d9c68359a99f6caab6efaec415de
> > #
On Fri, 22 Sep 2017 15:26:13 +0200, David Demelier wrote:
> # HG changeset patch
> # User David Demelier
> # Date 1506086724 -7200
> # Fri Sep 22 15:25:24 2017 +0200
> # Node ID 274acdd5f4d8d9c68359a99f6caab6efaec415de
> # Parent b90bd9a98c8ba06afdb7f32d434e501d7b3c3929
> doc: use markdown s
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
Pager should be disabled at least for GUI tools. Otherwise `hg gui-diff &`
would
be suspended by signal. Perhaps curses-based tools would have a similar
problem.
REPOSITORY
rHG M
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As the TODO in the test said, the previous error message was not
very helpful. Let's improve things.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.m
indygreg added a comment.
This commit regressed the behavior of ^C during part application
(https://phab.mercurial-scm.org/rHGad41739c6b2b5a9217467abb65d6429ba4fae9ba and
issue 4784). Before, ^C would abort bundle2 application pretty quickly.
Afterwards, it appears we now attempt I/O to seek
Hi all,
I’ve set up a Slack workspace at hgsprint.slack.com for social comms during the
forthcoming 4.4 sprint. Intended use is “I just arrived; where is everyone?”,
etc. Hopefully this will make it a bit easier for folks who are attending for
the first time, or who have never met fellow attend
Hello, Yuya.
I dug a little more and finally realized, that the patch will work nicely
in python 3.6.
The compat3.2 we discussed in IRC is not a module, but API which is in the
class
This api includes set_payload and set_charset methods. So nothing will be
broken
Additionally, I tested that initi
42 matches
Mail list logo
