martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Without ui.relative-paths or command.status.relative set, you get this
behavior:
hgext$ hg st
M hgext/narrow/narrowrepo.py
hgext$ hg st .
M
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/D5801
AFFECTED FILES
mercurial/cmdutil.py
tests/test-locate.t
CHANGE DETAILS
diff --git
> My idea is basically as follows:
>
> if cmd and opts found in extdiff:
> # it must be a user-defined tool
> look for extdiff.gui.
> elif cmd.diffargs found in diff-tools:
> # perhaps it's a stock tool template defined in [diff-tools] (less
> common)
> look for
# HG changeset patch
# User Yuya Nishihara
# Date 1549088811 -32400
# Sat Feb 02 15:26:51 2019 +0900
# Node ID dbf20e28d1a67b05e4c9f93c69be2f808647a9fd
# Parent 921b4ffa9ced910ea79cb839b86a06287710f29c
py3: don't use universal_newlines in svnsubrepo
On Python 3, it means text=True without
# HG changeset patch
# User Yuya Nishihara
# Date 1549088495 -32400
# Sat Feb 02 15:21:35 2019 +0900
# Node ID 921b4ffa9ced910ea79cb839b86a06287710f29c
# Parent 3a3b053d0882a33ba7ea667052e445b193ffa4df
py3: remove unneeded fsencode() from gitsubrepo
Here p.stdout isn't a TextIO. read()
yuja added a comment.
> > Currently, some os.path functions when opening repositories may
> > raise an uncaught TypeError or ValueError if the path is invalid.
>
> What kind of "invalid"? If the path doesn't exist? Or only if the path
variable is of the wrong type (not bytes?
> > Currently, some os.path functions when opening repositories may
> > raise an uncaught TypeError or ValueError if the path is invalid.
>
> What kind of "invalid"? If the path doesn't exist? Or only if the path
> variable is of the wrong type (not bytes? not unicode? neither?)?
It's
martinvonz added a comment.
> Currently, some os.path functions when opening repositories may
> raise an uncaught TypeError or ValueError if the path is invalid.
What kind of "invalid"? If the path doesn't exist? Or only if the path
variable is of the wrong type (not bytes? not
martinvonz added a comment.
In https://phab.mercurial-scm.org/D5745#85049, @yuja wrote:
> >> +relative = pats or ui.configbool('commands', 'status.relative'):
> > > +uipathfn = scmutil.getuipathfn(repo, relative)
> >
> > Not sure if it's worth fixing the syntax error here
indygreg added a comment.
I didn't realize this was already queued with formatting changes fixed in
flight. Ignore my latest upload.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5796
To: indygreg, #hg-reviewers
Cc: yuja, mjpieters, mercurial-devel
indygreg updated this revision to Diff 13697.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5796?vs=13687=13697
REVISION DETAIL
https://phab.mercurial-scm.org/D5796
AFFECTED FILES
tests/test-check-code.t
tests/test-demandimport.py
CHANGE DETAILS
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3a3b053d0882: debugcommands: add a debugpathcopies command
(authored by martinvonz, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D5791?vs=13667=13696#toc
REPOSITORY
rHG
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG116dba99876b: py3: record several more passes from the
buildbot ratchet (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
yuja added a comment.
> The ultimate reason I abandoned that and went with the "only respect
commandline options, not config, and don't do this for `revert --interactive`"
patch series was because I had to include a note that said something like "if a
user *does* set
> The ultimate reason I abandoned that and went with the "only respect
> commandline options, not config, and don't do this for `revert
> --interactive`" patch series was because I had to include a note that said
> something like "if a user *does* set
>
yuja added a comment.
>> +relative = pats or ui.configbool('commands', 'status.relative'):
> > +uipathfn = scmutil.getuipathfn(repo, relative)
>
> Not sure if it's worth fixing the syntax error here before it goes public.
I only noticed because I was bisecting a test failure.
> > +relative = pats or ui.configbool('commands', 'status.relative'):
> > +uipathfn = scmutil.getuipathfn(repo, relative)
>
> Not sure if it's worth fixing the syntax error here before it goes public. I
> only noticed because I was bisecting a test failure. The next patch drops
> the
yuja added a comment.
Fixed various check-code errors by `black -l 80 -S
tests/test-demandimport.py`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5796
To: indygreg, #hg-reviewers
Cc: yuja, mjpieters, mercurial-devel
Fixed various check-code errors by `black -l 80 -S tests/test-demandimport.py`.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
# HG changeset patch
# User Matt Harbison
# Date 1549077873 18000
# Fri Feb 01 22:24:33 2019 -0500
# Node ID 2cdacfe6002918eddc7fb75d47e42f1b26214703
# Parent 1bf9a0827395c593144ffd1fd4cd0713bf0b62e6
tests: drop some unnecessary globs for Windows
This changed in 1d6eae696cf1.
diff --git
mharbison72 added inline comments.
INLINE COMMENTS
> commands.py:5417
>
> -if pats or ui.configbool('commands', 'status.relative'):
> -cwd = repo.getcwd()
> -else:
> -cwd = ''
> +relative = pats or ui.configbool('commands', 'status.relative'):
> +uipathfn =
# HG changeset patch
# User Anton Shestakov
# Date 1548138145 -28800
# Tue Jan 22 14:22:25 2019 +0800
# Branch stable
# Node ID b66fff9e37c56d874f8aabcac4153e9b5a3e4148
# Parent 8b2892d5a9f2c06c998c977015a9ad3e3a3c9b5f
relnotes: more improvements
diff --git a/contrib/relnotes
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG42c0d9b1927a: grep: respect ui.relative-paths (authored by
martinvonz, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D5777?vs=13664=13694#toc
REPOSITORY
rHG Mercurial
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5ce3f5a445ea: resolve: respect ui.relative-paths (authored
by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5748?vs=13662=13692
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG426ad3866f9d: grep: move writing of path outside of column
loop (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 rHG1b63b78adcb1: merge: respect ui.relative-paths (authored by
martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5747?vs=13632=13691
yuja added a comment.
> - fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
> - fm.write('path', '%s', fn, label='grep.filename') +
fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn) +
fm.plain('%s' % uipathfn(fn), label='grep.filename')
Removed useless `'%s'
> -fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
> -fm.write('path', '%s', fn, label='grep.filename')
> +fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
> +fm.plain('%s' % uipathfn(fn), label='grep.filename')
Removed useless `'%s' %` and
indygreg added a comment.
In https://phab.mercurial-scm.org/D5794#85031, @yuja wrote:
> Perhaps, it should be `fsdecode()` since they appear to abuse
> `PyUnicode_EncodeFSDefault()` to get back bytes.
>
> And we'll probably need to `fsencode()` gr_mem back to bytes as well.
yuja added a comment.
> +name = pycompat.sysstr(name)
>
> return list(grp.getgrnam(name).gr_mem)
Perhaps, it should be `fsdecode()` since they appear to abuse
`PyUnicode_EncodeFSDefault()` to get back bytes.
And we'll probably need to `fsencode()` gr_mem back to bytes as
> +name = pycompat.sysstr(name)
> return list(grp.getgrnam(name).gr_mem)
Perhaps, it should be `fsdecode()` since they appear to abuse
`PyUnicode_EncodeFSDefault()` to get back bytes.
And we'll probably need to `fsencode()` gr_mem back to bytes as well.
yuja added a comment.
Queued, thanks.
> +++ b/mercurial/help.py
> @@ -394,7 +394,17 @@
>
> def addtopichook(topic, rewriter):
> helphooks.setdefault(topic, []).append(rewriter)
>
>
> -def makeitemsdoc(ui, topic, doc, marker, items, dedent=False):
> +def
Queued, thanks.
> +++ b/mercurial/help.py
> @@ -394,7 +394,17 @@
> def addtopichook(topic, rewriter):
> helphooks.setdefault(topic, []).append(rewriter)
>
> -def makeitemsdoc(ui, topic, doc, marker, items, dedent=False):
> +def _templateextsyms(ui, topic, doc):
> +for name, ext in
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG43a40d6fd56c: histedit: add templating support to
histedits rule file generation (authored by durin42, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D5742?vs=13570=13690#toc
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb9ce967358eb: py3: account for demand import difference
between Python versions (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG36e2dd4fb3d2: tests: use unimported modules in
test-demandimport.py (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG59ccc976ad3d: py3: replace print() with assert in
test-demandimport.py (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG76600eb1c83c: py3: conditionalize test-demandimport.py for
Python 3 (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5799
AFFECTED FILES
contrib/python3-whitelist
CHANGE DETAILS
diff
indygreg created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Our lazy importer for Python 3 will validate that modules are
loadable before returning a stub module object. This is different
from Python 2, which
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe011c78da629: py3: pass str into grp.getgrnam (authored by
pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5794?vs=13678=13683
REVISION
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa97e000b63c8: montone: fix addition to list by using
.append() instead of + (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
contextlib isn't a good module to test because it is likely already
imported by code above. Let's use modules that shouldn't have been
imported. And let's
indygreg created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The Python 3 lazy importer uses the LazyLoader that is part of
importlib.
On Python 3 and later, LazyLoader is implemented using a custom module
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Behavior of demand imports behaves differently between Python 2 and 3.
.out files do not support conditional output the way that .t files do.
In order to make
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
grp.getgrnam expects str on Python 3.
This fixes test-acl.t on Python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5794
pulkit updated this revision to Diff 13677.
pulkit retitled this revision from "py3: use pycompat.bytestr() so that slicing
does not result in ascii values" to "montone: fix addition to list by using
.append() instead of '+'".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit added a comment.
In https://phab.mercurial-scm.org/D5792#84959, @taapas1128 wrote:
> Thanks for the review @pulkit . By importing do you suggest importing the
code for interactive or someway is there is someway to link `evolve` to
`hg-stable` ?
I mean importing the code.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG24a87f5024b7: tests: give up and make setsockopt() calls
optional in the output (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
durin42 added a comment.
In https://phab.mercurial-scm.org/D5744#84960, @spectral wrote:
> In https://phab.mercurial-scm.org/D5744#84938, @yuja wrote:
>
> > > I did not add this to `revert --interactive`, since that does not
currently have any way of getting args specified on the
taapas1128 added a comment.
Thanks for the review @pulkit . By importing do you suggest importing the
code for interactive or someway is there is someway to link `evolve` to
`hg-stable` ?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5792
To: taapas1128,
spectral added a comment.
In https://phab.mercurial-scm.org/D5744#84938, @yuja wrote:
> > I did not add this to `revert --interactive`, since that does not
currently have any way of getting args specified on the commandline that affect
the whitespace settings (so I'm keeping `revert
5 new changesets (5 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/31286c9282df
changeset: 41456:31286c9282df
branch: stable
user:Yuya Nishihara
date:Tue Jan 08 21:51:54 2019 +0900
summary: subrepo: extend path auditing test to include more weird
pulkit added subscribers: lothiraldan, pulkit.
pulkit added a comment.
Hi, thanks for the patch. Your patch is a good start at implementing
`uncommit -i`. It misses multiple things like dirstate handling.
The good news is that you don't need to implement all that. There is an
evolve
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG56404e03f57e: tests: alter email `From` line to a value
thats consistently parsed (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 rHGac14362ced4b: py3: fix test-remotefilelog-repack.t
(authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5781?vs=13642=13675
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG913bd76ceed5: diff: drop duplicate filter of copies by
destination (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 rHG6c216837c2a2: diff: use match.intersectmatchers() (authored
by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5789?vs=13665=13672
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc4a90ea32914: tests: convert ParseError arguments to str on
Python 3 (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
indygreg created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Arguments internally are bytes. Printing the exception on Python 3
will include b'' prefixes. This test file uses a .out file, which
doesn't support
# HG changeset patch
# User Yuya Nishihara
# Date 1548563857 -32400
# Sun Jan 27 13:37:37 2019 +0900
# Node ID 84a273ff0d5254604d1f9d05d2dbdcebaadb5006
# Parent 28b6a15f5bb2fcfa809532e27cf9008aa4f93d0d
revset: leverage getintrange() helper in relation-subscript operation (API)
Now a range
# HG changeset patch
# User Yuya Nishihara
# Date 1548563325 -32400
# Sun Jan 27 13:28:45 2019 +0900
# Node ID 28b6a15f5bb2fcfa809532e27cf9008aa4f93d0d
# Parent 1502f467006b95eb15b3f51ab5dc4c1d5a53a90f
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 1502f467006b95eb15b3f51ab5dc4c1d5a53a90f
# Parent fe2c826533a7285a38d536b532e0068ca4fb64e1
revset: extract a helper to parse integer range
It's getting common. As a first step,
On Fri, 01 Feb 2019 22:23:37 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1548563325 -32400
> # Sun Jan 27 13:28:45 2019 +0900
> # Node ID a72c5cfe7b8da68563a1fb07d1477a9804d28d74
> # Parent 1502f467006b95eb15b3f51ab5dc4c1d5a53a90f
> revset: allow to
# HG changeset patch
# User Yuya Nishihara
# Date 1548563857 -32400
# Sun Jan 27 13:37:37 2019 +0900
# Node ID 6bcce54288ec2833fc2153b8ad3af1918a0eb7e5
# Parent a72c5cfe7b8da68563a1fb07d1477a9804d28d74
revset: leverage getintrange() helper in relation-subscript operation (API)
Now a range
# HG changeset patch
# User Yuya Nishihara
# Date 1548563325 -32400
# Sun Jan 27 13:28:45 2019 +0900
# Node ID a72c5cfe7b8da68563a1fb07d1477a9804d28d74
# Parent 1502f467006b95eb15b3f51ab5dc4c1d5a53a90f
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 1502f467006b95eb15b3f51ab5dc4c1d5a53a90f
# Parent fe2c826533a7285a38d536b532e0068ca4fb64e1
revset: extract a helper to parse integer range
It's getting common. As a first step,
> I did not add this to `revert --interactive`, since that does not currently
> have any way of getting args specified on the commandline that affect the
> whitespace settings (so I'm keeping `revert --interactive` *ignoring* the
> user's diff settings).
Well, `hg revert --interactive` does
yuja added a comment.
> I did not add this to `revert --interactive`, since that does not currently
have any way of getting args specified on the commandline that affect the
whitespace settings (so I'm keeping `revert --interactive` *ignoring* the
user's diff settings).
Well, `hg
yuja added a comment.
> +track = ui.configlist('blackbox', 'track')
> +if not track:
> +self._active = False
> +elif b'*' in track:
> +self._trackedevents = re.compile(b'.*')
> +else:
> +try:
> +
> +track = ui.configlist('blackbox', 'track')
> +if not track:
> +self._active = False
> +elif b'*' in track:
> +self._trackedevents = re.compile(b'.*')
> +else:
> +try:
> +self._trackedevents =
On Fri, Feb 1, 2019 at 6:09 AM Matt Harbison wrote:
> # 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
https://bz.mercurial-scm.org/show_bug.cgi?id=6069
Bug ID: 6069
Summary: histedit "abort: Access is denied" leaves temp
changesets after --abort
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Windows
73 matches
Mail list logo