16 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/3bb2a9f25fe9
changeset: 34295:3bb2a9f25fe9
user:Mark Thomas
date:Thu Sep 21 05:54:34 2017 -0700
summary: util: add an mmapread method
4 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/1db9abf407c5
changeset: 34291:1db9abf407c5
user:Durham Goode
date:Wed Sep 20 09:22:22 2017 -0700
summary: revlog: add revmap back to revlog.addgroup
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
unamend extension adds an unamend command which undoes the effect of the amend
command. This patch moves the unamend command from that extension to uncommit
On 25-9-2017 15:23, Yuya Nishihara wrote:
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
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, the ETA and speed assumes the progress is linear. Often, due to
network or other issues, it could be fast for the most time, and suddenly
slow down:
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch limits the estimate time interval to roughly the last minute
(configurable by `estimateinterval`) to be more practical. See the test
change for what it
durin42 added a comment.
I would bias towards just having one change that advances to using
`[experimental]` if we want to rename this again. I don't think we need to take
the rollback-then-forward approach, seems like unnecessary ceremony. Let's just
talk this over at the sprint?
martinvonz added a comment.
In https://phab.mercurial-scm.org/D542#13779, @quark wrote:
> In https://phab.mercurial-scm.org/D542#13621, @martinvonz wrote:
>
> > I've found the information from the effectflag that's used in "hg obslog"
useful. As you've probably seen, I've also sent a
quark added a comment.
In https://phab.mercurial-scm.org/D542#13621, @martinvonz wrote:
> I've found the information from the effectflag that's used in "hg obslog"
useful. As you've probably seen, I've also sent a patch for recording the
operation by default (implemented by Durham once
lothiraldan added a comment.
> I've found the information from the effectflag that's used in "hg obslog"
useful. As you've probably seen, I've also sent a patch for recording the
operation by default (implemented by Durham once upon a time, I think). I don't
mind seeing turning both of
quark added inline comments.
INLINE COMMENTS
> ryanmce wrote in histedit.py:861
> `hide` is really only FB-internal naming. In regular/core hg, this would
> still likely be a `strip`.
Strictly speaking, it is "rebase", which is not 100% equal to graft + hide. The
latter does not create an
lothiraldan added a comment.
Sorry for the lag, I was at a conference.
I didn't planned for such changes, but I think it's a very good idea! I'm
gonna send patches soon. Do you think I should start a new series of patch or
add new patch on top of the backout?
REPOSITORY
rHG Mercurial
mbthomas added inline comments.
INLINE COMMENTS
> ryanmce wrote in histedit.py:867-868
> Thinking about this more, I think this is pretty non-obvious to an average
> user.
>
> In fact, the "move" versus "pick" difference is really unclear in general.
> Why must I "pick" something in the set,
quark added inline comments.
INLINE COMMENTS
> durham wrote in scmutil.py:603
> This seems like a bit of a bizarre feature for an api about cleaning up
> nodes. Maybe cleanup nodes should return a mapping of before-to-after and
> the caller can use that to perform an update if they need to?
mbthomas added inline comments.
INLINE COMMENTS
> ryanmce wrote in merge.py:654
> Why do we need to audit this path first? If we fail the audit, what happens?
> This looks weird to me.
As in `_checkunknownfile`, this is to avoid symlink traversal while checking
these files.
Consider:
$ ln
mbthomas added a comment.
This doesn't actually become a problem until
https://phab.mercurial-scm.org/D781. For now `backup` can only be true if `f`
conflicts with a real file. If it has a path conflict then we fail earlier.
In https://phab.mercurial-scm.org/D781 I will add the
pulkit updated this revision to Diff 2089.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D763?vs=2084=2089
REVISION DETAIL
https://phab.mercurial-scm.org/D763
AFFECTED FILES
mercurial/configitems.py
mercurial/copies.py
mbthomas added inline comments.
INLINE COMMENTS
> ryanmce wrote in merge.py:1461
> Thanks for remembering to preserve copy information!
>
> Did you test with transitive renames? Something like:
>
> I rename `a` -> `b`
> I run `hg update @` and `@` has a new directory `b`
> Then `b` gets
ryanmce added inline comments.
INLINE COMMENTS
> mbthomas wrote in filemerge.py:537
> Typo: `nonrzero`.
doh!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D789
To: ryanmce, #hg-reviewers, quark, yuja, mbthomas
Cc: mbthomas, yuja, quark, mercurial-devel
On Tue, 26 Sep 2017 16:56:53 +0300, Ippolitov Igor wrote:
> # HG changeset patch
> # User Igor Ippolitov
> # Date 1506431697 -10800
> # Tue Sep 26 16:14:57 2017 +0300
> # Node ID 7517d15f37a7a2480e250ba8e95514534f9a48bf
> # Parent
phillco updated this revision to Diff 2088.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D674?vs=1989=2088
REVISION DETAIL
https://phab.mercurial-scm.org/D674
AFFECTED FILES
mercurial/context.py
mercurial/filemerge.py
CHANGE DETAILS
diff --git
mbthomas requested changes to this revision.
mbthomas added inline comments.
INLINE COMMENTS
> filemerge.py:537
> +def onerr(*args):
> +msg = _('merge aborted due to nonrzero mergetool return code')
> +raise error.Abort(msg)
Typo: `nonrzero`.
REPOSITORY
rHG
# HG changeset patch
# User Igor Ippolitov
# Date 1506431697 -10800
# Tue Sep 26 16:14:57 2017 +0300
# Node ID 7517d15f37a7a2480e250ba8e95514534f9a48bf
# Parent 05131c963767faaac6a66b2c658659bfbb4db29b
mail: encode long unicode lines in emails properly (issue5687)
pulkit planned changes to this revision.
pulkit added inline comments.
INLINE COMMENTS
> yuja wrote in copies.py:391
> Oops. `repo` isn't passed to this function.
>
> Write tests?
Ah, my bad. Thanks for catching. Yeah will include tests in the next version.
REPOSITORY
rHG Mercurial
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9bd003052d55: keepalive: add more context to bad status
line errors (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGafcbc6f64d27: tests: add interface checks for bundle,
statichttp, and union peers (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb94db1780365: chg: show timestamp with debug messages
(authored by quark, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D807?vs=2069=2087#toc
REPOSITORY
rHG Mercurial
ryanmce added a comment.
Thanks for the feedback @yuja! I'll work on a second version.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D789
To: ryanmce, #hg-reviewers, quark, yuja
Cc: yuja, quark, mercurial-devel
___
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
Can you rename or fold the test so we can do `./run-tests.py test-merge-*`?
INLINE COMMENTS
> filemerge.py:536
> +if repo.ui.configbool('merge', 'abortonfailure'):
> +def
phillco added a comment.
> One extra comment: maybe include some "why" as well as "what" in your
commit message. :)
Sorry I missed this, the comment is very valid. Will send a new version.
INLINE COMMENTS
> martinvonz wrote in filemerge.py:611
> Isn't repo.wjoin(fcd.path()) the same
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> copies.py:391
> +'copytrace.sourcecommitlimit')
> +commits = len(repo.revs('%d::%d', base.rev(), c1.rev()))
>
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/D807
To: quark, #hg-reviewers, indygreg, yuja
Cc: yuja, mercurial-devel
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
INLINE COMMENTS
> keepalive.py:238
> +except httplib.BadStatusLine as err:
> +raise urlerr.urlerror(_('bad HTTP status line: %s') % err.line)
>
On Mon, 25 Sep 2017 15:12:16 -0500, Kevin Bullock wrote:
> > 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,
pulkit updated this revision to Diff 2084.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D763?vs=1967=2084
REVISION DETAIL
https://phab.mercurial-scm.org/D763
AFFECTED FILES
mercurial/configitems.py
mercurial/copies.py
CHANGE DETAILS
diff --git
durham accepted this revision.
durham added inline comments.
INLINE COMMENTS
> test-directaccess.t:11
> + > [extensions]
> + > uncommit =
> + > amend =
Do we need uncommit? It doesn't seem used.
> test-directaccess.t:64
> +
> + $ hg exp 7
> + # HG changeset patch
I'm still not sure we
durham requested changes to this revision.
durham added a comment.
This revision now requires changes to proceed.
Probably needs a simple test, unless that comes later in the series.
INLINE COMMENTS
> dispatch.py:898
> +if cmdtype == readonly:
> +
durham accepted this revision.
durham added a comment.
Minor comments, but lgtm
INLINE COMMENTS
> registrar.py:143
> +unrecoverablewrite = "unrecoverable"
> +recoverablewrite = "recoverable"
> +readonly = "readonly"
Might be worth a comment describing what these mean, since it's
durham requested changes to this revision.
durham added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> scmutil.py:603
> +changes will be discarded, the caller is responsible for checking the
> +cleanness of working copy.
> """
This seems like a
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
Requesting changes per feedback on the "move" verb.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D818
To: mbthomas, #hg-reviewers, ryanmce
Cc:
ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.
I think we need to think about this one a bit more.
INLINE COMMENTS
> histedit.py:861
> +@action(['move', 'v'],
> + _('move (graft and hide) a changeset from
ryanmce accepted this revision.
ryanmce added inline comments.
INLINE COMMENTS
> histedit.py:861
> +@action(['copy', 'c'],
> + _('copy (graft) a changeset from elsewhere'))
> +class copy(histeditaction):
The formatting looks one space off here.
REPOSITORY
rHG Mercurial
REVISION
durham added inline comments.
INLINE COMMENTS
> indygreg wrote in dirstate.py:1370
> Nit: this should ideally be in a context manager or try..finally block. But
> it existed this way before, so not worth blocking over.
Left this alone for now to avoid code churn during the refactor.
durham marked an inline comment as done.
durham added inline comments.
INLINE COMMENTS
> indygreg wrote in dirstate.py:1373-1374
> This (pre-existing) error message is pretty bad because typical end users
> won't have a clue what it means or what to do if they see it.
Agreed. I'm not even
durham updated this revision to Diff 2080.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D756?vs=1951=2080
REVISION DETAIL
https://phab.mercurial-scm.org/D756
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham updated this revision to Diff 2083.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D759?vs=1954=2083
REVISION DETAIL
https://phab.mercurial-scm.org/D759
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham updated this revision to Diff 2081.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D757?vs=1952=2081
REVISION DETAIL
https://phab.mercurial-scm.org/D757
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham updated this revision to Diff 2082.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D758?vs=1953=2082
REVISION DETAIL
https://phab.mercurial-scm.org/D758
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham updated this revision to Diff 2079.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D755?vs=1950=2079
REVISION DETAIL
https://phab.mercurial-scm.org/D755
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham updated this revision to Diff 2078.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D754?vs=1949=2078
REVISION DETAIL
https://phab.mercurial-scm.org/D754
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
durham added inline comments.
INLINE COMMENTS
> indygreg wrote in dirstate.py:1345
> Do we want this inherit from `collections.MutableMapping`?
>
> A good reason to say "no" is KISS, especially if we'll be having multiple
> backends.
For now I'd say no, until we've done at least one other
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Add a new `histedit` action: `copy`. This allows copying of changesets from
outside of the history that is being edited, using the node hash of the other
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Add a new `histedit` action: `move`. This allows moving of changesets from
outside of the history that is being edited, using the node hash of the other
mbthomas 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/D818
AFFECTED FILES
tests/test-histedit-copymove-obs.t
tests/test-histedit-copymove.t
CHANGE
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The `move` action (in a future patch) will require the set of base nodes that
histedit is editing from. This is the parent of the first revision in the
stack,
# 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
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
58 matches
Mail list logo