Re: [PATCH] diff: graduate word-diff option from experimental

On Wed, 11 Jul 2018 23:08:37 +0530 Pulkit Goyal <7895pul...@gmail.com> wrote: > On Mon, Jul 9, 2018 at 6:29 PM Yuya Nishihara wrote: > > > On Sun, 8 Jul 2018 18:29:37 +0530, Pulkit Goyal wrote: > > > > --- a/mercurial/help/config.txt > > > > +++ b/mercurial/help/config.txt > > > > @@ -702,6 +702

D3932: tests: add test demonstrating phase loss when cloning (issue5939)

indygreg added a subscriber: lothiraldan. indygreg added a comment. I don't understand phases code that well and am not sure if I'll be able to contribute a fix for the underlying issue in the next few days. If someone wants to take a shot at it, I could use the help. CC @lothiraldan RE

D3932: tests: add test demonstrating phase loss when cloning (issue5939)

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The added tests demonstrate that phases exchange when using the listkeys based phases exchange fails to preserve public phase in a certain scenario when a merge

D3929: revlog: replace descendant(b, a) by isdescendantrev(a, b) (API)

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The "is" is to match "isancestor" and to make it clear that it doesn't return a descendant. The "rev" is to make it clear tha

D3931: revlog: introduce a isancestorrev() and use it in rebase

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3931 AFFECTED FILES hgext/rebase.py mercurial/revlog.py CHANGE

D3928: revlog: move comment about commonancestorsheads where it's used

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3928 AFFECTED FILES mercurial/revlog.py CHANGE DETAILS diff --g

D3930: revlog: make isdescendantrev(a, b) check if a < b

martinvonz created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This check was taken from rebase.py. It seems to make sense to move it here, but I haven't done any measurements. REPOSITORY

[Bug 5939] New: `hg pull` fails to promote draft changeset to public

https://bz.mercurial-scm.org/show_bug.cgi?id=5939 Bug ID: 5939 Summary: `hg pull` fails to promote draft changeset to public Product: Mercurial Version: default branch Hardware: All OS: All Status: UNCONFIRMED

[PATCH V2] tests: add diff color trailing whitespace test

# HG changeset patch # User Sune Foldager # Date 1531318293 -7200 # Wed Jul 11 16:11:33 2018 +0200 # Node ID 95fc4453e33a79acca36f978019a05ff9f4ae04a # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b tests: add diff color trailing whitespace test diff --git a/tests/test-diff-color.t b/tests

D3669: cmdutil: have statefile names in STATES instead of functions

pulkit planned changes to this revision. pulkit added a comment. I won't have time before the upcoming freeze to get this done. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3669 To: pulkit, #hg-reviewers Cc: martinvonz, mercurial-devel

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

> On 11 Jul 2018, at 17.21, Augie Fackler wrote: > > > >> On Jul 11, 2018, at 10:26, Sune Foldager via Mercurial-devel >> wrote: >> >>> Also please fix the check-code failure. >> >> Hm what’s wrong with -i? At any rate, I don’t have time to do this today. > > -i was added with different

D3672: retractboundary: add dryrun parameter

pulkit added a subscriber: yuja. pulkit added inline comments. INLINE COMMENTS > khanchi97 wrote in phases.py:417 > Because I think this affected set is calculated after performing actions, > when phases are changed. And calculating affected using new phaseroots. Am I > missing something here?

D3927: removeemptydirs: add test for `hg split` inside a disappearing directory

spectral 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/D3927 AFFECTED FILES tests/test-removeemptydirs.t CHANGE DETAILS diff --git a/tests/test-removeemptyd

[Bug 5938] New: Exception running `hg stat` using `fsmonitor.mode=paranoid`

https://bz.mercurial-scm.org/show_bug.cgi?id=5938 Bug ID: 5938 Summary: Exception running `hg stat` using `fsmonitor.mode=paranoid` Product: Mercurial Version: 4.6 Hardware: PC OS: Mac OS Status:

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

pulkit added a comment. In https://phab.mercurial-scm.org/D3919#61245, @durin42 wrote: > I think it would make sense to defer the behavior change until we test some more. That said, I do want us to plan to make an intentionally breaking change with the out of the box grep experience *wit

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

durin42 added a comment. I think it would make sense to defer the behavior change until we test some more. That said, I do want us to plan to make an intentionally breaking change with the out of the box grep experience *without* `tweakdefaults` enabled. My reasoning is more or less this: ap

D3920: grep: hide cryptic revision number by default

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaabc01da9834: grep: hide cryptic revision number by default (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3920?vs=9537&id=9550

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbfcd5c7cbf9a: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercuria

D3924: manifest: just duplicate the definition of items as iteritems

This revision was automatically updated to reflect the committed changes. Closed by commit rHG28c9d67d88ab: manifest: just duplicate the definition of items as iteritems (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3

D3925: tests: add missing b prefix in test-context.py

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa75896bf5ccb: tests: add missing b prefix in test-context.py (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3925?vs=9543&id=

D3926: scmutil: fix shortesthexnodeidprefix on Python 3 for 0-prefixed nodes

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc76692f401d: scmutil: fix shortesthexnodeidprefix on Python 3 for 0-prefixed nodes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-sc

D3922: revlog: adjust doctest examples to be portable to Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcd1c484e31e8: revlog: adjust doctest examples to be portable to Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3922

D3915: grep: rename --allfiles to --all-files

This revision was automatically updated to reflect the committed changes. Closed by commit rHGffd08ec22955: grep: rename --allfiles to --all-files (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3915?vs=9532&id=9545 REVIS

D3923: tests: properly sort imports in test-nointerrupt.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHG531f5e933e49: tests: properly sort imports in test-nointerrupt.t (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3923?vs=9541

D3921: py3: whitelist 3 more passing tests caught with the ratchet

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0d27d6bcfb28: py3: whitelist 3 more passing tests caught with the ratchet (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D392

D3918: grep: add config knob to enable/disable the default wdir search

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5e4027db52f4: grep: add config knob to enable/disable the default wdir search (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D39

D3917: grep: search working directory files by default if --all-files is specified

This revision was automatically updated to reflect the committed changes. Closed by commit rHGeba69ddd4e52: grep: search working directory files by default if --all-files is specified (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial

D3916: grep: reject --diff --all-files

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0d0f8bd692c4: grep: reject --diff --all-files (authored by yuja, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3916?vs=9533&id=9546 REVISION DET

D3926: scmutil: fix shortesthexnodeidprefix on Python 3 for 0-prefixed nodes

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fixes test-bookmarks.t on Python 3 (which had regressed.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3926 AFFECTED FILES

D3925: tests: add missing b prefix in test-context.py

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame just a b prefix REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3925 AFFECTED FILES tests/test-context.py CHANGE DET

D3922: revlog: adjust doctest examples to be portable to Python 3

durin42 created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The range() builtin returns a special object rather than a list, but we really wanted a list in these examples. REPOSITORY rH

D3924: manifest: just duplicate the definition of items as iteritems

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The forwarding trick was failing test-check-interfaces on Python 3. Duplicating a line of code is easy enough I'm doing that rather than try and figure out

D3923: tests: properly sort imports in test-nointerrupt.t

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Somehow this was only detected in Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3923 AFFECTED FILES tests/test-nointerr

D3921: py3: whitelist 3 more passing tests caught with the ratchet

durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3921 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff --

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

pulkit added a comment. In https://phab.mercurial-scm.org/D3919#61156, @sangeet259 wrote: > So what is the way around this, does this mean grep can't be changed at all? > Also can't we update hglib to work accordingly. I don't know enough about hglib, so can't say about that.

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

sangeet259 added a comment. So what is the way around this, does this mean grep can't be changed at all ? Also can't we update hglib to work accordingly. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3919 To: yuja, #hg-reviewers, sangeet259, pulkit Cc: merc

Re: [PATCH] diff: graduate word-diff option from experimental

On Mon, Jul 9, 2018 at 6:29 PM Yuya Nishihara wrote: > On Sun, 8 Jul 2018 18:29:37 +0530, Pulkit Goyal wrote: > > > --- a/mercurial/help/config.txt > > > +++ b/mercurial/help/config.txt > > > @@ -702,6 +702,9 @@ for related options for the annotate com > > > ``unified`` > > > Number of line

D3870: rebase: add --confirm option

khanchi97 added inline comments. INLINE COMMENTS > khanchi97 wrote in rebase.py:895 > @yuja will this work? Now instead of using "confirm" flag, I added > "needsabort" variable. And I rebased this revision to not depend on https://phab.mercurial-scm.org/D3830. REPOSITORY rHG Mercurial REVI

D3870: rebase: add --confirm option

khanchi97 added inline comments. INLINE COMMENTS > rebase.py:895 > finally: > -# no need to store backup in case of dryrun > -rbsrt._prepareabortorcontinue(isabort=True, backup=False, > - suppwarns=True) > +if n

D3870: rebase: add --confirm option

khanchi97 updated this revision to Diff 9538. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3870?vs=9502&id=9538 REVISION DETAIL https://phab.mercurial-scm.org/D3870 AFFECTED FILES hgext/rebase.py mercurial/cmdutil.py tests/test-rebase-inmemory.t

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

> On Jul 11, 2018, at 10:26, Sune Foldager via Mercurial-devel > wrote: > >> Also please fix the check-code failure. > > Hm what’s wrong with -i? At any rate, I don’t have time to do this today. -i was added with different behaviors on BSD and GNU sed. It's incompatible between those seds.

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

On Wed, 11 Jul 2018 16:26:25 +0200, Sune Foldager wrote: > Hm what’s wrong with -i? At any rate, I don’t have time to do this today. Perhaps, it's GNU extension. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

> On 11 Jul 2018, at 16.22, Yuya Nishihara wrote: > >> On Wed, 11 Jul 2018 16:10:32 +0200, Sune Foldager wrote: >> It’s not in the repo as far as I can see, but ok then... > > Maybe you aren't based on the hg-committed repo? > > https://www.mercurial-scm.org/repo/hg-committed/ Never heard of

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

On Wed, 11 Jul 2018 16:10:32 +0200, Sune Foldager wrote: > It’s not in the repo as far as I can see, but ok then... Maybe you aren't based on the hg-committed repo? https://www.mercurial-scm.org/repo/hg-committed/ > >> +trailing whitespace > >> + > >> + $ sed -i 's/^dd$/dd \r/' a > > > > + te

D3920: grep: hide cryptic revision number by default

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I believe nobody would want to see the "2147483647:" prefix while grepping working directory files. The wdir revision is still visible if "-r wdir()" is specifie

D3919: grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Unfortunately, python-hglib relies on the original grep behavior and is documented as such. Even though we agreed to introduce the BC, we shouldn't break existing l

D3918: grep: add config knob to enable/disable the default wdir search

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This allows us to conditionally enable the new behavior to unbreak python-hglib. See the next patch. The config option is undocumented since the --all-files is s

D3915: grep: rename --allfiles to --all-files

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This matches the config name to be added. Note that we don't have to keep the old flag since it isn't released yet. REPOSITORY rHG Mercurial REVISION DETAIL

D3917: grep: search working directory files by default if --all-files is specified

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The default was -rtip:0 before, but "--all-files -rtip:0" would be the most useless combination, and it isn't supported yet. Let's change the default to something u

D3916: grep: reject --diff --all-files

yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This combination doesn't make any sense since --diff is the flag to search change history, whereas --all-files is to include unmodified contents. REPOSITORY rHG Me

[PATCH] tests: add diff color trailing whitespace test

# HG changeset patch # User Sune Foldager # Date 1531318293 -7200 # Wed Jul 11 16:11:33 2018 +0200 # Node ID 47e87ae492c852e773e19a896d08385eeedd9e35 # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b tests: add diff color trailing whitespace test diff --git a/tests/test-diff-color.t b/tests

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

It’s not in the repo as far as I can see, but ok then... > On 11 Jul 2018, at 15.59, Yuya Nishihara wrote: > >> On Wed, 11 Jul 2018 15:03:42 +0200, Sune Foldager via Mercurial-devel wrote: >> # HG changeset patch >> # User Sune Foldager >> # Date 1531314149 -7200 >> # Wed Jul 11 15:02:29 2

Re: [PATCH V2] patch: don't separate \r and \n when colorizing diff output

On Wed, 11 Jul 2018 15:03:42 +0200, Sune Foldager via Mercurial-devel wrote: > # HG changeset patch > # User Sune Foldager > # Date 1531314149 -7200 > # Wed Jul 11 15:02:29 2018 +0200 > # Node ID dc12175e9e5ba1bcb8ed7658a9218211727a9c49 > # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b > p

Re: [PATCH 1 of 2 V2] debugdeltachain: avoid division by zero when a chain is empty

On Wed, 11 Jul 2018 14:48:34 +0200, Boris Feld wrote: > # HG changeset patch > # User Paul Morelle > # Date 1529597997 -7200 > # Thu Jun 21 18:19:57 2018 +0200 > # Node ID 0be6256636d19c196111d2445b3d6bd8aff5e445 > # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b > # EXP-Topic debugdeltacha

Re: D3870: rebase: add --confirm option

> Ah, this patch is based on https://phab.mercurial-scm.org/D3830 which is > not reviewed. Do I need to rebase this to hg-commited current tip? Can you rewrite this to not depend on D3830 if that's easy? It appears nobody reviewed D3830 yet, and I can't trivially say it's good to go. > > If

D3870: rebase: add --confirm option

yuja added a comment. > Ah, this patch is based on https://phab.mercurial-scm.org/D3830 which is > not reviewed. Do I need to rebase this to hg-commited current tip? Can you rewrite this to not depend on https://phab.mercurial-scm.org/D3830 if that's easy? It appears nobody review

[PATCH] fncache: avoid loading the filename cache when not actually modifying it

# HG changeset patch # User Martijn Pieters # Date 1531315693 -3600 # Wed Jul 11 14:28:13 2018 +0100 # Node ID 39bc6540388e79da1a670fcd382aa77b8aa27224 # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b # EXP-Topic fncache_prevent_load_when_exists fncache: avoid loading the filename cache whe

D3901: histedit: add nobackup config option

khanchi97 updated this revision to Diff 9531. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3901?vs=9493&id=9531 REVISION DETAIL https://phab.mercurial-scm.org/D3901 AFFECTED FILES hgext/histedit.py me

[PATCH V2] patch: don't separate \r and \n when colorizing diff output

# HG changeset patch # User Sune Foldager # Date 1531314149 -7200 # Wed Jul 11 15:02:29 2018 +0200 # Node ID dc12175e9e5ba1bcb8ed7658a9218211727a9c49 # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at th

[PATCH 1 of 2 V2] debugdeltachain: avoid division by zero when a chain is empty

# HG changeset patch # User Paul Morelle # Date 1529597997 -7200 # Thu Jun 21 18:19:57 2018 +0200 # Node ID 0be6256636d19c196111d2445b3d6bd8aff5e445 # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b # EXP-Topic debugdeltachain-divbyzero # Available At https://bitbucket.org/octobus/mercurial-

[PATCH 2 of 2 V2] debugdeltachain: protect against 0 readsize

# HG changeset patch # User Boris Feld # Date 1531309724 -7200 # Wed Jul 11 13:48:44 2018 +0200 # Node ID 38562bbb26c9fc08648a7c548d9b23b6f048716d # Parent 0be6256636d19c196111d2445b3d6bd8aff5e445 # EXP-Topic debugdeltachain-divbyzero # Available At https://bitbucket.org/octobus/mercurial-de

D3870: rebase: add --confirm option

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3870#61079, @yuja wrote: > Still can't apply. Which revision is this patch based on? Ah, this patch is based on https://phab.mercurial-scm.org/D3830 which is not reviewed. Do I need to rebase this to hg-commited current

Re: [PATCH] grep: hide cryptic revision number by default

On Wed, 11 Jul 2018 00:03:06 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1531230930 -32400 > # Tue Jul 10 22:55:30 2018 +0900 > # Node ID 24f62ea74586f554c3d7578f00df792e00b55094 > # Parent 9ef10437bb88c27645796b95c6ab78e12c307117 > grep: hide cryptic

Re: [PATCH 1 of 2] config: introduce load order tracking

On Wed, 2018-07-11 at 00:01 +0900, Yuya Nishihara wrote: > If the problem to be addressed by this hack is important, and if the > hack is > really simple, sure I would say go for it. But I, as an old Mercurial > user, > see the bulk renaming of the config keys is minor improvement. I think it's im

D3901: histedit: add nobackup config option

yuja added a comment. > What is the right place to register this config option? mercurial/configitems.py FWIW, adding the `[edithistory]` section doesn't sound nice unless we have more options to be added. I don't have any better idea, but we generally add random stuff to the `[ui

Re: D3901: histedit: add nobackup config option

> What is the right place to register this config option? mercurial/configitems.py FWIW, adding the `[edithistory]` section doesn't sound nice unless we have more options to be added. I don't have any better idea, but we generally add random stuff to the `[ui]` section. __

D3897: tests: prevent conflict markers in test case from triggering warnings

This revision was automatically updated to reflect the committed changes. Closed by commit rHG02850baddadd: tests: prevent conflict markers in test case from triggering warnings (authored by hooper, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm

D3870: rebase: add --confirm option

yuja added a comment. Still can't apply. Which revision is this patch based on? > with repo.wlock(), repo.lock(): > try: > overrides = {('rebase', 'singletransaction'): True} > with ui.configoverride(overrides, 'rebase'): > _origrebase(ui,

Re: D3870: rebase: add --confirm option

Still can't apply. Which revision is this patch based on? > with repo.wlock(), repo.lock(): > try: > overrides = {('rebase', 'singletransaction'): True} > with ui.configoverride(overrides, 'rebase'): > _origrebase(ui, repo, opts, rbsrt, inme

Re: [PATCH 11 of 13] revlog: add function to slice chunk down to a given size

On Wed, Jul 11, 2018 at 12:29 AM, Boris FELD wrote: > It looks like the tests are broken because of one of the in-flight change: > > diff --git a/mercurial/revlog.py b/mercurial/revlog.py > --- a/mercurial/revlog.py > +++ b/mercurial/revlog.py > @@ -416,8 +416,7 @@ def _slicechunk

Re: [PATCH 11 of 13] revlog: add function to slice chunk down to a given size

It looks like the tests are broken because of one of the in-flight change:     diff --git a/mercurial/revlog.py b/mercurial/revlog.py     --- a/mercurial/revlog.py     +++ b/mercurial/revlog.py     @@ -416,8 +416,7 @@ def _slicechunktosize(revlog, revs, targ startrevidx = 0 star