[PATCH 2 of 2] update: for "noconflict" updates, print "conflicting changes" on conflict

# HG changeset patch # User Martin von Zweigbergk # Date 1488871287 28800 # Mon Mar 06 23:21:27 2017 -0800 # Node ID 426835372fed3048a413eb210ed527886912cbfc # Parent 76aa7c5b624792a316c6e028b77a59aee95e5a3b update: for "noconflict" updates, print "conflicting

[PATCH 1 of 2] tests: fix test-update-branches to remove non-conflicting file

# HG changeset patch # User Martin von Zweigbergk # Date 1488871197 28800 # Mon Mar 06 23:19:57 2017 -0800 # Node ID 76aa7c5b624792a316c6e028b77a59aee95e5a3b # Parent 052e4f1ffce964ffae6333aec4883ef2b4080e4f tests: fix test-update-branches to remove non-conflicting

Re: [PATCH 6 of 6] manifest: rename matches to _matches

On Mon, Mar 6, 2017 at 5:40 PM, Durham Goode wrote: > > > On 3/6/17 5:32 PM, Martin von Zweigbergk wrote: >> >> On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: >>> >>> # HG changeset patch >>> # User Durham Goode >>> # Date 1488517595 28800 >>>

Re: [PATCH 6 of 6] manifest: rename matches to _matches

On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488517595 28800 > # Thu Mar 02 21:06:35 2017 -0800 > # Node ID 1bed8ee65389133923b9076909e04f66ef26f1b8 > # Parent

Re: [PATCH stable] fsmonitor: match watchman and local encoding

On 3/6/17 09:50, Olivier Trempe wrote: # HG changeset patch # User Olivier Trempe # Date 1488810111 18000 # Mon Mar 06 09:21:51 2017 -0500 # Branch stable # Node ID c9d3f8d1a57346228f5c3bb749acdff90d37e194 # Parent 6b00c3ecd15b26587de8cca6fab811069cba3b2f

Re: [PATCH] wix: add censor docs to installer script

Augie Fackler writes: > # HG changeset patch > # User Augie Fackler > # Date 1488843756 18000 > # Mon Mar 06 18:42:36 2017 -0500 > # Node ID e38801a054eb3e95564c3a373bc320ae1349b0a6 > # Parent 41a9edc5d00f2b5744e1edaf2edaa10084099f53 > wix: add censor

Re: [PATCH 5 of 5] branches: populate all template keywords in formatter

On Sat, Feb 25, 2017 at 6:51 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1488010122 -32400 > # Sat Feb 25 17:08:42 2017 +0900 > # Node ID 274456919eb7b71490ed32dedcd36ffc3bb9ef6e > # Parent

[PATCH] wix: add censor docs to installer script

# HG changeset patch # User Augie Fackler # Date 1488843756 18000 # Mon Mar 06 18:42:36 2017 -0500 # Node ID e38801a054eb3e95564c3a373bc320ae1349b0a6 # Parent 41a9edc5d00f2b5744e1edaf2edaa10084099f53 wix: add censor docs to installer script Spotted by Matt Harbison. diff

[PATCH 6 of 6 py3] schemes: move re construction to module-level and python3-ify

# HG changeset patch # User Augie Fackler # Date 1488565530 18000 # Fri Mar 03 13:25:30 2017 -0500 # Node ID e36144b27c88bf5a0f2f520d2f2352c290ea4f15 # Parent c28e0b997db472d0286927234bf06cc9848b6ff7 schemes: move re construction to module-level and python3-ify This makes

[PATCH 1 of 6 py3] config: add sanity assert that files are opened as binary

# HG changeset patch # User Augie Fackler # Date 1488563711 18000 # Fri Mar 03 12:55:11 2017 -0500 # Node ID 428615d799a9115249f3aab8d6481e384e879f6a # Parent 41a9edc5d00f2b5744e1edaf2edaa10084099f53 config: add sanity assert that files are opened as binary This helps

[PATCH 5 of 6 py3] dispatch: cope with sys.version being unicode on Python 3

# HG changeset patch # User Augie Fackler # Date 1488565790 18000 # Fri Mar 03 13:29:50 2017 -0500 # Node ID c28e0b997db472d0286927234bf06cc9848b6ff7 # Parent 00547c2e1a71fc5d3efd13e5c766fda8bc398e6a dispatch: cope with sys.version being unicode on Python 3 diff --git

[PATCH 3 of 6 py3] ui: fix ui.traceback on Python 3

# HG changeset patch # User Augie Fackler # Date 1488568154 18000 # Fri Mar 03 14:09:14 2017 -0500 # Node ID cf5be2a3d1804666dff9a4c99a33354dab7cc322 # Parent 2e19b1921f0ba7f3550c11f7f3c85e88e732e3a0 ui: fix ui.traceback on Python 3 diff --git a/mercurial/ui.py

[PATCH 2 of 6 py3] ui: fix opts labeling on ui.warn et al for Python 3

# HG changeset patch # User Augie Fackler # Date 1488568104 18000 # Fri Mar 03 14:08:24 2017 -0500 # Node ID 2e19b1921f0ba7f3550c11f7f3c85e88e732e3a0 # Parent 428615d799a9115249f3aab8d6481e384e879f6a ui: fix opts labeling on ui.warn et al for Python 3 This is a step

mercurial@31168: 27 new changesets

27 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/408dcf7475a7 changeset: 31142:408dcf7475a7 user:Augie Fackler date:Mon Feb 06 15:19:32 2017 -0500 summary: osx: install bash and zsh completions by default

[PATCH stable] fsmonitor: match watchman and local encoding

# HG changeset patch # User Olivier Trempe # Date 1488810111 18000 # Mon Mar 06 09:21:51 2017 -0500 # Branch stable # Node ID c9d3f8d1a57346228f5c3bb749acdff90d37e194 # Parent 6b00c3ecd15b26587de8cca6fab811069cba3b2f fsmonitor: match watchman and local encoding

Re: [PATCH stable] fsmonitor: match watchman and local encoding

I'll send a more robust implementation of _watchmanencodingtolocal On Mon, Mar 6, 2017 at 9:54 AM, Olivier Trempe wrote: > # HG changeset patch > # User Olivier Trempe > # Date 1488810111 18000 > # Mon Mar 06 09:21:51 2017 -0500 > # Branch

Re: [PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

+mercurial-devel (sorry, missed that again) On Mon, Mar 6, 2017 at 9:10 AM, Martin von Zweigbergk wrote: > On Mon, Mar 6, 2017 at 7:00 AM, Yuya Nishihara wrote: >> On Mon, 27 Feb 2017 16:31:28 -0800, Martin von Zweigbergk via >> Mercurial-devel wrote: >>>

Re: [PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

On Mon, Mar 6, 2017 at 7:00 AM, Yuya Nishihara wrote: > On Mon, 27 Feb 2017 16:31:28 -0800, Martin von Zweigbergk via Mercurial-devel > wrote: >> # HG changeset patch >> # User Martin von Zweigbergk >> # Date 1486973155 28800 >> # Mon Feb 13 00:05:55

Re: hg equivalent of git push -f

Sent to dev by mistake, will repost to general. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

hg equivalent of git push -f

I've been thinking of what it would take to convert my work place from git to hg, and the one thing which doesn't seem to have any equivalent is git push -f. hg may also have a push -f, but it leaves dangling anonymous heads which have to be stripped on the server. Evolve may help, but it

Re: [PATCH] revert: move code dealing with deletions closer together

On Fri, 3 Mar 2017 10:46:10 -0800, Durham Goode wrote: > On 3/3/17 9:27 AM, Martin von Zweigbergk via Mercurial-devel wrote: > > # HG changeset patch > > # User Martin von Zweigbergk > > # Date 1456353854 28800 > > # Wed Feb 24 14:44:14 2016 -0800 > > # Node ID

Re: [PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

On Mon, 27 Feb 2017 16:31:28 -0800, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1486973155 28800 > # Mon Feb 13 00:05:55 2017 -0800 > # Node ID c88aa4bc36ee81b0837d2949501d6b4fcf825c38 > # Parent

Re: [PATCH 10 of 11 V5] update: add experimental config for default way of handling dirty wdir

On Mon, 27 Feb 2017 16:31:27 -0800, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1487030585 28800 > # Mon Feb 13 16:03:05 2017 -0800 > # Node ID ae37f4578e3af6fd4cb7c29c9ab06ad0efd726da > # Parent

[PATCH stable] fsmonitor: match watchman and local encoding

# HG changeset patch # User Olivier Trempe # Date 1488810111 18000 # Mon Mar 06 09:21:51 2017 -0500 # Branch stable # Node ID 06a427b6b4a4efe3c19029951c654a2c8d835fb3 # Parent 6b00c3ecd15b26587de8cca6fab811069cba3b2f fsmonitor: match watchman and local encoding

[PATCH] revert: always display hunks reversed when reverting to parent

# HG changeset patch # User Denis Laxalde # Date 1488805881 -3600 # Mon Mar 06 14:11:21 2017 +0100 # Node ID 9f2b436197b02608e1546f57ac6426ec1427c7fd # Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 7 of 7] hgk: set a blocked tag when the user invokes view

# HG changeset patch # User Simon Farnsworth # Date 1488799672 28800 # Mon Mar 06 03:27:52 2017 -0800 # Node ID a24141da65e18e293bcd62f85f05050f01815942 # Parent 5b8f7a33145a182a4d4985972a8e4425eb20908f hgk: set a blocked tag when the user invokes view diff --git

[PATCH 3 of 7] dispatch: set a blockedtag when running an external alias

# HG changeset patch # User Simon Farnsworth # Date 1488799544 28800 # Mon Mar 06 03:25:44 2017 -0800 # Node ID 6cb267dc6b8156333413b6bbadc819807d73241c # Parent 1c0e78f6c4db0c43799ee7d2fe68290c9f172849 dispatch: set a blockedtag when running an external alias diff --git

[PATCH 2 of 7] patch: set a blockedtag when running an external filter

# HG changeset patch # User Simon Farnsworth # Date 1488799529 28800 # Mon Mar 06 03:25:29 2017 -0800 # Node ID 1c0e78f6c4db0c43799ee7d2fe68290c9f172849 # Parent dc84da3efb972a86375c59fbb859bc31fc2d6335 patch: set a blockedtag when running an external filter diff --git

[PATCH 1 of 7] sshpeer: set a blockedtag when starting ssh

# HG changeset patch # User Simon Farnsworth # Date 1488799509 28800 # Mon Mar 06 03:25:09 2017 -0800 # Node ID dc84da3efb972a86375c59fbb859bc31fc2d6335 # Parent bca31954883ec7ffd16ee940bb84f12f60d286c8 sshpeer: set a blockedtag when starting ssh So that the data is

[PATCH] filemerge: tag merge tool for blocked times

# HG changeset patch # User Simon Farnsworth # Date 1488799180 28800 # Mon Mar 06 03:19:40 2017 -0800 # Node ID bca31954883ec7ffd16ee940bb84f12f60d286c8 # Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f filemerge: tag merge tool for blocked times Merge tools can take a

[PATCH] hook: give exthooks tags for blocking time

# HG changeset patch # User Simon Farnsworth # Date 1488798555 28800 # Mon Mar 06 03:09:15 2017 -0800 # Node ID 9bdc781849eb9bba369cf9698cb8a1f5aef2b966 # Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f hook: give exthooks tags for blocking time The ui.system autogenerated

Re: [PATCH 7 of 9] patch: add a diffhunks function yielding (diffheaders, hunks)

Denis Laxalde a écrit : # HG changeset patch # User Denis Laxalde # Date 1488558011 -3600 # Fri Mar 03 17:20:11 2017 +0100 # Node ID 2b3bbcb8cca52db9e0dae20dbf028b67a39abc7c # Parent 07ea362d18b8d2b046822894ecdaded1dc889429 # Available At

[PATCH 6 of 9] mdiff: let unidiff return (diffheader, hunks)

# HG changeset patch # User Denis Laxalde # Date 1488559600 -3600 # Fri Mar 03 17:46:40 2017 +0100 # Node ID 07ea362d18b8d2b046822894ecdaded1dc889429 # Parent 27d0f56d5cde54f11cc1c93c711fa2fc8bdaf8ec # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 3 of 9] test: end printed diff "hunks" with an empty string in test-context.py

# HG changeset patch # User Denis Laxalde # Date 1488554237 -3600 # Fri Mar 03 16:17:17 2017 +0100 # Node ID 539c8f94f4d878173ee105fc2628f1b899299d82 # Parent 201a5066da14bc8272b057eb2130bd1f12ace96c # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 8 of 9] hgweb: start enumerate at 1 in webutil.diffs's inner function prettyprintlines

# HG changeset patch # User Denis Laxalde # Date 1488789879 -3600 # Mon Mar 06 09:44:39 2017 +0100 # Node ID b895b2b1a592730ba3add0733de73d34c4ff090c # Parent 2b3bbcb8cca52db9e0dae20dbf028b67a39abc7c # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 4 of 9] mdiff: distinguish diff headers from hunks in unidiff()

# HG changeset patch # User Denis Laxalde # Date 1488545482 -3600 # Fri Mar 03 13:51:22 2017 +0100 # Node ID 3fce2b5c21f362f1082940786b92ca8794e029ce # Parent 539c8f94f4d878173ee105fc2628f1b899299d82 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 1 of 9] mdiff: turn the comment above _unidiff into a docstring

# HG changeset patch # User Denis Laxalde # Date 1483950879 -3600 # Mon Jan 09 09:34:39 2017 +0100 # Node ID adbaa893b3e5e619402ba761b507c385fb8f8d8a # Parent 7855bfe02dc7090f17a5acab97fecb5bc4bfec82 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 2 of 9] mdiff: let _unidiff yield hunks as (, )

# HG changeset patch # User Denis Laxalde # Date 1488471766 -3600 # Thu Mar 02 17:22:46 2017 +0100 # Node ID 201a5066da14bc8272b057eb2130bd1f12ace96c # Parent adbaa893b3e5e619402ba761b507c385fb8f8d8a # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 5 of 9] mdiff: extract a checknonewline inner function in unidiff()

# HG changeset patch # User Denis Laxalde # Date 1488559588 -3600 # Fri Mar 03 17:46:28 2017 +0100 # Node ID 27d0f56d5cde54f11cc1c93c711fa2fc8bdaf8ec # Parent 3fce2b5c21f362f1082940786b92ca8794e029ce # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 7 of 9] patch: add a diffhunks function yielding (diffheaders, hunks)

# HG changeset patch # User Denis Laxalde # Date 1488558011 -3600 # Fri Mar 03 17:20:11 2017 +0100 # Node ID 2b3bbcb8cca52db9e0dae20dbf028b67a39abc7c # Parent 07ea362d18b8d2b046822894ecdaded1dc889429 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 9 of 9] hgweb: use patch.diffhunks in webutil.diffs to simplify the algorithm

# HG changeset patch # User Denis Laxalde # Date 1488788913 -3600 # Mon Mar 06 09:28:33 2017 +0100 # Node ID 806a3dc2cb151dadca39686ba0f99dfcf7d2821c # Parent b895b2b1a592730ba3add0733de73d34c4ff090c # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH 5 of 8 V2] fileset: add function to switch revision where fileset will be evaluated

# HG changeset patch # User Yuya Nishihara # Date 1422096116 -32400 # Sat Jan 24 19:41:56 2015 +0900 # Node ID a9e4ff8cb089e0c761c2cf2f87367fd5759306bd # Parent 70a6ca02bb2d6b41202518bb1d761f7bef785f7e # EXP-Topic filesetrev-func # Available At

[PATCH 1 of 8 V2] fileset: add class to host special handling of initial subset

# HG changeset patch # User Yuya Nishihara # Date 1422096914 -32400 # Sat Jan 24 19:55:14 2015 +0900 # Node ID cb222708f46971248a687dbdc6a55db11949d9ef # Parent 3f8f53190d6afed0aca6c6527236edad28ce785c # EXP-Topic filesetrev-func # Available At

[PATCH 6 of 8 V2] fileset: add revs(revs, fileset) to evaluate set in working directory

# HG changeset patch # User Pierre-Yves David # Date 1488541496 -3600 # Fri Mar 03 12:44:56 2017 +0100 # Node ID 2d0e9bb0f121ebbd041abf2ad121a18f200f6206 # Parent a9e4ff8cb089e0c761c2cf2f87367fd5759306bd # EXP-Topic filesetrev-func # Available At

[PATCH 4 of 8 V2] fileset: extract function that builds status tuple only if necessary

# HG changeset patch # User Yuya Nishihara # Date 1422094419 -32400 # Sat Jan 24 19:13:39 2015 +0900 # Node ID 70a6ca02bb2d6b41202518bb1d761f7bef785f7e # Parent dcafd00afeb38478ea65a978b9ada91b4a6ac46b # EXP-Topic filesetrev-func # Available At

[PATCH 7 of 8 V2] fileset: allow to specify a basectx for status

# HG changeset patch # User Pierre-Yves David # Date 1488546486 -3600 # Fri Mar 03 14:08:06 2017 +0100 # Node ID 9d6e733046b9aa7e2ded8c4207625fedcc2a8c04 # Parent 2d0e9bb0f121ebbd041abf2ad121a18f200f6206 # EXP-Topic filesetrev-func # Available At

[PATCH 8 of 8 V2] fileset: add a 'status(...)' predicate to control evaluation context

# HG changeset patch # User Pierre-Yves David # Date 1488546500 -3600 # Fri Mar 03 14:08:20 2017 +0100 # Node ID 41ea8aee85ca16d652dfdb4afe37053b291702b4 # Parent 9d6e733046b9aa7e2ded8c4207625fedcc2a8c04 # EXP-Topic filesetrev-func # Available At

[PATCH 3 of 8 V2] fileset: build initial subset in fullmatchctx class

# HG changeset patch # User Yuya Nishihara # Date 1422093362 -32400 # Sat Jan 24 18:56:02 2015 +0900 # Node ID dcafd00afeb38478ea65a978b9ada91b4a6ac46b # Parent 54b8e49c33610b648cff5cbee2c0b306c63a1ebd # EXP-Topic filesetrev-func # Available At

Re: [PATCH 8 of 8 V2] hgweb: add a "followlines" link to hover-box in annotate

Yuya Nishihara a écrit : On Wed, 1 Mar 2017 17:36:48 +0100, Denis Laxalde wrote: Yuya Nishihara a écrit : On Tue, 28 Feb 2017 16:00:44 -0800, Gregory Szorc wrote: Also, the page it links to showing the revisions with links to a line range filtered diff is good but not great. I imagine

Re: [PATCH 8 of 8] fileset: add a 'status(...)' predicate to control evaluation context

On 03/05/2017 03:08 PM, Yuya Nishihara wrote: On Sun, 5 Mar 2017 14:18:06 +0100, Pierre-Yves David wrote: On 03/05/2017 12:49 PM, Yuya Nishihara wrote: On Fri, 03 Mar 2017 14:40:45 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David