[Bug 5947] New: ui.tweakdefaults undermines fsmonitor via command.status.terse=u

https://bz.mercurial-scm.org/show_bug.cgi?id=5947 Bug ID: 5947 Summary: ui.tweakdefaults undermines fsmonitor via command.status.terse=u Product: Mercurial Version: default branch Hardware: All OS: All

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On Fri, Jul 27, 2018 at 3:26 PM Boris FELD wrote: > > > On 27/07/2018 16:00, Yuya Nishihara wrote: > > On Fri, 27 Jul 2018 09:30:26 +0200, Boris FELD wrote: > >> On 26/07/2018 17:24, Martin von Zweigbergk wrote: > >>> >> +if checkout is not None and not > >>>

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On 27/07/2018 16:00, Yuya Nishihara wrote: On Fri, 27 Jul 2018 09:30:26 +0200, Boris FELD wrote: On 26/07/2018 17:24, Martin von Zweigbergk wrote: >> +                if checkout is not None and not node.isnode(checkout): > IIUC, hggit/hgsubversion may pass in a 20-length

Re: [PATCH 3 of 5] sparse-revlog: implement algorithm to write sparse delta chains (issue5480)

On 27/07/2018 01:57, Martin von Zweigbergk via Mercurial-devel wrote: On Mon, Jul 16, 2018 at 11:50 AM Boris Feld > wrote: # HG changeset patch # User Paul Morelle mailto:paul.more...@octobus.net>> # Date 1528179575 -7200 #      Tue Jun 05

Re: [PATCH 4 of 6] match: add prefixdirmatcher to adapt subrepo matcher back

On Sat, 07 Jul 2018 04:38:48 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1528549447 -32400 # Sat Jun 09 22:04:07 2018 +0900 # Node ID 609c30cc3b87da9523988402ad0a1ba8899411cc # Parent f037e8dfa6c2047d0ef86efc2e83fece0fa08d80 match: add prefixdirmatcher

D3716: ui: add an uninterruptable context manager that can block SIGINT

mharbison72 added a comment. Do we need a different strategy for Windows, or just eat the error? (See the unsupported signal message) https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/808/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio REPOSITORY

Re: [PATCH 1 of 5 RFC] tests: show added/modified/removed files when logging repos converted from bzr

On Fri, 27 Jul 2018 14:10:08 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1531499586 14400 # Fri Jul 13 12:33:06 2018 -0400 # Branch stable # Node ID 3da5d60bf6e7ad121cea897e2f59846007f3cc9f # Parent 0f948d821fe7e5ed18e6106c162375a11e8b0546 tests: show

[PATCH 2 of 5 RFC] tests: add a test to show the added/modified/removed files in a bzr convert

# HG changeset patch # User Matt Harbison # Date 1531508595 14400 # Fri Jul 13 15:03:15 2018 -0400 # Branch stable # Node ID 2d3223b88c2f51bcac46958a2feab656f935a08a # Parent 3da5d60bf6e7ad121cea897e2f59846007f3cc9f tests: add a test to show the added/modified/removed files in a bzr convert

[PATCH 3 of 5 RFC] xxx-context: screen unmodified files out of memctx

# HG changeset patch # User Matt Harbison # Date 1531512942 14400 # Fri Jul 13 16:15:42 2018 -0400 # Branch stable # Node ID 07b5425f78bb30033a7922bfc99defeddbc9746f # Parent 2d3223b88c2f51bcac46958a2feab656f935a08a xxx-context: screen unmodified files out of memctx This "fixes" the bzr

[PATCH 5 of 5 RFC] xxx-context: consider files in memctx not in p1 to be added

# HG changeset patch # User Matt Harbison # Date 1531514871 14400 # Fri Jul 13 16:47:51 2018 -0400 # Branch stable # Node ID 53cf47708d434a4beb01a3a7ebbb4f38d5e0bdd0 # Parent 08d713c87cb51e5987e44a63ac2323fe64852f1f xxx-context: consider files in memctx not in p1 to be added This doesn't

[PATCH 4 of 5 RFC] xxx-context: account for files not in p1() when determining memctx status

# HG changeset patch # User Matt Harbison # Date 1531513454 14400 # Fri Jul 13 16:24:14 2018 -0400 # Branch stable # Node ID 08d713c87cb51e5987e44a63ac2323fe64852f1f # Parent 07b5425f78bb30033a7922bfc99defeddbc9746f xxx-context: account for files not in p1() when determining memctx status

[PATCH 1 of 5 RFC] tests: show added/modified/removed files when logging repos converted from bzr

# HG changeset patch # User Matt Harbison # Date 1531499586 14400 # Fri Jul 13 12:33:06 2018 -0400 # Branch stable # Node ID 3da5d60bf6e7ad121cea897e2f59846007f3cc9f # Parent 0f948d821fe7e5ed18e6106c162375a11e8b0546 tests: show added/modified/removed files when logging repos converted from

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On Fri, Jul 27, 2018 at 7:02 AM Yuya Nishihara wrote: > On Fri, 27 Jul 2018 09:30:26 +0200, Boris FELD wrote: > > On 26/07/2018 17:24, Martin von Zweigbergk wrote: > > > >> +if checkout is not None and not > > > node.isnode(checkout): > > > > IIUC, hggit/hgsubversion

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On Fri, 27 Jul 2018 09:30:26 +0200, Boris FELD wrote: > On 26/07/2018 17:24, Martin von Zweigbergk wrote: > > >> +                if checkout is not None and not > > node.isnode(checkout): > > > IIUC, hggit/hgsubversion may pass in a 20-length symbolic name? > > Yes, this is

D3983: sparse: add test showing `hg merge` is broken while using sparse extension

pulkit added a comment. I feel like these two patches are appropriate for stable because this is a bugfix, so I propose them for stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3983 To: pulkit, #hg-reviewers Cc: mercurial-devel

D3984: merge: do the trivial resolution after updating sparse checkout

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be

D3983: sparse: add test showing `hg merge` is broken while using sparse extension

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds a test to demonstrate that `hg merge` is broken in some cases while using sparse extension. The case is when you have a file which is: -

D3959: rebase: add --stop option to stop rebase at any point (issue5206)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D3959#61803, @pulkit wrote: > You also need to take care of bookmark movements. Bookmark from changesets which have successfully rebased should be moved to their successors when we call --stop. @pulkit I think

D3982: rebase: add test to show --stop moves bookmarks

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Added tests to show that --stop option moves bookmarks of rebased csets to their succs. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On 26/07/2018 17:24, Martin von Zweigbergk wrote: On Thu, Jul 26, 2018 at 6:26 AM Boris FELD > wrote: On 26/07/2018 15:06, Yuya Nishihara wrote: > On Thu, 26 Jul 2018 14:21:20 +0200, Boris Feld wrote: >> # HG changeset patch >> # User Boris Feld