On Tue, 2017-08-29 at 23:13 -0700, Martin von Zweigbergk wrote:
> On Mon, Aug 28, 2017 at 12:59 PM, Boris Feld
> wrote:
> > # HG changeset patch
> > # User Boris Feld
> > # Date 1499088807 -7200
> > # Mon Jul 03 15:33:27 2017 +0200
> > # Node
Le 30/08/2017 à 20:32, Augie Fackler a écrit :
> On Wed, Aug 30, 2017 at 12:11:18AM +0200, Christophe de Vienne wrote:
>> # HG changeset patch
>> # User Christophe de Vienne
>> # Date 1504023891 -7200
>> # Tue Aug 29 18:24:51 2017 +0200
>> # Node ID
lothiraldan accepted this revision.
lothiraldan added a comment.
LGTM
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D567
To: pulkit, #hg-reviewers, lothiraldan
Cc: lothiraldan, mercurial-devel
___
Mercurial-devel
I also synced up in person with Pulkit yesterday about the directaccess
extension. I wanted to record the key outcomes of our conversation here
to ensure the conversation record is kept in one place.
Q: Pulkit asked me if using revision numbers should also unhide changesets.
A: I said no, at
On 8/28/17 7:00 PM, Augie Fackler wrote:
On Aug 28, 2017, at 13:13, Durham Goode > wrote:
On 8/27/17 6:51 PM, Augie Fackler wrote:
It sounds like you whitelist read and unrecoverable-write
commands. Does that mean "ercoverable-write" commands are inferred
singhsrb added inline comments.
INLINE COMMENTS
> test-commit-amend.t:1227
> + +b
> +Exclude changes to a particular file
> + $ echo b >> b
I will add a newline before this line!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D596
To: singhsrb, #hg-reviewers
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
> In remotefilelog/x.py, it may have:
>
> from . import shallowutils
>
> This triggers "direct symbol import shallowutils from remotefilelog" today.
Perhaps you didn't
pulkit abandoned this revision.
pulkit added a comment.
Abandoning in favor of `D581` and `D582` which seems to be a more general
approach.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D525
To: pulkit, #hg-reviewers, durin42
Cc: yuja, durin42, quark,
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbfb38c5cebf4: revlog: move check for wdir from changelog to
revlog (authored by martinvonz).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D569?vs=1443=1470
# HG changeset patch
# User Yuya Nishihara
# Date 1455712269 -32400
# Wed Feb 17 21:31:09 2016 +0900
# Node ID af0821ec50deb2b65db7e0fecef6b0d379256533
# Parent 937f5edf91058c63fafd981a59fe98d21068
parser: add helper function to test if pattern matches parsed tree
This
# HG changeset patch
# User Yuya Nishihara
# Date 1503147843 -32400
# Sat Aug 19 22:04:03 2017 +0900
# Node ID 167fea06d67ff144461c38799ba8cecaaddd0228
# Parent 67ed9cb475e3b952572b9bc46e2ed56f0474f381
revsetlang: remove unused functions
Superseded by the _match() function.
# HG changeset patch
# User Yuya Nishihara
# Date 1455712705 -32400
# Wed Feb 17 21:38:25 2016 +0900
# Node ID 937f5edf91058c63fafd981a59fe98d21068
# Parent 1d58bfbb617075b997d4b0a41924fcaee648b32f
revsetlang: build optimized tree by helper function
This should make
# HG changeset patch
# User Yuya Nishihara
# Date 1455712204 -32400
# Wed Feb 17 21:30:04 2016 +0900
# Node ID 1d58bfbb617075b997d4b0a41924fcaee648b32f
# Parent 31a2eb0f74e59327c0e1b49ee848c126993a29dc
parser: add helper function that constructs parsed tree from template
2 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/37b82485097f
changeset: 34020:37b82485097f
user:Jun Wu
date:Wed Aug 30 16:05:12 2017 -0700
summary: revset: do not flip "and" arguments when optimizing
On Tue, 29 Aug 2017 11:22:02 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler
> # Date 1503451273 14400
> # Tue Aug 22 21:21:13 2017 -0400
> # Node ID 8d65029a473f6ff1b1fde49403dd467caf3fd1c0
> # Parent 26ac215809cffdee88cb32e13e2728f6830e0d84
>
On Tue, 29 Aug 2017 11:21:58 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler
> # Date 1503446587 14400
> # Tue Aug 22 20:03:07 2017 -0400
> # Node ID fd4664b32ec7cae6dbfdd6292c04e7f1a4888da2
> # Parent 2ad028635ccd4d47e565c5d59af98ca32165eb3e
>
On Tue, 29 Aug 2017 11:22:04 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler
> # Date 1503451354 14400
> # Tue Aug 22 21:22:34 2017 -0400
> # Node ID 67e8c38e7efb154b63c23426d402e0ffdf0831aa
> # Parent ae30c980ec329715171d142644a6bda68114df57
>
# HG changeset patch
# User Yuya Nishihara
# Date 1504184200 -32400
# Thu Aug 31 21:56:40 2017 +0900
# Node ID aac5ba5f39be117d89c196252b52db501809e3c1
# Parent 167fea06d67ff144461c38799ba8cecaaddd0228
encoding: check overflow while calculating size of JSON escape buffer
The
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
scmutil.cleanupnodes is used by rebase, histedit and amend to do create
obsmarkers or strip nodes. This patch adds functionality to cleanupnodes to
take
a
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch takes the benefit of functionality which we added in
scmutil.cleanupnodes() and passes a formatter instance if the changes flag is
passed.
REPOSITORY
akushner added inline comments.
INLINE COMMENTS
> scmutil.py:649-650
>
> +# Is a formatter object is paased? Do we want to display the hash
> +# changes also?
> +if fm:
Some typos in the comment. Is this what you meant?
# If a formatter object is passed, display the
pulkit updated this revision to Diff 1473.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D581?vs=1471=1473
REVISION DETAIL
https://phab.mercurial-scm.org/D581
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py
akushner added inline comments.
INLINE COMMENTS
> scmutil.py:660
> +fm.startitem()
> +fm.write('oldnode', '%s is changed to ', hexfunc(node),
> +label=label)
Perhaps "is changed to" should
pulkit updated this revision to Diff 1475.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D582?vs=1472=1475
REVISION DETAIL
https://phab.mercurial-scm.org/D582
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-base.t
CHANGE DETAILS
diff --git
pulkit updated this revision to Diff 1474.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D581?vs=1473=1474
REVISION DETAIL
https://phab.mercurial-scm.org/D581
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py
pulkit planned changes to this revision.
pulkit added inline comments.
INLINE COMMENTS
> akushner wrote in scmutil.py:649-650
> Some typos in the comment. Is this what you meant?
>
> # If a formatter object is passed, display the hash changes
>
> or was this a question for the reviewers?
martinvonz added inline comments.
INLINE COMMENTS
> phillco wrote in filemerge.py:724
> you're right. I'll make that change in the morning.
It's now past morning (in our timezone) :-) But don't worry, I'll fix this in
flight.
REPOSITORY
rHG Mercurial
REVISION DETAIL
phillco updated this revision to Diff 1502.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D400?vs=1487=1502
REVISION DETAIL
https://phab.mercurial-scm.org/D400
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1503.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D401?vs=1488=1503
REVISION DETAIL
https://phab.mercurial-scm.org/D401
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco added a comment.
(Fixed trailing space)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D388
To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing list
phillco updated this revision to Diff 1505.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D404?vs=1490=1505
REVISION DETAIL
https://phab.mercurial-scm.org/D404
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1504.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D403?vs=1489=1504
REVISION DETAIL
https://phab.mercurial-scm.org/D403
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
martinvonz added a comment.
Seems like you missed two places. Let me know if should fix them in flight
INLINE COMMENTS
> filemerge.py:426
> tool, toolpath, binary, symlink = toolconf
> a, b, c, back = files
> r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
why not change
martinvonz added a comment.
In https://phab.mercurial-scm.org/D388#9515, @phillco wrote:
> (Fixed trailing space)
Yep, I saw that in tests and fixed it locally, so you'll probably see
divergence when you pull after I've pushed them.
REPOSITORY
rHG Mercurial
REVISION DETAIL
martinvonz added a comment.
In https://phab.mercurial-scm.org/D399#9522, @phillco wrote:
> Feel free to, otherwise I can. Thanks.
Done.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D399
To: phillco, #hg-reviewers
Cc: martinvonz, lothiraldan,
phillco updated this revision to Diff 1507.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D388?vs=1485=1507
REVISION DETAIL
https://phab.mercurial-scm.org/D388
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1508.
phillco edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1486=1508
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE
phillco updated this revision to Diff 1489.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D403?vs=1482=1489
REVISION DETAIL
https://phab.mercurial-scm.org/D403
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1490.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D404?vs=1483=1490
REVISION DETAIL
https://phab.mercurial-scm.org/D404
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1485.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D388?vs=1477=1485
REVISION DETAIL
https://phab.mercurial-scm.org/D388
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1486.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1479=1486
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1487.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D400?vs=1480=1487
REVISION DETAIL
https://phab.mercurial-scm.org/D400
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
mbolin marked an inline comment as done.
mbolin added a comment.
Anything else I can do for this?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D464
To: mbolin, quark, durin42, #hg-reviewers, ryanmce
Cc: smf, ryanmce, mercurial-devel
phillco updated this revision to Diff 1481.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D401?vs=1456=1481
REVISION DETAIL
https://phab.mercurial-scm.org/D401
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1482.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D403?vs=1457=1482
REVISION DETAIL
https://phab.mercurial-scm.org/D403
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1479.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D399?vs=1454=1479
REVISION DETAIL
https://phab.mercurial-scm.org/D399
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
the31k created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Issue being fixed here: 'hg branches' incorrectly renders inactive multiheaded
branches as active if they have closed heads.
Example:
$ hg log -G
quark added a comment.
In the previous version, I have suggested making `changes` part of template
language instead of a flag, like `-T '{changes|json}'` instead of `--changes -T
'json'`. That's generally more flexible because people can use the template
language (ex. if they only want
phillco updated this revision to Diff 1477.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D388?vs=1453=1477
REVISION DETAIL
https://phab.mercurial-scm.org/D388
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
phillco updated this revision to Diff 1483.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D404?vs=1458=1483
REVISION DETAIL
https://phab.mercurial-scm.org/D404
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py
On Thu, Aug 31, 2017 at 11:46:11PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1504184200 -32400
> # Thu Aug 31 21:56:40 2017 +0900
> # Node ID aac5ba5f39be117d89c196252b52db501809e3c1
> # Parent
On Thu, Aug 31, 2017 at 11:42:11PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1455712705 -32400
> # Wed Feb 17 21:38:25 2016 +0900
> # Node ID 937f5edf91058c63fafd981a59fe98d21068
> # Parent
martinvonz added inline comments.
INLINE COMMENTS
> context.py:1967-1968
> +def clearunknown(self):
> +"""Removes conflicting items in the working directory (and creates
> any
> +missing parent directories) so that ``write()`` can be called
> +successfully.
I'll
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6e6452bc441d: editor: use an unambiguous path suffix for
editor files (authored by mbolin).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D464?vs=1449=1501
Excerpts from Denis Laxalde's message of 2017-08-30 15:54:15 +0200:
> # HG changeset patch
> # User Denis Laxalde
> # Date 1504025723 -7200
> # Tue Aug 29 18:55:23 2017 +0200
> # Node ID 092bccbfdc5d29fe5fe2f79c18d49bd842437707
> # Parent
On Thu, Aug 31, 2017 at 01:10:45PM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1504039090 14400
> # Tue Aug 29 16:38:10 2017 -0400
> # Branch stable
> # Node ID de15a760e994c378dfd56d9d63a68af6c091a525
> # Parent
pulkit planned changes to this revision.
pulkit added a comment.
As per discussion with @quark , "-T should be specifying the template
content, instead of just the template type".
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D581
To: pulkit, #hg-reviewers
Cc:
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG96123bdea43e: filemerge: reduce creation of tempfiles until
needed (authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D403?vs=1504=1514#toc
REPOSITORY
rHG Mercurial
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG67cfffbfb6a0: filemerge: eliminate most uses of tempfiles
(authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D399?vs=1508=1511#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfe04c018eaac: filemerge: add _restorebackup (authored by
phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D404?vs=1505=1515
REVISION DETAIL
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd37f1bb68169: filemerge: move a util copy call to
filectx.write (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D400?vs=1509=1512
REVISION
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG65ae54582713: merge: move some of the logic in batchget()
to workingfilectx (authored by phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D444?vs=1478=1516#toc
REPOSITORY
rHG
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7558917f291e: filemerge: add `_workingpath` (authored by
phillco).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D401?vs=1503=1513#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
# HG changeset patch
# User Christophe de Vienne
# Date 1504023891 -7200
# Tue Aug 29 18:24:51 2017 +0200
# Node ID 5bbb2d585a963985a9172325f98bb5367b53e438
# Parent b2eb0aa445cbe7cadc8b7691c6266908adfc5057
command options: abort on unicode defaults
If the
quark abandoned this revision.
quark added a comment.
You're right. I checked the output again and it worked as expected. I think
it was caused by me experimenting with stuff and modified `localmods` with
`.__init__` removed (which never got sent). I'll drop this patch. The next
patch is
Excerpts from Christophe de Vienne's message of 2017-08-31 23:26:58 +0200:
> # HG changeset patch
> # User Christophe de Vienne
> # Date 1504023891 -7200
> # Tue Aug 29 18:24:51 2017 +0200
> # Node ID 5bbb2d585a963985a9172325f98bb5367b53e438
> # Parent
quark updated this revision to Diff 1517.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D552?vs=1411=1517
REVISION DETAIL
https://phab.mercurial-scm.org/D552
AFFECTED FILES
contrib/import-checker.py
tests/test-imports-checker.t
CHANGE DETAILS
New changeset (1 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/3c3066367d72
changeset: 34027:3c3066367d72
branch: stable
tag: tip
parent: 33884:5707bfe04deb
user:Matt Harbison
date:Tue Aug 29 16:38:10 2017 -0400
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
unlink() on Windows is complicated by the fact that Windows doesn't
support removing an open file. Our unlink wrapper currently goes
through a dance where it
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Currently we have one slow implementation of copytrace. While moving
fbext/copytrace to core, a lot of things will be introduced and some new
configs for user to
Excerpts from Augie Fackler's message of 2017-08-31 15:23:57 -0400:
> On Thu, Aug 31, 2017 at 11:42:11PM +0900, Yuya Nishihara wrote:
> > # HG changeset patch
> > # User Yuya Nishihara
> > # Date 1455712705 -32400
> > # Wed Feb 17 21:38:25 2016 +0900
> > # Node ID
indygreg added a comment.
On my Windows desktop at home, this reduced `hg debugapplystreamclonebundle`
for mozilla-unified from ~185s to ~160s. So that's 2 machines showing a wall
time reduction for this operation.
REPOSITORY
rHG Mercurial
REVISION DETAIL
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, we were performing membership testing against a
list. Change it to a set for a minor perf win. While we're at it,
explode the assignment in place
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There is needless checking for the new commit hash not being equal to
the old commit hash. This condition will always be true at this point in the
code path
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Since the redundant commit during the amend has been been removed, there is no
need for commit callback function in amend now. Therefore, this commit removes
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There was an extra commit made during the amend operation to track the
changes to the working copy. However, this logic was written a long time back
and newer
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Comment was ambiguous as there can be two parents of a changeset in mercurial.
This commit fixes the comment to clarify that the first parent is being
martinvonz added inline comments.
INLINE COMMENTS
> filemerge.py:592-594
> +In addition to preserving the user's pre-existing modifications to `fcd`
> +(if any), the backup is used to undo certain a premerge, confirm a merge
> +changed anything, and determine what line endings the
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG31a2eb0f74e5: pager: do not start pager if `ui` has been
`pushbuffer`-ed (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D574?vs=1460=1468
phillco abandoned this revision.
phillco added inline comments.
INLINE COMMENTS
> martinvonz wrote in filemerge.py:724
> should "a" be renamed to "unused" here?
you're right. I'll make that change in the morning.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D401
New changeset in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/205c47e30a93
changeset: 34019:205c47e30a93
bookmark:@
tag: tip
user:Yuya Nishihara
date:Wed Aug 30 22:51:28 2017 +0900
summary: revset: make match function follow given subset
martinvonz added inline comments.
INLINE COMMENTS
> context.py:1971-1973
> +if self._repo.wvfs.isdir(self._path) and not self._repo.wvfs.islink(
> +self._path):
> +self._repo.wvfs.removedirs(self._path)
self.repo.wvfs gets repeated often enough that it's
martinvonz added inline comments.
INLINE COMMENTS
> filemerge.py:724
> fd = fcd.path()
> a, unused, unused, back = files
>
should "a" be renamed to "unused" here?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D401
To: phillco, #hg-reviewers
Cc:
83 matches
Mail list logo