durin42 updated this revision to Diff 2721.
durin42 retitled this revision from "python3: add and use adapter for func_name
attr, now known as __name__" to "python3: move from using func_name to
__name__".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D96
durin42 updated this revision to Diff 2720.
durin42 marked 2 inline comments as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D887?vs=2299&id=2720
REVISION DETAIL
https://phab.mercurial-scm.org/D887
AFFECTED FILES
mercurial/httppeer.py
CHANGE D
durin42 added inline comments.
INLINE COMMENTS
> yuja wrote in httppeer.py:233
> Appears that encodevalueinheaders() takes bytes.
>
> I don't know which would be better to pass unicodes around or convert them
> at one place.
I'm going to go ahead and not mess with this until I hit some test cov
durin42 added a comment.
Yep, __name__ is much better.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D964
To: durin42, #hg-reviewers, pulkit, indygreg, yuja
Cc: yuja, indygreg, mercurial-devel
___
Mercurial-devel maili
On Sat, Oct 14, 2017 at 01:54:47AM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1507958412 14400
> # Sat Oct 14 01:20:12 2017 -0400
> # Node ID 3f5ff923f62da10ca5695030abe31ee53d1a7b29
> # Parent a154d01373b495122cf6ee17dd90ee600b8d4f41
> tests: add glob
On Fri, 13 Oct 2017 20:00:32 +0200, Boris Feld wrote:
> On Thu, 2017-10-12 at 22:51 +0900, Yuya Nishihara wrote:
> > On Thu, 12 Oct 2017 15:29:31 +0200, Boris Feld wrote:
> > > On Wed, 2017-10-11 at 22:24 +0900, Yuya Nishihara wrote:
> > > > Ugh, there's templatekw.defaulttempl which provides the d
# HG changeset patch
# User Matt Harbison
# Date 1507954046 14400
# Sat Oct 14 00:07:26 2017 -0400
# Node ID e1a7c125f4ac198ba0ec72d9c378a8a357862799
# Parent 16d73491416b8db667296526740fed2af086452b
test-audit-path: fill in missing output for no-symlink case
It looks like this was meant to
# HG changeset patch
# User Matt Harbison
# Date 1507957679 14400
# Sat Oct 14 01:07:59 2017 -0400
# Node ID a154d01373b495122cf6ee17dd90ee600b8d4f41
# Parent 60c022679230b586511ec1c7ebc350dbd16e99f0
test-conflicts: conditionalize for no-symlink platforms
It seems better to create standin f
# HG changeset patch
# User Matt Harbison
# Date 1507958412 14400
# Sat Oct 14 01:20:12 2017 -0400
# Node ID 3f5ff923f62da10ca5695030abe31ee53d1a7b29
# Parent a154d01373b495122cf6ee17dd90ee600b8d4f41
tests: add globs for Windows
diff --git a/tests/test-origbackup-conflict.t b/tests/test-ori
# HG changeset patch
# User Matt Harbison
# Date 1507954859 14400
# Sat Oct 14 00:20:59 2017 -0400
# Node ID 60c022679230b586511ec1c7ebc350dbd16e99f0
# Parent e1a7c125f4ac198ba0ec72d9c378a8a357862799
test-extdata: conditonalize error message for Windows
diff --git a/tests/test-extdata.t b/t
On Fri, 13 Oct 2017 19:55:07 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507625355 -7200
> # Tue Oct 10 10:49:15 2017 +0200
> # Node ID 429c6e9c7c3a4f601db17c6553a8fcdad35708a8
> # Parent 37b4375b1221e3bda055f0cbecf06b3c9510fd2c
> # EXP-Topic config.register
On Thu, 12 Oct 2017 10:13:57 +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde
> # Date 1507793990 -7200
> # Thu Oct 12 09:39:50 2017 +0200
> # Node ID 48cca33a1b611c82a2bd72a2f72b80f321604f42
> # Parent f1c2552c2de78a2f8a0c0ded099ccb200aad27d0
> # Available At http:/
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6036e6e205ca: context: add a fast-comparision for
arbitraryfilectx and workingfilectx (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-
On Sat, Oct 14, 2017 at 01:55:05PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1507955834 -32400
> # Sat Oct 14 13:37:14 2017 +0900
> # Node ID d70d56a43d2e301f605d2c2fe1368d04f0aaaf87
> # Parent 16d73491416b8db667296526740fed2af086452b
> test-i18n: g
On Wed, Oct 11, 2017 at 04:02:28PM +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507650822 -7200
> # Tue Oct 10 17:53:42 2017 +0200
> # Node ID 03a0d02653cb1ab9957890f527144d1d0fed48b0
> # Parent 1a64b2bcd0209ea3b906f458818db6f29cebbcd7
> # EXP-Topic b2.phases
On Wed, Oct 11, 2017 at 04:02:27PM +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507460911 -7200
> # Sun Oct 08 13:08:31 2017 +0200
> # Node ID 1a64b2bcd0209ea3b906f458818db6f29cebbcd7
> # Parent 4a6a337f9c682bdf1659295f871dc43ff33677ca
> # EXP-Topic b2.phases
(+jordigh, themystic, indygreg in case one of them has an opinion or
inspiration)
> On Oct 13, 2017, at 10:24 AM, Yuya Nishihara wrote:
>
> On Fri, 13 Oct 2017 10:02:07 +0200, Denis Laxalde wrote:
>> Yuya Nishihara a écrit :
>>> On Tue, 10 Oct 2017 17:37:27 +0200, Denis Laxalde wrote:
# HG
On Fri, Oct 13, 2017 at 10:56:12PM +0200, muxator via Mercurial-devel wrote:
> # HG changeset patch
> # User muxator
> # Date 1507927337 -7200
> # Fri Oct 13 22:42:17 2017 +0200
> # Node ID e9cb85a4d570b3e36df8df953d1c4b99fc00d922
> # Parent 7259f0ddfc0f18138420e7c9c7e4145a25016d7b
> build:
durin42 added a comment.
Could we try and get this series ready to land before the freeze on
Wednesday? or should we be aiming to get this early in the 4.5 cycle?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D937
To: pulkit, #hg-reviewers, dlax, ryanmce
Cc: du
On Sat, 14 Oct 2017 00:41:04 -0400, Augie Fackler wrote:
> > On Oct 14, 2017, at 12:38 AM, Martin von Zweigbergk
> > wrote:
> > On Fri, Oct 13, 2017 at 9:33 PM, Augie Fackler wrote:
> > > On Jul 19, 2017, at 10:14 AM, Augie Fackler wrote:
> > >> On Jul 19, 2017, at 09:11, Yuya Nishihara wrote:
durin42 abandoned this revision.
durin42 added a comment.
My understanding is that we're moving towards a marker in the command
registrar to decide what repo filter to use, which seems cleaner. Please reopen
this (and commandeer it if needed) if I'm wrong. Thanks!
REPOSITORY
rHG Mercurial
durin42 added a comment.
In https://phab.mercurial-scm.org/D761#13848, @lothiraldan wrote:
> @durin42 Good for me, I don't have strong opinion on the matter. I will
have a patch ready for the sprint.
What's the story with this revision? Should we close it and
https://phab.mercuri
durin42 added a comment.
Let's reopen this if/when we return to it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D728
To: durin42, #hg-reviewers, durham, quark
Cc: durham, pulkit, mercurial-devel
___
Mercurial-devel m
durin42 abandoned this revision.
durin42 added a comment.
Let's reopen this if/when we return to it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D98
To: durin42, #hg-reviewers, quark, indygreg
Cc: durin42, yuja, mharbison72, quark, mercurial-devel
durin42 abandoned this revision.
durin42 added a comment.
Let's reopen this if/when we return to it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D588
To: durin42, #hg-reviewers, quark, indygreg
Cc: abuehl, durin42, quark, mercurial-devel
__
durin42 abandoned this revision.
durin42 added a comment.
Let's reopen this if/when we return to it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D587
To: durin42, #hg-reviewers, pulkit
Cc: mharbison72, mercurial-devel
__
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7e3001b74ab3: tersestatus: re-implement the functionality
to terse the status (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3d6d4b12128e: tersestatus: make methods part of the dirnode
class (authored by dlax, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1042?vs=2646&i
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5d98674df18a: tersestatus: avoid modifying tersedict
(authored by dlax, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1043?vs=2647&id=2718
REVIS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4dc8a2ee0f4f: context: add is `isinmemory()` to filectx
(authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1061?vs=2700&id=2715
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc0a524f77e8a: merge: ensure that we always commit the
mergestate (authored by ryanmce, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D931?vs=2500&
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe8a89ed7ce96: dirstate: move the _dirfoldmap to dirstatemap
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D983?vs=2513&id=271
# HG changeset patch
# User Yuya Nishihara
# Date 1507955834 -32400
# Sat Oct 14 13:37:14 2017 +0900
# Node ID d70d56a43d2e301f605d2c2fe1368d04f0aaaf87
# Parent 16d73491416b8db667296526740fed2af086452b
test-i18n: guard gettext test appropriately
diff --git a/tests/test-i18n.t b/tests/test-i
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbfddc3d678ae: dirstate: remove _filefoldmap property cache
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D981?vs=2511&id=2710
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG143337bcec9b: merge: add tests to show current behavior on
failed filemerges (authored by ryanmce, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG014bd2a555c8: dirstate: remove _dirs property cache
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D982?vs=2512&id=2711
REVIS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG60927b19ed65: dirstate: move nonnormal and otherparent sets
to dirstatemap (authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D979
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe2214632c3a2: dirstate: move write into dirstatemap
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D978?vs=2508&id=2707
REVIS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe159f217230e: dirstate: move _read into dirstatemap
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D977?vs=2507&id=2706
REVIS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc6ef9a2498a5: dirstate: move identity to dirstatemap
(authored by durham, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D980?vs=2510&id=2709
REVI
durin42 requested changes to this revision.
durin42 added a comment.
This revision now requires changes to proceed.
(Feel free to push back with a TODO documenting how to do a fix or something.)
INLINE COMMENTS
> filemerge.py:604
> return None
> -
> +from . import context
>
durin42 added inline comments.
INLINE COMMENTS
> cmdutil.py:406-408
> +# extracted at module level as it's required each time a file will be added
> +# to dirnode class object below
> +pathsep = pycompat.ossep
Perversely, locals are significantly faster than globals in Python. Not going
to bloc
martinvonz added a comment.
In https://phab.mercurial-scm.org/D1063#17789, @durin42 wrote:
> I'm a fan. Will give it to Monday for any objections.
I'm against. I'd like to see that the feature is indeed powerful enough for
handling the intended use cases before we turn it on. Once
> On Oct 14, 2017, at 12:38 AM, Martin von Zweigbergk
> wrote:
>
>
>
> On Fri, Oct 13, 2017 at 9:33 PM, Augie Fackler wrote:
>
> > On Jul 19, 2017, at 10:14 AM, Augie Fackler wrote:
> >
> >
> >> On Jul 19, 2017, at 09:11, Yuya Nishihara wrote:
> >>
> I prefer not doing mass renaming
On Fri, Oct 13, 2017 at 9:33 PM, Augie Fackler wrote:
>
> > On Jul 19, 2017, at 10:14 AM, Augie Fackler wrote:
> >
> >
> >> On Jul 19, 2017, at 09:11, Yuya Nishihara wrote:
> >>
> I prefer not doing mass renaming that would generate lots of
> "deprecated"
> config names in use around
durin42 accepted this revision as: durin42.
durin42 added a comment.
I'm a fan. Will give it to Monday for any objections.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1063
To: quark, #hg-reviewers, durin42
Cc: durin42, mercurial-devel
durin42 added a comment.
I've landed this stack through https://phab.mercurial-scm.org/D931, will hold
this one until at least Monday in case anyone objects on the style change.
INLINE COMMENTS
> ryanmce wrote in configitems.py:302
> this could be `on-failure`, per the comment on
> https://
> On Jul 19, 2017, at 10:14 AM, Augie Fackler wrote:
>
>
>> On Jul 19, 2017, at 09:11, Yuya Nishihara wrote:
>>
I prefer not doing mass renaming that would generate lots of "deprecated"
config names in use around user hgrc and web documents. But if I had to
choose one, I would
pulkit added a comment.
> Open question: should we move this config knob to someplace other than
> [experimental] before we put it in tweakdefaults? I think we
> should. In that case, where does it move? commands.update.check?
Yes. I also think we should move this config and commands.u
durin42 added a comment.
In https://phab.mercurial-scm.org/D1047#17724, @quark wrote:
> In https://phab.mercurial-scm.org/D1047#17715, @durin42 wrote:
>
> > The only concern I have is that this is pretty complicated to express in
a revset, but if we can figure it out that's almost cer
durin42 added a comment.
In https://phab.mercurial-scm.org/D1047#17725, @quark wrote:
> The reason I perfer a revset alias is it's more flexible: people can define
`auto2` so `-d auto2` just works. Or use `auto` in a more complex way:
`first(auto|myauto)` (if auto cannot find the destina
durin42 added a comment.
I'm -0 on the behavior. I'd be indifferent about adding a --abort to bisect
that just is an alias for --reset.
(I still think it's extremely weird that ~everyone at Facebook sees bisect as
a modal command like histedit or rebase.)
REPOSITORY
rHG Mercurial
REV
quark added inline comments.
INLINE COMMENTS
> ryanmce wrote in commands.py:809
> I agree. This can be a status or even an info. +1 on the idea of mentioning
> the parent.
rebase uses `ui.warn`. histedit does not have this output. `ui.write` will
cause inconsistency. Maybe it's "safer" to just
quark updated this revision to Diff 2705.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1044?vs=2655&id=2705
REVISION DETAIL
https://phab.mercurial-scm.org/D1044
AFFECTED FILES
mercurial/commands.py
mercurial/hbisect.py
tests/test-bisect-abort.t
quark accepted this revision.
quark added a comment.
It seems a good candidate of `[commands]`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1062
To: durin42, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
Mercu
quark accepted this revision.
quark added a comment.
Looks good to me.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1061
To: phillco, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
Mercurial-devel mailing list
M
quark added a comment.
The reason I perfer a revset alias is it's more flexible: people can define
`auto2` so `-d auto2` just works. Or use `auto` in a more complex way:
`first(auto|myauto)` (if auto cannot find the destination, use `myauto`).
REPOSITORY
rHG Mercurial
REVISION DETAIL
ht
quark added a comment.
In https://phab.mercurial-scm.org/D1047#17715, @durin42 wrote:
> The only concern I have is that this is pretty complicated to express in a
revset, but if we can figure it out that's almost certainly the way to go...
If this is the only concern, how about de
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This was intended to be done by https://phab.mercurial-scm.org/D470. But
there was a minor documentation
issue. The feature is quite usable now so it gets formally
durin42 added a comment.
In https://phab.mercurial-scm.org/D1047#17714, @quark wrote:
> In https://phab.mercurial-scm.org/D1047#17692, @durin42 wrote:
>
> > Counterproposal:
> >
> > `hg rebase --auto `
> >
> > or
> >
> > `hg rebase --auto -r `
> >
> > rather than introd
# HG changeset patch
# User muxator
# Date 1507927337 -7200
# Fri Oct 13 22:42:17 2017 +0200
# Node ID e9cb85a4d570b3e36df8df953d1c4b99fc00d922
# Parent 7259f0ddfc0f18138420e7c9c7e4145a25016d7b
build: for the bootstrap phase of a deb/rpm build a pure python mercurial is
enough
When bootstr
> On Oct 13, 2017, at 16:53, muxator wrote:
>
> Way more elegant, thanks!
>
> On a closer look, an even simpler fix is possible: a "make local PURE=--pure"
> in packagelib.sh would be sufficient: no need to compile any c modules at all
> (base85, bdiff, zstd).
>
> I am going to send a simple
Way more elegant, thanks!
On a closer look, an even simpler fix is possible: a "make local
PURE=--pure" in packagelib.sh would be sufficient: no need to compile
any c modules at all (base85, bdiff, zstd).
I am going to send a simpler patch.
btw: is it better to send patches via email or Pha
quark added a comment.
In https://phab.mercurial-scm.org/D1047#17692, @durin42 wrote:
> Counterproposal:
>
> `hg rebase --auto `
>
> or
>
> `hg rebase --auto -r `
>
> rather than introducing a new concept of a stack. I know Facebook has this
concept internally, but for cor
Kevin pointed out I'm a goofball and it should actually be on Wednesday, so
I'll do the freeze on Wednesday.
Have a good weekend everyone!
AF
> On Oct 13, 2017, at 14:30, Augie Fackler wrote:
>
> Ordinarily it'd be Monday, but I'll give y'all Monday to try and get
> last-minute features into
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is the second-safest option we have to offer in `updatecheck`,
with `abort` being the safest and `linear` being the default. At the
sprint we discussed how
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will make it easier to skip certain behavior when running an in-memory
merge.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1
On Fri, Oct 13, 2017 at 07:55:17PM +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507490964 -7200
> # Sun Oct 08 21:29:24 2017 +0200
> # Node ID c577c2524d863b5649d31ad84a15773deb9b2372
> # Parent 8f3e9e9a61021e35a5798eef6368672506890bcf
> # EXP-Topic config.re
phillco abandoned this revision.
phillco added a comment.
I've split this into https://phab.mercurial-scm.org/D1056,
https://phab.mercurial-scm.org/D1057, https://phab.mercurial-scm.org/D1058,
https://phab.mercurial-scm.org/D1059, https://phab.mercurial-scm.org/D1060, so
abandoning this vers
durin42 added a comment.
Counterproposal:
`hg rebase --auto `
or
`hg rebase --auto -r `
rather than introducing a new concept of a stack. I know Facebook has this
concept internally, but for core hg we don't have the notion of a stack outside
`mq` and `show`: the former is
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/D1057
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercu
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/D1058
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial
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/D1059
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercu
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/D1056
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial
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/D1060
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercu
durin42 requested changes to this revision.
durin42 added a comment.
This revision now requires changes to proceed.
Actually, beyond that: if something is safe enough to be in tweakdefaults and
it's not a BC change, it should *be on by default*. As such, turning on a
command like rebase is IM
On Fri, Oct 13, 2017 at 07:55:14PM +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1507487833 -7200
> # Sun Oct 08 20:37:13 2017 +0200
> # Node ID 6ad9f6f42f33fe5efb78f76d39c41f28333144d6
> # Parent 0824a3519c14d643a81dd4f718846f15045772ec
> # EXP-Topic config.re
durin42 added a comment.
Until we've got a plan for obsolete markers on by default (even if without
marker exchange), I think I'd rather hold off on this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1046
To: quark, #hg-reviewers, ryanmce
Cc: durin42, ryanmce
quark added a comment.
In https://phab.mercurial-scm.org/D1047#17639, @lothiraldan wrote:
> But instead of having an alias, no matter how awesome it is that we can
implement such command using only revsets, could we have it instead as a
command? So we could add documentation and a proper
Ordinarily it'd be Monday, but I'll give y'all Monday to try and get
last-minute features into 4.4. After that, please focus on bug fixes until 4.4
final is released. Thanks!
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www
martinvonz added a comment.
In https://phab.mercurial-scm.org/D1047#17639, @lothiraldan wrote:
> I'm +1 for having stabilization command in core that handles 80% of the
use-case which is mid-stack amend.
>
> But instead of having an alias, no matter how awesome it is that we can
impl
lothiraldan added a comment.
I'm +1 for having stabilization command in core that handles 80% of the
use-case which is mid-stack amend.
But instead of having an alias, no matter how awesome it is that we can
implement such command using only revsets, could we have it instead as a
comman
> On Oct 13, 2017, at 12:24, Kevin Bullock
> wrote:
>
>> On Oct 13, 2017, at 11:07, Augie Fackler wrote:
>>
>> On Fri, Oct 13, 2017 at 09:10:52AM +0200, Denis Laxalde wrote:
>>> Kevin Bullock a écrit :
> On Oct 12, 2017, at 03:13, Denis Laxalde wrote:
>
> # HG changeset patch
>>
On Thu, 2017-10-12 at 22:51 +0900, Yuya Nishihara wrote:
> On Thu, 12 Oct 2017 15:29:31 +0200, Boris Feld wrote:
> > On Wed, 2017-10-11 at 22:24 +0900, Yuya Nishihara wrote:
> > > Ugh, there's templatekw.defaulttempl which provides the default
> > > template
> > > fragments to all stock/user templa
# HG changeset patch
# User Boris Feld
# Date 1507625368 -7200
# Tue Oct 10 10:49:28 2017 +0200
# Node ID 78e6b5c73ed70bd98a0aff7a4f1757a99ea11982
# Parent 19afa27ae88e1d42aa285d808a736d0c623bdf86
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507625327 -7200
# Tue Oct 10 10:48:47 2017 +0200
# Node ID 3885ce0a46c11f714335aafa38876b4d0c0aed9b
# Parent a9c5344860a24f38007c9f25cb91a5304747391b
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507487991 -7200
# Sun Oct 08 20:39:51 2017 +0200
# Node ID a9c5344860a24f38007c9f25cb91a5304747391b
# Parent 863c2407bfabe9b23b28d01582f53d318b6ae9fc
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507487185 -7200
# Sun Oct 08 20:26:25 2017 +0200
# Node ID 19afa27ae88e1d42aa285d808a736d0c623bdf86
# Parent 429c6e9c7c3a4f601db17c6553a8fcdad35708a8
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507490964 -7200
# Sun Oct 08 21:29:24 2017 +0200
# Node ID c577c2524d863b5649d31ad84a15773deb9b2372
# Parent 8f3e9e9a61021e35a5798eef6368672506890bcf
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507681569 -7200
# Wed Oct 11 02:26:09 2017 +0200
# Node ID 9f8f4614d1366eaeea1366f9563a9db3a0811a9d
# Parent 6ad9f6f42f33fe5efb78f76d39c41f28333144d6
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507690915 -7200
# Wed Oct 11 05:01:55 2017 +0200
# Node ID 8f3e9e9a61021e35a5798eef6368672506890bcf
# Parent 9f8f4614d1366eaeea1366f9563a9db3a0811a9d
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507487833 -7200
# Sun Oct 08 20:37:13 2017 +0200
# Node ID 6ad9f6f42f33fe5efb78f76d39c41f28333144d6
# Parent 0824a3519c14d643a81dd4f718846f15045772ec
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507625355 -7200
# Tue Oct 10 10:49:15 2017 +0200
# Node ID 429c6e9c7c3a4f601db17c6553a8fcdad35708a8
# Parent 37b4375b1221e3bda055f0cbecf06b3c9510fd2c
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507905546 -7200
# Fri Oct 13 16:39:06 2017 +0200
# Node ID 0824a3519c14d643a81dd4f718846f15045772ec
# Parent 3885ce0a46c11f714335aafa38876b4d0c0aed9b
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
# HG changeset patch
# User Boris Feld
# Date 1507489322 -7200
# Sun Oct 08 21:02:02 2017 +0200
# Node ID 863c2407bfabe9b23b28d01582f53d318b6ae9fc
# Parent 78e6b5c73ed70bd98a0aff7a4f1757a99ea11982
# EXP-Topic config.register.ready
# Available At https://bitbucket.org/octobus/mercurial-devel/
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
Seems like we should figure out the spacing stuff on
https://phab.mercurial-scm.org/D1028 before moving forward here.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.
ryanmce accepted this revision as: ryanmce.
ryanmce added a comment.
Accepting as myself (not as a reviewer though, since we're both FB). I'm a
big +1 on this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1046
To: quark, #hg-reviewers, ryanmce
Cc: ryanmce, me
quark added a comment.
In https://phab.mercurial-scm.org/D1047#17465, @dlax wrote:
> As an end user, I'd probably not use this; it's too much magic.
`restack` is used pretty frequently by internal users. I think it could be
hard for some users (ex. designers) to understand the DAG
ryanmce added a comment.
I thought it was string that check-code doesn't fire on
https://phab.mercurial-scm.org/D1030 but does fire here.
It turns out that the check-code only finds spaces at the start of the line.
So is you start with a tab and then spaces, that's fine. But if you start
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd00ec62d156f: i18n: cache translated messages per encoding
(authored by yuja, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1053?vs=2670&id=2694
1 - 100 of 148 matches
Mail list logo
