[Bug 5934] New: Consider making histedit create "split" obsmarkers

https://bz.mercurial-scm.org/show_bug.cgi?id=5934 Bug ID: 5934 Summary: Consider making histedit create "split" obsmarkers Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED

D3847: fix: disallow 'hg fix --base --whole'

hooper added a comment. Let's not commit this one if possible. I have another patch with a test case that shows the combination is useful. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3847 To: hooper, #hg-reviewers, durin42 Cc: mercurial-devel

D3881: tests: don't allow reodering of glob/re lines across non-glob/re lines

martinvonz updated this revision to Diff 9428. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3881?vs=9423=9428 REVISION DETAIL https://phab.mercurial-scm.org/D3881 AFFECTED FILES tests/run-tests.py tests/test-run-tests.py tests/test-run-tests.t

D3878: tests: remove some redundant code in run-tests

martinvonz updated this revision to Diff 9425. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3878?vs=9420=9425 REVISION DETAIL https://phab.mercurial-scm.org/D3878 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D3879: tests: move handling of None "el" out of linematch()

martinvonz updated this revision to Diff 9426. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3879?vs=9421=9426 REVISION DETAIL https://phab.mercurial-scm.org/D3879 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D3877: tests: don't reimplement enumerate() in run-tests

martinvonz updated this revision to Diff 9424. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3877?vs=9419=9424 REVISION DETAIL https://phab.mercurial-scm.org/D3877 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D3880: tests: add test showing puzzling test output with (glob) lines

martinvonz updated this revision to Diff 9427. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3880?vs=9422=9427 REVISION DETAIL https://phab.mercurial-scm.org/D3880 AFFECTED FILES tests/test-run-tests.t CHANGE DETAILS diff --git

D3880: tests: add test showing puzzling test output with (glob) lines

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When using multiple (glob) lines, the test runner often moves the lines around in the output on failure. I have run into this problem many times. The added

D3881: tests: don't allow reodering of glob/re lines across non-glob/re lines

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As shown in the test case added in the previous patch, it can be really hard to interpret diffs from the test runner if there are multiple lines that would

D3877: tests: don't reimplement enumerate() in run-tests

martinvonz 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/D3877 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

D3878: tests: remove some redundant code in run-tests

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These two lines also happen below if "r" is truthy, which it is in this case since it's equal to "retry". REPOSITORY rHG Mercurial REVISION DETAIL

D3879: tests: move handling of None "el" out of linematch()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It just seems odd for linematch() to know what None means. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3879 AFFECTED FILES

D3845: worker: support more return types in posix worker

hooper added a comment. Yuya, it had passed tests for me with cbor, so is that a portability issue? One of the benefits of pickle/marshal is that we don't lose information, like when tuples become lists. That would be an insidious problem for callers. Also, in case it wasn't

D3845: worker: support more return types in posix worker

hooper updated this revision to Diff 9418. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3845?vs=9401=9418 REVISION DETAIL https://phab.mercurial-scm.org/D3845 AFFECTED FILES mercurial/worker.py CHANGE DETAILS diff --git a/mercurial/worker.py

D3701: run-tests: extract onStart and onEnd into the test result

lothiraldan updated this revision to Diff 9417. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3701?vs=9032=9417 REVISION DETAIL https://phab.mercurial-scm.org/D3701 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git a/tests/run-tests.py

Re: D2938: grep: make grep search on working directory by default

Yeah On Tue, Jul 3, 2018 at 11:39 PM durin42 (Augie Fackler) < phabrica...@mercurial-scm.org> wrote: > durin42 added a comment. > > > It looks like this is obsoleted by https://phab.mercurial-scm.org/D3826? > > REPOSITORY > rHG Mercurial > > REVISION DETAIL >

D2938: grep: make grep search on working directory by default

durin42 added a comment. It looks like this is obsoleted by https://phab.mercurial-scm.org/D3826? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2938 To: sangeet259, #hg-reviewers Cc: durin42, martinvonz, av6, yuja, pulkit, mercurial-devel

D3701: run-tests: extract onStart and onEnd into the test result

durin42 added inline comments. INLINE COMMENTS > run-tests.py:1717 > +""" > +pass > + omit superfluous pass REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3701 To: lothiraldan, #hg-reviewers Cc: durin42, mercurial-devel

D3700: run-tests: add support for external test result

durin42 accepted this revision as: durin42. durin42 added a comment. I guess I can live with that. INLINE COMMENTS > basic_test_result.py:37 > +def addSkip(self, test, reason): > +print("ERR!", test, reason) > + shouldn't this say "SKIP!"? REPOSITORY rHG Mercurial REVISION

D3869: repository: define manifest interfaces

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc82ea938efbb: repository: define manifest interfaces (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3869?vs=9383=9415

[PATCH 2 of 2] debug: process --debug flag earlier

# HG changeset patch # User Boris Feld # Date 1529432311 -3600 # Tue Jun 19 19:18:31 2018 +0100 # Node ID 53221514bc635fc3b8687db48de3e948b075e84c # Parent d283976aa9a2b35631c749facc0290dd9ea11c30 # EXP-Topic earlydebug # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 2] test: stop passing --quiet in a run dedicated to debug output

# HG changeset patch # User Boris Feld # Date 1529431831 -3600 # Tue Jun 19 19:10:31 2018 +0100 # Node ID d283976aa9a2b35631c749facc0290dd9ea11c30 # Parent 1cac2e8c76242e16c2da5f8e6d6efb76be592eba # EXP-Topic earlydebug # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D3718: narrow: mark the critical chunks of narrowing/widening as unsafe

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa1d5951efce7: narrow: mark the critical chunks of narrowing/widening as unsafe (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3717: repair: mark the critical section of strip() as unsafe

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6e0c66ef8cd0: repair: mark the critical section of strip() as unsafe (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3719: narrowbundle2: when we handle a widen, mark the operation as unsafe

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1ad873c3e4a4: narrowbundle2: when we handle a widen, mark the operation as unsafe (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG313a940d49a3: ui: add an uninterruptable context manager that can block SIGINT (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3716?vs=9410=9411#toc

mercurial@38525: 3 new changesets (2 on stable)

3 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/77d1fa0fa2e1 changeset: 38523:77d1fa0fa2e1 branch: stable parent: 38455:0b63a6743010 user:Augie Fackler date:Tue Jul 03 12:10:21 2018 -0400 summary: Added tag 4.6.2 for

[Bug 5933] New: Errors updating to branch when cloning

https://bz.mercurial-scm.org/show_bug.cgi?id=5933 Bug ID: 5933 Summary: Errors updating to branch when cloning Product: Mercurial Version: 4.5.3 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug

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

martinvonz added inline comments. INLINE COMMENTS > ui.py:369 > + > + > def formatter(self, topic, opts): dropping this line (or maybe it was the one above, I'm not sure ;)) in flight REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3716 To: durin42,

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

durin42 updated this revision to Diff 9410. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3716?vs=9326=9410 REVISION DETAIL https://phab.mercurial-scm.org/D3716 AFFECTED FILES mercurial/configitems.py mercurial/ui.py mercurial/utils/procutil.py

mercurial@38522: 32 new changesets

32 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/72286f9e324f changeset: 38491:72286f9e324f user:Matt Harbison date:Thu Jun 28 22:23:08 2018 -0400 summary: procutil: add a shim for translating shell commands to native commands

D3845: worker: support more return types in posix worker

durin42 added a comment. > This makes me feel that pickle is "okay" tool. @durin42, any idea? I can live with pickle in that case, I guess. Sigh. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3845 To: hooper, #hg-reviewers Cc: yuja, durin42,

[PATCH 7 of 8] resolve: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530450683 -32400 # Sun Jul 01 22:11:23 2018 +0900 # Node ID c5970d8c9a15a4d4fbc1562d819e5aef4186ef84 # Parent 367bf34872603a7c006c104b3cab8de1fba99077 resolve: add support for log-like template keywords and functions It uses wctx as the

[PATCH 3 of 8] grep: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530450173 -32400 # Sun Jul 01 22:02:53 2018 +0900 # Node ID 32caef1aff8134dc1ca37a7da9129fc865a4329d # Parent e86b388c13242726e2734a92e3b5ebaf6f6e6e48 grep: add support for log-like template keywords and functions diff --git

[PATCH 5 of 8] files: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530450080 -32400 # Sun Jul 01 22:01:20 2018 +0900 # Node ID 28b59a68d834e996fb00fafcae48f7bf7d5226bc # Parent 9afe500ac808e74f2d1535ffc44d089b7cd729e5 files: add support for log-like template keywords and functions Note that the ctx does

[PATCH 6 of 8] manifest: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530450413 -32400 # Sun Jul 01 22:06:53 2018 +0900 # Node ID 367bf34872603a7c006c104b3cab8de1fba99077 # Parent 28b59a68d834e996fb00fafcae48f7bf7d5226bc manifest: add support for log-like template keywords and functions "hg manifest --all"

[PATCH 4 of 8] files: automatically populate fields referenced from template

# HG changeset patch # User Yuya Nishihara # Date 1530449737 -32400 # Sun Jul 01 21:55:37 2018 +0900 # Node ID 9afe500ac808e74f2d1535ffc44d089b7cd729e5 # Parent 32caef1aff8134dc1ca37a7da9129fc865a4329d files: automatically populate fields referenced from template diff --git

[PATCH 8 of 8] status: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530451126 -32400 # Sun Jul 01 22:18:46 2018 +0900 # Node ID 3b536d74a296aadb1e8b15edb446ed7709b8e5ec # Parent c5970d8c9a15a4d4fbc1562d819e5aef4186ef84 status: add support for log-like template keywords and functions It's bound to ctx2

[PATCH 2 of 8] cat: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530449263 -32400 # Sun Jul 01 21:47:43 2018 +0900 # Node ID e86b388c13242726e2734a92e3b5ebaf6f6e6e48 # Parent 65ebef5548276d61a95e949d8ef2fd1b82947bc6 cat: add support for log-like template keywords and functions diff --git

[PATCH 1 of 8] bookmarks: add support for log-like template keywords and functions

# HG changeset patch # User Yuya Nishihara # Date 1530451327 -32400 # Sun Jul 01 22:22:07 2018 +0900 # Node ID 65ebef5548276d61a95e949d8ef2fd1b82947bc6 # Parent c1a7bbf9984d2614bfac478d42c86377a84641ba bookmarks: add support for log-like template keywords and functions This is basically

Re: [PATCH 4 of 4] revlog: reuse 'descendant' implemention in 'isancestor'

On Tue, Jul 3, 2018 at 3:05 AM Boris FELD wrote: > On 02/07/2018 18:37, Martin von Zweigbergk via Mercurial-devel wrote: > > > > On Mon, Jul 2, 2018 at 5:05 AM Yuya Nishihara wrote: > >> On Sun, 01 Jul 2018 08:38:42 +0200, Paul Morelle wrote: >> > # HG changeset patch >> > # User Boris Feld >>

Re: D3845: worker: support more return types in posix worker

> +while True: > +try: > +yield cbor.load(fp) > +except EOFError: > +break Unfortunately this doesn't work because the cbor decoder doesn't care for EOF. It tries to raise CBORDEcodeError and fail at `fp.tell()`. We'll have to either

D3845: worker: support more return types in posix worker

yuja added a comment. > +while True: > +try: > +yield cbor.load(fp) > +except EOFError: > +break Unfortunately this doesn't work because the cbor decoder doesn't care for EOF. It tries to raise CBORDEcodeError

Re: [PATCH] revset: add partial support for ancestor(wdir())

On Sun, Jul 1, 2018 at 7:06 AM Yuya Nishihara wrote: > On Sat, 30 Jun 2018 23:49:55 +0530, Pulkit Goyal wrote: > > On Sat, Jun 30, 2018 at 8:24 AM Yuya Nishihara wrote: > > > > > # HG changeset patch > > > # User Yuya Nishihara > > > # Date 1530281603 -32400 > > > # Fri Jun 29 23:13:23

D3873: rebase: refactor logic to read rebasestate in a separate function

yuja added a comment. > > FWIW, I don't have any better idea to keep old hg not crash with new state > > file, other than: > > > > a. use separate file (e.g. "rebasestate2") and leave "rebasestate" in old > > format (or make it an empty file to trigger error.) >

Re: D3873: rebase: refactor logic to read rebasestate in a separate function

> > FWIW, I don't have any better idea to keep old hg not crash with new state > > file, other than: > > > > a. use separate file (e.g. "rebasestate2") and leave "rebasestate" in > old > > format (or make it an empty file to trigger error.) > > > Yeah, I was preventing

Re: [PATCH 04 of 12 V2] diffutil: extract diff options code into a dedicated util-module

On Tue, 03 Jul 2018 12:32:23 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1530195073 -7200 > # Thu Jun 28 16:11:13 2018 +0200 > # Node ID 2885f27ab442bf42ad8c21c47f4304132a62f59a > # Parent 9d94a3118a9c253a09bdf48258548dca92e35018 > # EXP-Topic diff-cleanup >

Re: [PATCH 03 of 12 V2] context: also accept diff option directly

On Tue, 03 Jul 2018 12:32:22 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1529756343 -3600 > # Sat Jun 23 13:19:03 2018 +0100 > # Node ID 9d94a3118a9c253a09bdf48258548dca92e35018 > # Parent e6ba698b9c7354f21e2ae764a11e043872990d79 > # EXP-Topic diff-cleanup >

Re: [PATCH 4 of 4] revlog: reuse 'descendant' implemention in 'isancestor'

On 02/07/2018 18:37, Martin von Zweigbergk via Mercurial-devel wrote: On Mon, Jul 2, 2018 at 5:05 AM Yuya Nishihara > wrote: On Sun, 01 Jul 2018 08:38:42 +0200, Paul Morelle wrote: > # HG changeset patch > # User Boris Feld mailto:boris.f...@octobus.net>>

[PATCH 05 of 12 V2] tests: update test-context.py to use diffopts as diff argument

# HG changeset patch # User Boris Feld # Date 1529756783 -3600 # Sat Jun 23 13:26:23 2018 +0100 # Node ID 0d2b1cf8cd7ecf81984253ac1e5142f35a53eaa6 # Parent 2885f27ab442bf42ad8c21c47f4304132a62f59a # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 12 of 12 V2] diff: use `context.diff` to produce diff

# HG changeset patch # User Boris Feld # Date 1527082304 -7200 # Wed May 23 15:31:44 2018 +0200 # Node ID 9023a46c916c103ebafba08e16e7c029c79a7137 # Parent f323b9631f290ec68d5e5322eedf4b86676a1113 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 04 of 12 V2] diffutil: extract diff options code into a dedicated util-module

# HG changeset patch # User Boris Feld # Date 1530195073 -7200 # Thu Jun 28 16:11:13 2018 +0200 # Node ID 2885f27ab442bf42ad8c21c47f4304132a62f59a # Parent 9d94a3118a9c253a09bdf48258548dca92e35018 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 01 of 12 V2] context: explicitly take diffopts in `context.diff` (API)

# HG changeset patch # User Boris Feld # Date 1526994172 -7200 # Tue May 22 15:02:52 2018 +0200 # Node ID ba68e0459f1fc2d1d86496c4ae42ab99adf08d11 # Parent 1a05e205832a929374c010b2dc6a1c65a60186a3 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 09 of 12 V2] synthrepo: pass a diffopts object to context.diff

# HG changeset patch # User Boris Feld # Date 1529757988 -7200 # Sat Jun 23 14:46:28 2018 +0200 # Node ID d05882e5af1a7d482eedea7aebc7eb1cba000643 # Parent d2d2b80cc405fdb1e93c257e7290851069040ca8 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 07 of 12 V2] revset: pass an explicit `diffopts` objet to context.diff

# HG changeset patch # User Boris Feld # Date 1529757430 -7200 # Sat Jun 23 14:37:10 2018 +0200 # Node ID 6f1fd2975f98351086353b56ff4e9dfb54421648 # Parent de55d9d098b8166d5826a2c77c5c34c1f94672c9 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 10 of 12 V2] obsutil: pass a diffopts object to context.diff

# HG changeset patch # User Boris Feld # Date 1529758816 -7200 # Sat Jun 23 15:00:16 2018 +0200 # Node ID 8c1405ef2dd9a1bf82dc320b39ee6a359240a088 # Parent d05882e5af1a7d482eedea7aebc7eb1cba000643 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 08 of 12 V2] webutil: pass a diffopts object to context.diff

# HG changeset patch # User Boris Feld # Date 1529757778 -7200 # Sat Jun 23 14:42:58 2018 +0200 # Node ID d2d2b80cc405fdb1e93c257e7290851069040ca8 # Parent 6f1fd2975f98351086353b56ff4e9dfb54421648 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 11 of 12 V2] context: no longer accept diff options as dictionnary

# HG changeset patch # User Boris Feld # Date 1529758985 -7200 # Sat Jun 23 15:03:05 2018 +0200 # Node ID f323b9631f290ec68d5e5322eedf4b86676a1113 # Parent 8c1405ef2dd9a1bf82dc320b39ee6a359240a088 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 02 of 12 V2] context: also take all other arguments than `patch.diff` accept

# HG changeset patch # User Boris Feld # Date 1527082300 -7200 # Wed May 23 15:31:40 2018 +0200 # Node ID e6ba698b9c7354f21e2ae764a11e043872990d79 # Parent ba68e0459f1fc2d1d86496c4ae42ab99adf08d11 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 03 of 12 V2] context: also accept diff option directly

# HG changeset patch # User Boris Feld # Date 1529756343 -3600 # Sat Jun 23 13:19:03 2018 +0100 # Node ID 9d94a3118a9c253a09bdf48258548dca92e35018 # Parent e6ba698b9c7354f21e2ae764a11e043872990d79 # EXP-Topic diff-cleanup # Available At https://bitbucket.org/octobus/mercurial-devel/ #