taapas1128 updated this revision to Diff 13669.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5792?vs=13668=13669
REVISION DETAIL
https://phab.mercurial-scm.org/D5792
AFFECTED FILES
hgext/uncommit.py
tests/test-uncommit.t
CHANGE DETAILS
diff
taapas1128 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/D5792
AFFECTED FILES
hgext/uncommit.py
tests/test-uncommit.t
CHANGE DETAILS
diff --git
> Unused in this version. Removed.
>
> Looks like unrelated change. Also removed.
Indeed, sorry, I didn't correctly split my commit in 2. Thanks for the cleanup!
--
l u d o .
. 8 0 17 80
___
Mercurial-devel mailing list
# HG changeset patch
# User Matt Harbison
# Date 1548990069 18000
# Thu Jan 31 22:01:09 2019 -0500
# Node ID 44c5506a25728b51c52cdb7bab20f0adf16eca02
# Parent d3dc4abc547aca55e1de6b89ff59e86e635d5ec8
tests: quote $PYTHON for py3 support on Windows
diff --git a/tests/test-convert-hg-svn.t
# HG changeset patch
# User Matt Harbison
# Date 1548989678 18000
# Thu Jan 31 21:54:38 2019 -0500
# Node ID d3dc4abc547aca55e1de6b89ff59e86e635d5ec8
# Parent fe2c826533a7285a38d536b532e0068ca4fb64e1
py3: byteify the --retest path of run-tests.py
diff --git a/tests/run-tests.py
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I've been working on storing copy metadata in the changelog instead of
the filelog and this has been useful for debugging.
Do we usually add tests for
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I'm pretty sure we don't need to filter copies by destination, at
least since the previous patch.
REPOSITORY
rHG Mercurial
REVISION DETAIL
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/D5789
AFFECTED FILES
mercurial/patch.py
CHANGE DETAILS
diff --git a/mercurial/patch.py
martinvonz updated this revision to Diff 13664.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5777?vs=13635=13664
REVISION DETAIL
https://phab.mercurial-scm.org/D5777
AFFECTED FILES
mercurial/commands.py
tests/test-grep.t
CHANGE DETAILS
diff
martinvonz updated this revision to Diff 13662.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5748?vs=13633=13662
REVISION DETAIL
https://phab.mercurial-scm.org/D5748
AFFECTED FILES
mercurial/commands.py
tests/test-resolve.t
CHANGE DETAILS
diff
martinvonz updated this revision to Diff 13663.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5776?vs=13634=13663
REVISION DETAIL
https://phab.mercurial-scm.org/D5776
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git
spectral added a comment.
I've sent https://phab.mercurial-scm.org/D5787 and
https://phab.mercurial-scm.org/D5788, implementing support for
`whitespace='noconfig'` to parse them from the commandline args, but ignore the
settings from the user's config. I did not add this to `revert
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The `record` extension supports specifying various flags on the commandline to
change the way that whitespace is handled when partially committing the
change.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, there was no supported way of respecting diff options set on the
command line without picking up potentially breaking settings from the config.
> I wasn't able to come up with a reason to support these but only when
> committing interactively (as I said in the commit description), but I guess
> there's justification in
> https://www.mercurial-scm.org/pipermail/mercurial-devel/2011-June/032316.html.
>
> So I think I can
yuja added a comment.
> I wasn't able to come up with a reason to support these but only when
committing interactively (as I said in the commit description), but I guess
there's justification in
https://www.mercurial-scm.org/pipermail/mercurial-devel/2011-June/032316.html.
>
> So
On Thu, 31 Jan 2019 23:21:48 +0800, Anton Shestakov wrote:
> On Thu, 31 Jan 2019 23:19:18 +0900
> Yuya Nishihara wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara
> > # Date 1548562733 -32400
> > # Sun Jan 27 13:18:53 2019 +0900
> > # Node ID
On Thu, 31 Jan 2019 10:12:25 -0500, Boris FELD wrote:
> On 30/01/2019 17:43, Yuya Nishihara wrote:
> > On Wed, 30 Jan 2019 14:18:29 -0500, Boris FELD wrote:
> >> On 29/01/2019 07:11, Yuya Nishihara wrote:
> >>> On Tue, 29 Jan 2019 09:25:34 +0100, Mathias De Maré wrote:
> On Mon, Jan 28, 2019
spectral added a comment.
> I could see this being something like the following, to make it look at
commands.commit.interactive.ignorews (and others):
>
> diffopts = patch.difffeatureopts(repo.ui, section='commands',
configprefix='commit.interactive.', whitespace=True)
>
>
spectral updated this revision to Diff 13659.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5786?vs=13656=13659
REVISION DETAIL
https://phab.mercurial-scm.org/D5786
AFFECTED FILES
hgext/blackbox.py
tests/test-blackbox.t
CHANGE DETAILS
diff --git
spectral updated this revision to Diff 13658.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5785?vs=13655=13658
REVISION DETAIL
https://phab.mercurial-scm.org/D5785
AFFECTED FILES
hgext/blackbox.py
tests/test-blackbox.t
CHANGE DETAILS
diff --git
spectral updated this revision to Diff 13657.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5784?vs=13654=13657
REVISION DETAIL
https://phab.mercurial-scm.org/D5784
AFFECTED FILES
tests/test-blackbox.t
CHANGE DETAILS
diff --git
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/D5786
AFFECTED FILES
hgext/blackbox.py
tests/test-blackbox.t
CHANGE DETAILS
diff --git
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/D5785
AFFECTED FILES
hgext/blackbox.py
tests/test-blackbox.t
CHANGE DETAILS
diff --git
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/D5784
AFFECTED FILES
tests/test-blackbox.t
CHANGE DETAILS
diff --git a/tests/test-blackbox.t
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/D5783
AFFECTED FILES
tests/test-blackbox.t
CHANGE DETAILS
diff --git a/tests/test-blackbox.t
spectral added a comment.
In https://phab.mercurial-scm.org/D5744#84781, @navaneeth.suresh wrote:
> Sorry for bumping this up. I worked on a similar issue on
https://phab.mercurial-scm.org/D5490. My initial revision was similar to this
one. @spectral Don't you think it'll affect record
mharbison72 added a comment.
In https://phab.mercurial-scm.org/D5749#84825, @durin42 wrote:
> In https://phab.mercurial-scm.org/D5749#84719, @mharbison72 wrote:
>
> > In https://phab.mercurial-scm.org/D5749#84640, @indygreg wrote:
> >
> > > @durin42 and I were both able to produce
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfe2c826533a7: subrepo: clean up lingering bytes/str issues
in svn support (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG784594080ad4: status: introduce higher-level
ui.relative-paths (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1d6eae696cf1: status: extract helper for producing relative
or absolute path for UI (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG734bc82f28c3: tweakdefaults: set ui.relative-paths instead
of command.status.relative (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8db09278f7e0: tags: avoid generating commit for an already
deleted tag (issue5752) (authored by navaneeth.suresh, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://bz.mercurial-scm.org/show_bug.cgi?id=6068
Bug ID: 6068
Summary: Merge conflict when doing `hg shelve --interactive`
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
pulkit added a comment.
Queued upto here. I need a refreshed brain for the next patch to find all the
occurrences where we print file name.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5775
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
8 new changesets (1 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/fa7d61f9c512
changeset: 41448:fa7d61f9c512
parent: 41445:73a33fe625bb
user:Pulkit Goyal
date:Tue Jan 29 16:03:52 2019 +0300
summary: changegroup: don't try to build changelog chunks
navaneeth.suresh added a comment.
@durin42 Thanks for the quick review.
@mharbison72 Yup. I should not be making changes to the ui as this can be
fixed simply within the call itself. My bad. I've updated the revision as per
your suggestion, many thanks!
REPOSITORY
rHG Mercurial
navaneeth.suresh updated this revision to Diff 13647.
navaneeth.suresh edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5780?vs=13641=13647
REVISION DETAIL
https://phab.mercurial-scm.org/D5780
AFFECTED FILES
durin42 added a comment.
In https://phab.mercurial-scm.org/D5749#84719, @mharbison72 wrote:
> In https://phab.mercurial-scm.org/D5749#84640, @indygreg wrote:
>
> > @durin42 and I were both able to produce intermittent failures with this
change. Why, I'm not sure.
> >
> > Does the
mharbison72 added a comment.
Since the tag command's code is already looking at `repo.tagtype()`, I wonder
if it would be better to just inline the global tag lookup and nullid
comparison right there instead of updating the interface.
REPOSITORY
rHG Mercurial
REVISION DETAIL
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
In non-ellipses case, the number of manifest nodes can be very big, and
finding
whether one of them can be pruned or not is very costly. For each node, we try
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6a7b2d2de124: watchman: detect nested mercurial
repositories and abort (authored by lothiraldan, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG158962bf4a52: watchman: add verbose config knob (authored
by lothiraldan, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5586?vs=13411=13644
durin42 requested changes to this revision.
durin42 added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> localrepo.py:1484
>
> +def alreadydeletedtag(self, tagname):
> +'''return True if given tag is already deleted'''
You'll need to update the
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8427fea04017: copyright: update to 2019 (authored by av6,
committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5779?vs=13640=13643
REVISION DETAIL
durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is uglier, but more obviously correct in my opinion. I guess
Python 3 doesn't hang on to the exception as long, which seems
On Thu, 31 Jan 2019 23:19:20 +0900
Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1548563857 -32400
> # Sun Jan 27 13:37:37 2019 +0900
> # Node ID 4e7cb9965efc7921427418742ff2ca23f180b707
> # Parent d5978ebfee5ac4ec9694c8d1a2df37c7e1555bd3
> revset: leverage
On Thu, 31 Jan 2019 23:19:18 +0900
Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1548562733 -32400
> # Sun Jan 27 13:18:53 2019 +0900
> # Node ID 5e5dda247ee2ba8407bc4932118a944c1959b1f9
> # Parent 1aa52287973e180eaf23c32dd454d38537facb8e
> revset: extract
2 new changesets (2 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/261d37b94d31
changeset: 41446:261d37b94d31
branch: stable
parent: 41350:ab0d762d89ef
user:Boris Feld
date:Wed Jan 30 18:15:38 2019 +0100
summary: sparserevlog: document the
On 30/01/2019 17:43, Yuya Nishihara wrote:
> On Wed, 30 Jan 2019 14:18:29 -0500, Boris FELD wrote:
>> On 29/01/2019 07:11, Yuya Nishihara wrote:
>>> On Tue, 29 Jan 2019 09:25:34 +0100, Mathias De Maré wrote:
On Mon, Jan 28, 2019 at 1:21 PM Yuya Nishihara wrote:
> On Fri, 25 Jan 2019
# HG changeset patch
# User Yuya Nishihara
# Date 1548563325 -32400
# Sun Jan 27 13:28:45 2019 +0900
# Node ID d5978ebfee5ac4ec9694c8d1a2df37c7e1555bd3
# Parent 5e5dda247ee2ba8407bc4932118a944c1959b1f9
revset: allow to parse single integer as a range
Even though this wouldn't be any useful
# HG changeset patch
# User Yuya Nishihara
# Date 1548562733 -32400
# Sun Jan 27 13:18:53 2019 +0900
# Node ID 5e5dda247ee2ba8407bc4932118a944c1959b1f9
# Parent 1aa52287973e180eaf23c32dd454d38537facb8e
revset: extract a helper to parse integer range
It's getting common. As a first step,
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
`$ hg tag --remove ` will keep on generating commits
regardless of checking whether the tag is deleted or not. I added a new
function
yuja added a comment.
> +from __future__ import absolute_import, print_function
I've fixed this in flight.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5778
To: durin42, #hg-reviewers
Cc: yuja, mercurial-devel
> +from __future__ import absolute_import, print_function
I've fixed this in flight.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> -retdata = p.stdout.read().strip()
> +retdata = pycompat.fsencode(p.stdout.read().strip())
Curious why subprocess output can be a unicode. Is it a sort of text-mode
stream?
___
Mercurial-devel mailing list
yuja added a comment.
> +try:
> +isfile = os.path.isfile(path)
> +# Python 2 raises TypeError, Python 3 ValueError.
> +except (TypeError, ValueError) as e:
> +raise error.Abort(_('invalid path %s: %s') % (
> +path, pycompat.bytestr(e)))
> +try:
> +isfile = os.path.isfile(path)
> +# Python 2 raises TypeError, Python 3 ValueError.
> +except (TypeError, ValueError) as e:
> +raise error.Abort(_('invalid path %s: %s') % (
> +path, pycompat.bytestr(e)))
I don't know if the path is included in
yuja added a comment.
> - retdata = p.stdout.read().strip() +retdata =
pycompat.fsencode(p.stdout.read().strip())
Curious why subprocess output can be a unicode. Is it a sort of text-mode
stream?
REPOSITORY
rHG Mercurial
REVISION DETAIL
On Tue, 29 Jan 2019 23:45:46 -0800, Ludovic Chabant wrote:
> # HG changeset patch
> # User Ludovic Chabant
> # Date 1548831555 28800
> # Tue Jan 29 22:59:15 2019 -0800
> # Node ID 7127fdab8807f3a3bcf2b1eebb1ee4084233f21f
> # Parent ef0e2f7224358c32b0f62b13e83e89ba2399c8cf
> extdiff: add
On Wed, 30 Jan 2019 21:05:45 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1548894031 18000
> # Wed Jan 30 19:20:31 2019 -0500
> # Node ID 5380290f1f11face5e58428cdb389eb7245969ba
> # Parent 4a2c8ec90a28542cbccc155fc6ddf60fe0a8d1dc
> run-tests: sort the
On Wed, 30 Jan 2019 08:57:07 -0800, Ludovic Chabant wrote:
> > My point was that it could be addressed by checking the gui flag (or adding
> > new dedicated flag to [diff/merge-tools].) It's a tool property whether
> > multiple processes can be spawned or not.
>
> After testing a bit, it turns
On Tue, 29 Jan 2019 10:41:17 -0800, Gregory Szorc wrote:
> On Tue, Jan 29, 2019 at 3:44 AM Yuya Nishihara wrote:
> > is a global requirement. I don't know if sparserevlog should be a revlog
> > flag
> > or not, but anyway only thing we can do here is to turn off the sparse, as
> > your
> > patch
On Wed, 30 Jan 2019 22:50:53 -0500, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1548868538 -3600
> # Wed Jan 30 18:15:38 2019 +0100
> # Branch stable
> # Node ID cf5421ca2bea707ce52fc96f5ca68cf8f4894e8c
> # Parent ab0d762d89ef6e2fdcf2a4cc31e9889ea04bc13b
> #
64 matches
Mail list logo
