[PATCH] run-tests: endswith takes bytes as argument in python3, not str

# HG changeset patch # User Matthieu Laneuville # Date 1509711297 -32400 # Fri Nov 03 21:14:57 2017 +0900 # Node ID 25d1eb7275ba4b95fbb4240672a3ad6578ab5b87 # Parent 7ebf850d3166a64ff33b4b85adb481b533ddbf86 run-tests: endswith takes bytes as argument in

Re: [PATCH v2] run-tests: $TESTDIR can be something else than $PWD

> On Nov 3, 2017, at 10:27, Kevin Bullock > wrote: > >> On Nov 3, 2017, at 02:40, matthieu.laneuvi...@octobus.net wrote: >> >> # HG changeset patch >> # User Matthieu Laneuville >> # Date 1501648065 -32400 >> # Wed Aug 02

Re: [PATCH RFC] revert: no longer mark --interactive as experimental

Yes, please! I'd be very much in favor of that. (Sorry, I misunderstood what the patch was about when I looked last time.) On Fri, Nov 3, 2017, 06:57 Denis Laxalde wrote: > Martin von Zweigbergk a écrit : > > On Thu, Nov 2, 2017 at 7:16 AM, Denis Laxalde

Re: [PATCH STABLE] pathutil: use util.pathto() to calculate relative cwd in canonpath()

> On Nov 2, 2017, at 20:16, Matt Harbison wrote: > > # HG changeset patch > # User Matt Harbison > # Date 1509669331 14400 > # Thu Nov 02 20:35:31 2017 -0400 > # Branch stable > # Node ID 7d799a9800793cb5f1c10ce7269c31e1c7b1285a > # Parent

Re: test-convert-bzr-directories.t fails

> On Nov 2, 2017, at 23:30, timeless <timel...@gmail.com> wrote: > > Mercurial Distributed SCM (version 4.4+11-7ebf850d3166+20171103) > Bazaar 2.5.1 -- a free distributed version-control tool I've seen the same failure on gcc112, which also has bzr 2.5.1. The Linux buildworker

Re: [PATCH RFC] revert: no longer mark --interactive as experimental

Martin von Zweigbergk a écrit : On Thu, Nov 2, 2017 at 7:16 AM, Denis Laxalde wrote: Augie Fackler a écrit : On Nov 2, 2017, at 09:39, Martin von Zweigbergk via Mercurial-devel < mercurial-devel@mercurial-scm.org> wrote: Can we still change the behavior of "hg revert

Re: [PATCH] run-tests: endswith takes bytes as argument in python3, not str

On Fri, 03 Nov 2017 21:19:40 +0900, matthieu.laneuvi...@octobus.net wrote: > # HG changeset patch > # User Matthieu Laneuville > # Date 1509711297 -32400 > # Fri Nov 03 21:14:57 2017 +0900 > # Node ID 25d1eb7275ba4b95fbb4240672a3ad6578ab5b87 > # Parent

Re: [PATCH v2] run-tests: $TESTDIR can be something else than $PWD

> On Nov 3, 2017, at 02:40, matthieu.laneuvi...@octobus.net wrote: > > # HG changeset patch > # User Matthieu Laneuville > # Date 1501648065 -32400 > # Wed Aug 02 13:27:45 2017 +0900 > # Node ID 753f33aed3c6b3fc4d02f5235b1468450ee41fab > # Parent

[Bug 5731] New: origbackuppath backups for files over symlink-to-directory fails

https://bz.mercurial-scm.org/show_bug.cgi?id=5731 Bug ID: 5731 Summary: origbackuppath backups for files over symlink-to-directory fails Product: Mercurial Version: 4.4 Hardware: All OS: All

D1311: scmutil: don't try to delete origbackup symlinks to directories (issue5731)

mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When origbackuppath is set, when looking to see if a file we are backing up conflicts with a directory in the origbackuppath, we incorrectly match on symlinks

D1310: tests: add a test demonstrating issue5731

mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If origbackups are in use, a symlink to a valid directory is backed up, and an update is made that attempts to backup a file or link over that symlink, we

Re: [PATCH] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

Queued, thanks! On Fri, Nov 3, 2017 at 9:34 AM, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1509716857 -3600 > # Fri Nov 03 14:47:37 2017 +0100 > # Node ID 095ef7f12cb36330d5e2b35b6c93fe27f6c1aacc > # Parent

mercurial@34967: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/19ecd39223dc changeset: 34967:19ecd39223dc bookmark:@ tag: tip parent: 34966:d8c2db6167b3 parent: 34965:f445b10dc7fb user:Kevin Bullock date:Fri Nov 03

mercurial@34966: 2 new changesets (1 on stable)

2 new changesets (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f445b10dc7fb changeset: 34965:f445b10dc7fb branch: stable parent: 34955:95f54cec0025 user:Matt Harbison date:Thu Nov 02 20:35:31 2017 -0400 summary:

D1311: scmutil: don't try to delete origbackup symlinks to directories (issue5731)

mbthomas updated this revision to Diff 3265. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1311?vs=3263=3265 REVISION DETAIL https://phab.mercurial-scm.org/D1311 AFFECTED FILES mercurial/scmutil.py tests/test-origbackup-conflict.t CHANGE DETAILS

D1310: tests: add a test demonstrating issue5731

mbthomas updated this revision to Diff 3264. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1310?vs=3262=3264 REVISION DETAIL https://phab.mercurial-scm.org/D1310 AFFECTED FILES tests/test-origbackup-conflict.t CHANGE DETAILS diff --git

[PATCH] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

# HG changeset patch # User Denis Laxalde # Date 1509716857 -3600 # Fri Nov 03 14:47:37 2017 +0100 # Node ID 095ef7f12cb36330d5e2b35b6c93fe27f6c1aacc # Parent 7ebf850d3166a64ff33b4b85adb481b533ddbf86 # Available At http://hg.logilab.org/users/dlaxalde/hg #

Re: [PATCH RFC] revert: no longer mark --interactive as experimental

On Fri, 2017-11-03 at 14:57 +0100, Denis Laxalde wrote: > Martin von Zweigbergk a écrit : > > On Thu, Nov 2, 2017 at 7:16 AM, Denis Laxalde > > wrote: > > > > > Augie Fackler a écrit : > > > > > > > > > > > On Nov 2, 2017, at 09:39, Martin von Zweigbergk via Mercurial- > > >

Re: [PATCH 1 of 1] outgoing: respect ":pushurl" paths

On 11/03/2017 11:25 AM, Hollis Blanchard wrote: # HG changeset patch # User Hollis Blanchard # Date 1509731952 25200 # Fri Nov 03 10:59:12 2017 -0700 # Branch stable # Node ID 666d3aaffadc4e92acfe3e4098ae8f2fa4086b7d # Parent

Re: [PATCH] obsfate: makes successorsetverb takes the markers as argument

No there is not, I just forget I pushed it on phabricator in a first time. Please ignore this series, I've updated https://phab.mercurial-sc m.org/D1191 instead. On Fri, 2017-11-03 at 02:03 +0530, Pulkit Goyal wrote: > Is there any difference between this one and the one you send before > the

Re: Desired use case for obsmarkers / visibility

On Thu, 2017-11-02 at 10:06 -0700, Gregory Szorc wrote: > I have a potential use case for obsmarkers / visibility that I want > to run by people to see if it can be supported. > > Changesets are pushed to the Firefox repo via a landing service. This > service essentially imports changesets

[PATCH 1 of 1] outgoing: respect ":pushurl" paths

# HG changeset patch # User Hollis Blanchard # Date 1509731952 25200 # Fri Nov 03 10:59:12 2017 -0700 # Branch stable # Node ID 666d3aaffadc4e92acfe3e4098ae8f2fa4086b7d # Parent f445b10dc7fb3495d24d1c22b0996148864c77f7 outgoing: respect ":pushurl" paths Make

Re: [PATCH 1 of 1] outgoing: respect ":pushurl" paths

> On Nov 3, 2017, at 15:01, Hollis Blanchard > wrote: > > On 11/03/2017 11:25 AM, Hollis Blanchard wrote: >> # HG changeset patch >> # User Hollis Blanchard >> >> # Date 1509731952 25200 >> #

Re: [PATCH RFC] revert: no longer mark --interactive as experimental

On Fri, Nov 3, 2017 at 12:29 PM, Boris Feld wrote: > On Fri, 2017-11-03 at 14:57 +0100, Denis Laxalde wrote: > > Martin von Zweigbergk a écrit : > > > On Thu, Nov 2, 2017 at 7:16 AM, Denis Laxalde > > > wrote: > > > > > > > Augie Fackler a écrit : > >

Re: [PATCH] run-tests: allow automatic test discovery when providing folder as argument

I sent a follow-up with with bytes issue corrected. On Fri, Nov 03, 2017 at 11:24 PM, Yuya Nishihara wrote: On Fri, 03 Nov 2017 08:41:35 +0900, matthieu.laneuvi...@octobus.net wrote: # HG changeset patch # User Matthieu Laneuville # Date 1508422437 -32400 #

[PATCH v2] run-tests: allow automatic test discovery when providing folder as argument

# HG changeset patch # User Matthieu Laneuville # Date 1508422437 -32400 # Thu Oct 19 23:13:57 2017 +0900 # Node ID 223d34cb2d2a1c1c67053f4613cb76803a485573 # Parent 7ebf850d3166a64ff33b4b85adb481b533ddbf86 # EXP-Topic hg122 run-tests: allow automatic test

D1313: dirstate: gate access to self._map.dirs

mbthomas requested changes to this revision. mbthomas added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > dirstate.py:405 > scmutil.checkfilename(f) > -if f in self._map.dirs: > -raise error.Abort(_('directory %r

D1313: dirstate: gate access to self._map.dirs

mbolin created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `_droppath()` already checks `"dirs" in self._map.__dict__` before accessing `self._map.dirs`. This updates `_addpath()` to be equally cautious. REPOSITORY rHG

[Bug 5730] New: [CRITICAL]Arbitrary command execution in mercurial repo with a git submodule

https://bz.mercurial-scm.org/show_bug.cgi?id=5730 Bug ID: 5730 Summary: [CRITICAL]Arbitrary command execution in mercurial repo with a git submodule Product: Mercurial Version: stable branch Hardware: All

[PATCH] subrepo: config option to disable subrepositories

# HG changeset patch # User Gregory Szorc # Date 1509755155 25200 # Fri Nov 03 17:25:55 2017 -0700 # Branch stable # Node ID f2390c369bfebf32f26f5a2e4aa5620224a7c8ea # Parent f445b10dc7fb3495d24d1c22b0996148864c77f7 subrepo: config option to disable subrepositories

[PATCH] contrib: example hook to reject subrepos

# HG changeset patch # User Gregory Szorc # Date 1509756700 25200 # Fri Nov 03 17:51:40 2017 -0700 # Branch stable # Node ID eeca6102193a20fd85b2ad93fd6ae3f7ddff2a67 # Parent f2390c369bfebf32f26f5a2e4aa5620224a7c8ea contrib: example hook to reject subrepos This is

Re: [PATCH] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

Should we add a release notes directive like this: .. feature:: When interactive revert is run against a revision other than the working directory parent, the diff shown is the diff to *apply* to the working directory, rather than the diff to *discard* from the working copy. This is in

[PATCH] [v2] outgoing: respect ":pushurl" paths (issue5365)

# HG changeset patch # User Hollis Blanchard # Date 1509731952 25200 # Fri Nov 03 10:59:12 2017 -0700 # Branch stable # Node ID a952cae0303fa38d1b246561704071d41bbfa1ea # Parent f445b10dc7fb3495d24d1c22b0996148864c77f7 [v2] outgoing: respect ":pushurl" paths

Re: [PATCH] revert: do not reverse hunks in interactive when REV is not parent (issue5096)

On Fri, Nov 3, 2017 at 1:09 PM, Augie Fackler wrote: > Should we add a release notes directive like this: > > .. feature:: > > When interactive revert is run against a revision other than the working > directory parent, the diff shown is the diff to *apply* to the working >

[PATCH] pathutil: add doctests for canonpath()

# HG changeset patch # User Matt Harbison # Date 1509762170 14400 # Fri Nov 03 22:22:50 2017 -0400 # Node ID 7d9abeb82f021b4b96162a719f4a44a0175c0828 # Parent 3649c3f2cd90c8aec395ca8af5adae33defff12c pathutil: add doctests for canonpath() This is a followup to

[PATCH STABLE] share: handle --relative shares to a different drive letter gracefully

# HG changeset patch # User Matt Harbison # Date 1509681309 14400 # Thu Nov 02 23:55:09 2017 -0400 # Branch stable # Node ID 1683556589d30268414b8f17c67919278aa997c7 # Parent f445b10dc7fb3495d24d1c22b0996148864c77f7 share: handle --relative shares to a different

Re: [PATCH] subrepo: config option to disable subrepositories

On Fri, 03 Nov 2017 20:28:27 -0400, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1509755155 25200 # Fri Nov 03 17:25:55 2017 -0700 # Branch stable # Node ID f2390c369bfebf32f26f5a2e4aa5620224a7c8ea # Parent

Re: [PATCH] subrepo: config option to disable subrepositories

On Fri, Nov 3, 2017 at 10:06 PM, Matt Harbison wrote: > On Fri, 03 Nov 2017 20:28:27 -0400, Gregory Szorc > wrote: > > # HG changeset patch >> # User Gregory Szorc >> # Date 1509755155 25200 >> # Fri Nov 03 17:25:55

[PATCH v2] run-tests: $TESTDIR can be something else than $PWD

# HG changeset patch # User Matthieu Laneuville # Date 1501648065 -32400 # Wed Aug 02 13:27:45 2017 +0900 # Node ID 753f33aed3c6b3fc4d02f5235b1468450ee41fab # Parent a7e49a5b3e6f38338660c0d98f9c593f70064e95 run-tests: $TESTDIR can be something else than $PWD