yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
Suppose this is a kind of contrib code, I think it's good enough to accept.
Can you drop Cargo.lock file?
INLINE COMMENTS
> Cargo.lock:1
> +[[package]]
> +name = "aho-corasick"
On Tue, 19 Dec 2017 21:52:15 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov
> # Date 1513687285 -28800
> # Tue Dec 19 20:41:25 2017 +0800
> # Node ID c7259f4340b50c8b1863ac9a1379ab8412b27b87
> # Parent
On Tue, 02 Jan 2018 23:55:08 -0500, Matt Harbison wrote:
> On Thu, 28 Dec 2017 08:04:01 -0500, Yuya Nishihara wrote:
> > On Wed, 27 Dec 2017 03:27:58 -0500, Matt Harbison wrote:
> >> # HG changeset patch
> >> # User Matt Harbison
> >> # Date 1514349649
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa0fab647a8f1: revlog: dont use slicing to return
parents (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1764?vs=4625=4702
On Thu, 04 Jan 2018 12:40:39 +0100, Elmar Bartel wrote:
> mercurial/crecord.py | 21 -
> 1 files changed, 16 insertions(+), 5 deletions(-)
>
>
> # HG changeset patch
> # User Elmar Bartel
> # Date 1515064327 -3600
> # Thu Jan 04 12:12:07 2018 +0100
> #
On Thu, 04 Jan 2018 21:59:09 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1514945910 18000
> # Tue Jan 02 21:18:30 2018 -0500
> # Node ID b8a794103bbb0506069f2b0ad101ba6b0455dc26
> # Parent
On Thu, 04 Jan 2018 21:56:52 -0500, Matt Harbison wrote:
> On Thu, 04 Jan 2018 02:39:40 -0500, Yuya Nishihara wrote:
>
> > On Tue, 02 Jan 2018 22:49:13 -0500, Matt Harbison wrote:
> >> # HG changeset patch
> >> # User Matt Harbison
> >> # Date 1514945910
On Thu, 04 Jan 2018 14:49:54 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov
> # Date 1514943661 -28800
> # Wed Jan 03 09:41:01 2018 +0800
> # Node ID 3ecf6cb83ef66db56948d3b47142f06c941281e6
> # Parent
yuja added a comment.
> However, it is quite large and I suspect it will take a bit more effort to
finish it.
Isn't that something like `dirstateTupleType`? If we had a native type, we
wouldn't
need https://phab.mercurial-scm.org/D1767,
https://phab.mercurial-scm.org/D1768, and
phillco updated this revision to Diff 4700.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1807?vs=4698=4700
REVISION DETAIL
https://phab.mercurial-scm.org/D1807
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git
phillco updated this revision to Diff 4699.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1806?vs=4697=4699
REVISION DETAIL
https://phab.mercurial-scm.org/D1806
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git
phillco updated this revision to Diff 4697.
phillco edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1806?vs=4688=4697
REVISION DETAIL
https://phab.mercurial-scm.org/D1806
AFFECTED FILES
mercurial/filemerge.py
phillco updated this revision to Diff 4698.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1807?vs=4689=4698
REVISION DETAIL
https://phab.mercurial-scm.org/D1807
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> revlog.c:141
> + if (!value) {
> + PyErr_SetString(PyExc_ValueError,
> + "could not retrieve
# HG changeset patch
# User Matt Harbison
# Date 1514742456 18000
# Sun Dec 31 12:47:36 2017 -0500
# Node ID 2798cb4faacdae2db46e84ba0f3beaf506848915
# Parent 44931c485edcd82b0a90fb70c5294a2dc55edc16
test-lfs: bump the number on test repo11 and higher
This will
# HG changeset patch
# User Matt Harbison
# Date 1514704880 18000
# Sun Dec 31 02:21:20 2017 -0500
# Node ID 8c20ade835ce43441c61e56e63d9bf92deaacd55
# Parent 2798cb4faacdae2db46e84ba0f3beaf506848915
lfs: add a small language to filter files
This patch was authored
# HG changeset patch
# User Matt Harbison
# Date 1514706889 18000
# Sun Dec 31 02:54:49 2017 -0500
# Node ID 860f79f99faded4b711381b827eced30c0009e31
# Parent 8c20ade835ce43441c61e56e63d9bf92deaacd55
lfs: migrate file filtering from threshold to custom filter
This
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
> We hold off incrementing the version of the "parsers" extension
> because nothing in core relies on the new API yet.
It's really minor nit, but we have to increment the
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> revlog.c:1876
>
> + /* Initialize before argument-checking to avoid index_dealloc() crash.
> */
> + self->nullentry = Py_BuildValue("iiis#", 0, 0,
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> test-parseindex2.py:182
> +
> +idxa = [map(normvalue, a[0])]
> +idxb = [map(normvalue, b[0])]
Perhaps you mean `list(map(...))` instead of a list of one
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG711149d8e676: tests: switch test from --config
ui.editor=~/foo to HGEDITOR=~/foo (authored by spectral, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
krbullock requested changes to this revision.
krbullock added a comment.
This revision now requires changes to proceed.
This has new failures in test-obshistory.t and test-directaccess.t, can you
rebase?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1591
To:
krbullock accepted this revision.
krbullock added a comment.
This revision is now accepted and ready to land.
Queued, thanks
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1809
To: spectral, #hg-reviewers, krbullock
Cc: krbullock, mercurial-devel
krbullock requested changes to this revision.
krbullock added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> debugcommands.py:1212
> fm.write('editor', _("checking commit editor... (%s)\n"), editor)
> -cmdpath =
22 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/dfaf9f10e2e5
changeset: 35498:dfaf9f10e2e5
user:Yuya Nishihara
date:Mon Dec 25 22:56:59 2017 +0900
summary: show: use revlog function to compute length of the longest
shortest node
krbullock requested changes to this revision.
krbullock added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> githelp.py:883
> +cmd = Command('status')
> cmd['--change'] = 'tip'
> else:
I don't think `tip` is correct here,
krbullock accepted this revision.
krbullock added a comment.
Queued, thanks
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1591
To: lothiraldan, #hg-reviewers, durin42, pulkit, krbullock
Cc: krbullock, pulkit, durin42, mercurial-devel
# HG changeset patch
# User Matt Harbison
# Date 1514945910 18000
# Tue Jan 02 21:18:30 2018 -0500
# Node ID b8a794103bbb0506069f2b0ad101ba6b0455dc26
# Parent 31fe397f2bdab5fea4752947e70549e7a7d04f75
lfs: add a local store method for opening a blob
The has() and
# HG changeset patch
# User Matt Harbison
# Date 1514947617 18000
# Tue Jan 02 21:46:57 2018 -0500
# Node ID 44931c485edcd82b0a90fb70c5294a2dc55edc16
# Parent b8a794103bbb0506069f2b0ad101ba6b0455dc26
lfs: use the local store method for opening a blob
I noticed that
On Thu, 04 Jan 2018 02:39:40 -0500, Yuya Nishihara wrote:
On Tue, 02 Jan 2018 22:49:13 -0500, Matt Harbison wrote:
# HG changeset patch
# User Matt Harbison
# Date 1514945910 18000
# Tue Jan 02 21:18:30 2018 -0500
# Node ID
spectral updated this revision to Diff 4695.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1808?vs=4694=4695
REVISION DETAIL
https://phab.mercurial-scm.org/D1808
AFFECTED FILES
mercurial/debugcommands.py
tests/test-install.t
CHANGE DETAILS
diff
spectral updated this revision to Diff 4694.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1808?vs=4692=4694
REVISION DETAIL
https://phab.mercurial-scm.org/D1808
AFFECTED FILES
mercurial/debugcommands.py
tests/test-install.t
CHANGE DETAILS
diff
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The test is currently not testing anything, the '--config ui.editor=~/path'
argument is apparently of lower priority than the HGEDITOR that run-tests.py
is
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
A user was in #mercurial and had the following settings in their hgrc:
[ui]
editor = C:\home\npp\notepad++.exe -multiInst -nosession
After
https://bz.mercurial-scm.org/show_bug.cgi?id=5766
Bug ID: 5766
Summary: pull --rebase aborts if working dir not clean even if
nothing to rebase
Product: Mercurial
Version: 4.4.2
Hardware: PC
OS: Windows
phillco added a comment.
> Should we even be calling _makebackup in the case of an inmemory merge?
Like, maybe the makebackup should be conditional based on if the source file
context is actually a workingctx?
The merge process itself uses the backup, it's not just for the user.
INLINE
durham accepted this revision.
durham added a comment.
Accepting, since it seems more correct than before.
Should we even be calling _makebackup in the case of an inmemory merge?
Like, maybe the makebackup should be conditional based on if the source file
context is actually a
mharbison72 added a comment.
It looks like keepalive.safesend() isn't sending everything. I can send this
to the mailing list if it gets mangled, but I figured I'd try to keep this
thread together if possible.
# HG changeset patch
# User Matt Harbison
On Thu, Jan 04, 2018 at 07:36:55PM +, phillco (Phil Cohen) wrote:
> phillco created this revision.
> Herald added a subscriber: mercurial-devel.
> Herald added a reviewer: hg-reviewers.
>
> REVISION SUMMARY
> If the user specifies a ui.origbackuppath, we used to always copy the file
>
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
If the user specifies a ui.origbackuppath, we used to always copy the file
there, but if the source file is in memory we must write it instead of
copying.
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This wasn't broken, but should mirror the non-in memory case to save an extra
write.
REPOSITORY
rHG Mercurial
REVISION DETAIL
mercurial/crecord.py | 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
# HG changeset patch
# User Elmar Bartel
# Date 1515065680 -3600
# Thu Jan 04 12:34:40 2018 +0100
# Node ID 528873b321141114df5dcb8327d86ed691e2964b
# Parent
mercurial/crecord.py | 21 -
1 files changed, 16 insertions(+), 5 deletions(-)
# HG changeset patch
# User Elmar Bartel
# Date 1515064327 -3600
# Thu Jan 04 12:12:07 2018 +0100
# Node ID 04fe74a8269a68c78a57a9f3698f1c87eff09e74
# Parent
On Thu, 2018-01-04 at 18:36 +0900, Yuya Nishihara wrote:
> On Thu, 04 Jan 2018 09:44:17 +0100, Boris Feld wrote:
> > On Thu, 2018-01-04 at 16:50 +0900, Yuya Nishihara wrote:
> > > On Wed, 03 Jan 2018 17:00:35 +0100, Boris Feld wrote:
> > > > What about introducing a intermediary function
On Thu, 04 Jan 2018 09:44:17 +0100, Boris Feld wrote:
> On Thu, 2018-01-04 at 16:50 +0900, Yuya Nishihara wrote:
> > On Wed, 03 Jan 2018 17:00:35 +0100, Boris Feld wrote:
> > > What about introducing a intermediary function obsfatedata that
> > > would
> > > returns a dictionary with all the raw
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG02fdb8c018aa: update: support updating to hidden cset if
directaccess config is set (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGba0fb0e33c3a: commands: check for empty rev before passing
to scmutil.unhidehashlikerevs (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG31fe397f2bda: revert: support reverting to hidden cset if
directaccess config is set (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
On Thu, 2018-01-04 at 16:50 +0900, Yuya Nishihara wrote:
> On Wed, 03 Jan 2018 17:00:35 +0100, Boris Feld wrote:
> > What about introducing a intermediary function obsfatedata that
> > would
> > returns a dictionary with all the raw values.
> >
> > Something like:
> >
> > {'markers': [..., ...],
# HG changeset patch
# User Yuya Nishihara
# Date 1508680151 -32400
# Sun Oct 22 22:49:11 2017 +0900
# Node ID d944bd7c3801f1fb4fa36f428abe79ab714297a8
# Parent a7ad7ce089a3d9473c98d094da670834ba40bdb6
log: drop unused expr from return value of getlogrevs()
Future patches
# HG changeset patch
# User Yuya Nishihara
# Date 1508680356 -32400
# Sun Oct 22 22:52:36 2017 +0900
# Node ID 759d00588ebec2f0b9f6c6a762a7ba970e0f8d26
# Parent 731765e1876ba38dae45b53a5aed2c204f8c03d5
graphlog: remove redundant check for empty revs
diff --git
# HG changeset patch
# User Yuya Nishihara
# Date 1515034818 -32400
# Thu Jan 04 12:00:18 2018 +0900
# Node ID a7ad7ce089a3d9473c98d094da670834ba40bdb6
# Parent 759d00588ebec2f0b9f6c6a762a7ba970e0f8d26
log: don't expand aliases in revset built from command options
Only -rREV
# HG changeset patch
# User Yuya Nishihara
# Date 1508679496 -32400
# Sun Oct 22 22:38:16 2017 +0900
# Node ID 731765e1876ba38dae45b53a5aed2c204f8c03d5
# Parent dfe3c291d4011a5e15277f7fdb234a71c504a1a1
log: remove redundant handling of --limit
A returned 'revs' set is
# HG changeset patch
# User Yuya Nishihara
# Date 1508681047 -32400
# Sun Oct 22 23:04:07 2017 +0900
# Node ID dfe3c291d4011a5e15277f7fdb234a71c504a1a1
# Parent 340e4b15e4e6d6d020d2c7d8f8683c7c11598925
log: use smartset.slice() to limit number of revisions to be displayed
# HG changeset patch
# User Yuya Nishihara
# Date 1515030701 -32400
# Thu Jan 04 10:51:41 2018 +0900
# Node ID 340e4b15e4e6d6d020d2c7d8f8683c7c11598925
# Parent e01549a7bf0a6a7adbbb317a5d4bfde36c205b4d
log: merge getlogrevs() and getgraphlogrevs()
cmdutil.graphlog() is
wlis added a comment.
@mharbison72 Thank you for commenting with this issue. We didn't roll this to
many people yet and didn't see the issue. I will try to test the scenario with
upload of many large files and I'll comment back here soon.
REPOSITORY
rHG Mercurial
REVISION DETAIL
56 matches
Mail list logo