This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc037fd655b47: ssh: fix flakey ssh errors on BSD systems
(authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D687?vs=1743&id=1746
REVISION DETAIL
durin42 accepted this revision.
durin42 added a comment.
This revision is now accepted and ready to land.
pushed with delight, may the solaris builders smile on us
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D687
To: durham, #hg-reviewers, quark, durin42
Cc: d
quark accepted this revision.
quark added a comment.
Looks reasonable. Thanks for tracking this down!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D687
To: durham, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
M
durham created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously revlog.addgroup would accept a changegroup and a linkmapper and use
it to iterate of the deltas. As part of untangling
martinvonz added inline comments.
INLINE COMMENTS
> context.py:700
>
> -class basefilectx(object):
> +class abstractfilectx(object):
> +def data(self):
Feel like checking out the "abc" module and see if that's helpful here?
> context.py:854
> """
> if fctx._customcmp:
>
durham added a comment.
Best viewed using the ignore-all-whitespace setting (in the History tab).
https://phab.mercurial-scm.org/D687?vs=on&id=1743&whitespace=ignore-all#toc
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D687
To: durham, #hg-reviewers
Cc: mercu
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf698bb31bdfb: context: add overlayworkingcontext and
overlayworkingfilectx (authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D616?vs=1723&id=1744#toc
REPOSITORY
rHG Mercu
durham created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There's been a persistent issue with flakiness on BSD systems (like OSX) where
the 'no suitable response from remote hg' message would sometimes not appear.
This
martinvonz added a comment.
Oops, I just found some old unsubmitted comments here. Sorry
INLINE COMMENTS
> merge.py:1749-1751
> +if err.errno != errno.ENOENT:
> +raise
> +return None
Now that we this is a function and "return" can be used to prevent execution of
durham created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Extensions, like remotefilelog, will want to look at the source of a pull when
determining what manifests to add to a changegroup. For instance, on push they
will
quark accepted this revision as: quark.
quark added a comment.
Generally look good to me.
INLINE COMMENTS
> revlog.py:308
> self._maxdeltachainspan = -1
> +self._mmapindexthreshold = None
>
This variable is only used in `__init__` so it is unnecessary to attach it to
revl
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG92f1e2be8ab6: changegroup: rename getsubsetraw to
makestream (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D671?vs=1698&id=1740
REVISION DE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdbf598196f05: changegroup: remove external uses of
getbundler (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D670?vs=1697&id=1739
REVISION D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5ede882c249c: changegroup: replace getchangegroup with
makechangegroup (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D669?vs=1696&id=1738
R
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1632999d4bed: changegroup: replace changegroup with
makechangegroup (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D668?vs=1695&id=1737
REVI
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf7d41b85bbf6: changegroup: replace changegroupsubset with
makechangegroup (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D665?vs=1692&id=1734
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf85dfde1731a: changegroup: replace getsubset with
makechangegroup (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D664?vs=1691&id=1733
REVISI
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6097a616178d: changegroup: delete getlocalchangegroup
(authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D667?vs=1694&id=1736
REVISION DETAIL
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd8245139e720: changegroup: replace getlocalchangegroupraw
with makestream (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D666?vs=1693&id=1735
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
Could I request a follow-up to add docstrings to our new preferred APIs?
Otherwise, this entire series looks great! Thank you for the cleanup work.
These APIs were in desperate need
quark accepted this revision.
quark added a comment.
Generally look good to me. I think core hg does not have very convenient
commit editing APIs yet (memctx feels too low-level). I'm counting on
in-memory-memory work to provide convenient APIs eventually. So I'd hold on
refactoring until we
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
I agree that passing in the outgoing data structure makes sense. Discovery
should be done before changegroup APIs are called.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.
phillco added inline comments.
INLINE COMMENTS
> martinvonz wrote in context.py:2145-2149
> Unrelated to this patch, but this interface seems pretty uglily asymmetric
> (flags() returns a string of character flags, setflags() take two boolean
> flags). And that's why you're forced to make the f
pulkit updated this revision to Diff 1731.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D614?vs=1581&id=1731
REVISION DETAIL
https://phab.mercurial-scm.org/D614
AFFECTED FILES
mercurial/dispatch.py
mercur
pulkit updated this revision to Diff 1730.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D612?vs=1580&id=1730
REVISION DETAIL
https://phab.mercurial-scm.org/D612
AFFECTED FILES
mercurial/registrar.py
CHANGE
martinvonz added inline comments.
INLINE COMMENTS
> context.py:2009
> +else:
> +raise ProgrammingError("No such file or directory: %s" %
> + self._path)
test-check-pyflakes.t fails with
+ mercurial/context.py:2009: undefined n
pulkit marked 15 inline comments as done.
pulkit added inline comments.
INLINE COMMENTS
> yuja wrote in uncommit.py:173
> I'm not sure if this `retractboundary()` is valid. cmdutil.amend()
> appears to use phases.new-commit config instead.
The phases.new-commit config update the phase to old.pha
pulkit updated this revision to Diff 1729.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D529?vs=1712&id=1729
REVISION DETAIL
https://phab.mercurial-scm.org/D529
AFFECTED FILES
hgext/uncommit.py
tests/test
phillco updated this revision to Diff 1728.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D673?vs=1703&id=1728
REVISION DETAIL
https://phab.mercurial-scm.org/D673
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mer
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Largefiles isn't a good candidate for in-memory merge (it uses a custom
dirstate, matcher, and the files might not fit in memory) so have it always
run an old-st
phillco added a comment.
*https://phab.mercurial-scm.org/D682 and https://phab.mercurial-scm.org/D683
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D672
To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-deve
phillco updated this revision to Diff 1726.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D682?vs=1725&id=1726
REVISION DETAIL
https://phab.mercurial-scm.org/D682
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mer
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will allow anyone to enable the first in-menmory merge milestone
by wrapping merge.update in an extension and creating an overlayworkingctx.
REPOSITORY
rHG
phillco added a comment.
Abandoned in favor of the approach in https://phab.mercurial-scm.org/D682.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D672
To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel
phillco updated this revision to Diff 1724.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D674?vs=1704&id=1724
REVISION DETAIL
https://phab.mercurial-scm.org/D674
AFFECTED FILES
mercurial/context.py
mercurial/filemerge.py
tests/test-dirstate-race.
phillco updated this revision to Diff 1723.
phillco marked 6 inline comments as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D616?vs=1708&id=1723
REVISION DETAIL
https://phab.mercurial-scm.org/D616
AFFECTED FILES
mercurial/context.py
CHANGE DE
ryanmce accepted this revision.
ryanmce added a comment.
looks good
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D680
To: mbthomas, ryanmce, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial
mbthomas abandoned this revision.
mbthomas added a comment.
As suggested by @ryanmce I have split this into
https://phab.mercurial-scm.org/D679 and https://phab.mercurial-scm.org/D680.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D677
To: mbthomas, #hg-reviewe
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When ui.origbackuppath is set, .orig files are stored outside of the working
copy. However conflicts can occur when files or directories end up having the
same
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG15ec3119d500: rebase: use unfiltered repo when loading
state (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D643?vs=1680&id=1718
REVISION DET
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7471193be725: rebase: remove unnecessary '.unfiltered()'
calls (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D645?vs=1645&id=1720
REVISION D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8a8e7a94ba07: rebase: do not crash rebasing merge with a
parent having hidden successor (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D640?vs
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5d45a997d11d: rebase: remove complex unhiding code
(authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D644?vs=1644&id=1719
REVISION DETAIL
http
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When ui.origbackuppath is set, .orig files are stored outside of the working
copy, however they still have a .orig suffix appended to them. This can cause
unex
martinvonz added inline comments.
INLINE COMMENTS
> context.py:2030
> +
> +def write(self, path, data, flags=None):
> +if data is None:
use flags='' here too and you can drop the check below
> context.py:2033-2038
> +self._markdirty(path)
> +self._cache[path]['exists
quark requested changes to this revision.
quark added a comment.
This revision now requires changes to proceed.
Scanning staling patches - I think this patch is good after making fd work
with both file object and file descriptor number.
I will fix it in-place if you don't get it on Wednes
quark added a comment.
In theory things would be fine because fbamend and inhibit is to make things
more visible, not invisible. This patch also makes things from invisible to
visible so they do not conflict.
I have run `./run-tests.py --extra-config-opt=extensions.fbamend=
--extra-conf
martinvonz added inline comments.
INLINE COMMENTS
> changegroup.py:225
> +# the entire list. It's the end of the entire list if
> there
> +# were no entries (i.e. empty is True).
> +if parts < 2:
I'll s/empty/noentries/ in flight.
REP
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
I think this will be a bit easier to ingest as two patches: one to deal with
the conflicting directories and one to remove the .orig from files with a
custom destination.
T
durham accepted this revision.
durham added a comment.
Looks good, except for my ui.allowemptycommit comment.
INLINE COMMENTS
> uncommit.py:59
> +files = (initialfiles - exclude)
> +allowempty = allowempty or repo.ui.configbool('ui', 'allowemptycommit')
> +if not files and not all
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When ui.origbackuppath is set, .orig files are stored outside of the working
copy. However conflicts can occur when files or directories end up having the
same
pulkit updated this revision to Diff 1712.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D529?vs=1330&id=1712
REVISION DETAIL
https://phab.mercurial-scm.org/D529
AFFECTED FILES
hgext/uncommit.py
tests/test-uncommit.t
CHANGE DETAILS
diff --git a/te
2 new changesets (2 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/e05e50fbdeaf
changeset: 34089:e05e50fbdeaf
branch: stable
parent: 34027:3c3066367d72
user:Mads Kiilerich
date:Mon Sep 11 00:42:22 2017 +0200
summary: mq: test coverage of how [di
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe7660cef5510: changegroup: fix to allow empty manifest
parts (authored by durham).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D646?vs=1646&id=1711
REVISION DE
# HG changeset patch
# User Boris Feld
# Date 1498787154 -7200
# ven. juin 30 03:45:54 2017 +0200
# Node ID 34ae7b710192ced203102f80f6a1f73e42341d3b
# Parent a763c891f36e55f4869f443c220227d1da747d18
# EXP-Topic config.register.win32mbcs
configitems: register the 'win32mbcs.encoding' config
# HG changeset patch
# User Boris Feld
# Date 1498786766 -7200
# ven. juin 30 03:39:26 2017 +0200
# Node ID 6b6d538975c8600092024aa9693b5be4c8738633
# Parent e5c4424dc0dabfa817f41fc81a49b4232fda05e6
# EXP-Topic config.register.eol
configitems: register the 'eol.native' config
diff -r e5c442
# HG changeset patch
# User Boris Feld
# Date 1498786772 -7200
# ven. juin 30 03:39:32 2017 +0200
# Node ID 2b18c5a143a5aaca4f3ca053eeb84972b6836469
# Parent 6b6d538975c8600092024aa9693b5be4c8738633
# EXP-Topic config.register.eol
configitems: register the 'eol.only-consistent' config
diff
# HG changeset patch
# User Boris Feld
# Date 1498786761 -7200
# ven. juin 30 03:39:21 2017 +0200
# Node ID e5c4424dc0dabfa817f41fc81a49b4232fda05e6
# Parent a763c891f36e55f4869f443c220227d1da747d18
# EXP-Topic config.register.eol
configitems: register the 'eol.fix-trailing-newline' config
# HG changeset patch
# User Boris Feld
# Date 1498787023 -7200
# ven. juin 30 03:43:43 2017 +0200
# Node ID 3ca211a67a589696469faa6fb395499dc8788e84
# Parent 9427d3096d063f598b0494b13db34e6da8d9b80d
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.publicurl' config
# HG changeset patch
# User Boris Feld
# Date 1498787021 -7200
# ven. juin 30 03:43:41 2017 +0200
# Node ID 9427d3096d063f598b0494b13db34e6da8d9b80d
# Parent 6040b7a8c74c9e3fe037b70cb6f1eefa3cbb6872
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.intro' config
dif
# HG changeset patch
# User Boris Feld
# Date 1498787017 -7200
# ven. juin 30 03:43:37 2017 +0200
# Node ID f6e0ac2346b8b5dc54560eb5e9b235dcbec9c3b2
# Parent a763c891f36e55f4869f443c220227d1da747d18
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.bundletype' config
# HG changeset patch
# User Boris Feld
# Date 1498787020 -7200
# ven. juin 30 03:43:40 2017 +0200
# Node ID 6040b7a8c74c9e3fe037b70cb6f1eefa3cbb6872
# Parent 582ed2ff6fef719d074e29425a1517d210358155
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.from' config
diff
# HG changeset patch
# User Boris Feld
# Date 1498787018 -7200
# ven. juin 30 03:43:38 2017 +0200
# Node ID 6bb52f8fe58399f4d1a7caec44e3ae5c9078e159
# Parent f6e0ac2346b8b5dc54560eb5e9b235dcbec9c3b2
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.confirm' config
d
# HG changeset patch
# User Boris Feld
# Date 1498787019 -7200
# ven. juin 30 03:43:39 2017 +0200
# Node ID 582ed2ff6fef719d074e29425a1517d210358155
# Parent 6bb52f8fe58399f4d1a7caec44e3ae5c9078e159
# EXP-Topic config.register.patchbomb
configitems: register the 'patchbomb.flagtemplate' conf
On Mon, 11 Sep 2017 00:43:27 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich
> # Date 1505083342 -7200
> # Mon Sep 11 00:42:22 2017 +0200
> # Branch stable
> # Node ID e05e50fbdeaf7eb52a2936e1dfe98643d68c334e
> # Parent 3c3066367d72344935aabf9606a5b40e9950b5e7
> m
65 matches
Mail list logo
