lothiraldan added a comment.
Thank you for the explanation, I might have deleted the "Differential
Revision" line while changing the changeset message, I will be more careful the
next time.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D541
To: durin42, #hg-re
quark updated this revision to Diff 2452.
quark edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D912?vs=2367&id=2452
REVISION DETAIL
https://phab.mercurial-scm.org/D912
AFFECTED FILES
tests/test-alias.t
CHANGE DETAI
quark updated this revision to Diff 2453.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D917?vs=2372&id=2453
REVISION DETAIL
https://phab.mercurial-scm.org/D917
AFFECTED FILES
mercurial/chgserver.py
CHANGE DETAILS
diff --git a/mercurial/chgserver.py
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The bisect operation should have minimal side-effect.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D950
AFFECTED FILES
tests/run-te
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This removes 3 lines in total LOC and makes the upcoming changes easier.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D948
AFFECTED F
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Otherwise a customized template may break the regex matching the bisect
output.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D949
A
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This removes 8 space indentation and makes upcoming changes easier.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D947
AFFECTED FILES
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
chg only supports 'hg serve' when the options to the serve command
follow the 'hg serve'. For example, 'hg -R serve ..' is unsupported.
This leads to issues wi
On 9/30/17 6:26 AM, Yuya Nishihara wrote:
On Sat, 30 Sep 2017 16:01:36 +0530, Pulkit Goyal wrote:
I don't see the traceback after applying this patch. If possible, this
patch should be folded with the previous series.
On Sat, Sep 30, 2017 at 3:05 PM, Boris Feld wrote:
# HG changeset patch
# U
durham created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The dirstate was refactored so dirstate._map is now at dirstate._map._map.
Same
for _copymap, is not _map.copymap. It seems none of the mercurial tests cover
thi
singhsrb updated this revision to Diff 2444.
singhsrb edited the summary of this revision.
singhsrb added a comment.
Updating https://phab.mercurial-scm.org/D936: updating the summary to include
test.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D936?
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The loop needlessly checks the condition after the first iteration.
Therefore, moving this condition outside the loop. Compiler can potentially
optimize this bu
quark accepted this revision.
quark added inline comments.
INLINE COMMENTS
> histedit.py:796
>
> class base(histeditaction):
>
You can use the decorator here:
@action()
just like line 819.
> histedit.py:1613
> +
> +globals()['base'] = action(['base', 'b'],
> +_('checkou
singhsrb updated this revision to Diff 2440.
singhsrb edited the test plan for this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D942?vs=2439&id=2440
REVISION DETAIL
https://phab.mercurial-scm.org/D942
AFFECTED FILES
hgext/histedit.py
tes
Hi,
I would like some comments about a small proposal I was thinking to do
The change consists in modifying the error messages mercurial spits when
performing an update across branches with a dirty working copy.
This is a change in the command line output for an error message (not a
behavioural o
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This config has been around for about 2 years now. So, it can be
assumed to be stable. Therefore, I am removing the config. This also makes the
test 'test-histe
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The functions splitremotename and joinremotename are moved to core from
remotenames extension.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The statement was added at a lot of places and was going to be added at more
places. So before that, let's turn that into a function.
Also this is turned into
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch functions which can be used to read remotenames data from
.hg/remotenames/. The logic for the function which reads the remotenames file
is
taken from
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch moves the functionality from remotenames extension to store
remotenames in .hg/remotenames file to core by changing following things:
1. Each type o
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch moves the functionality to pull branches and bookmarks from a
server from which we are pulling to core. The function used to exist in
remotenames repo.
# HG changeset patch
# User Pulkit Goyal <7895pul...@gmail.com>
# Date 1507153197 -19800
# Thu Oct 05 03:09:57 2017 +0530
# Node ID b3cf58915bc36b7e01470f6a55dc5bd8b8f4cc9a
# Parent e7cce2b6198ace7769e2c68a5b67eddde794cfeb
remotenames: push anonymous head if --force is given
If force is pass
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This import was failing (because its invalid) which was resulting in
the following tests failing with chg running:
- test-convert-bzr.t
- test-convert-bzr-
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG192f7b126ed2: urllibcompat: move some adapters from
pycompat to urllibcompat (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1232f7fa00c3: cleanup: use urllibcompat for renamed methods
on urllib request objects (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG80d4681150b9: urllibcompat: new library to help abstract
out some python3 urllib2 stuff (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercuria
6 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/7757cc48b766
changeset: 34456:7757cc48b766
user:Matt Mackall
date:Tue Sep 13 14:14:05 2016 -0500
summary: extdata: add extdatasource reader
https://www.mercurial-scm.org/repo/hg/rev/2c3b8fa3211b
change
dlax added inline comments.
INLINE COMMENTS
> dlax wrote in scmutil.py:695
> A "correct" indentation would be:
>
> nodesdict = {short(pred): [short(s) for s in succs]
>for pred, succs in replacements.iteritems()}
> fm.write('hashchanges', '%s\n',
>fm.formatdict(n
krbullock added inline comments.
INLINE COMMENTS
> test-merge-halt.t:24
> + $ echo onfailure=continue >> $HGRCPATH
> + $ hg rebase -s 1 -d 2 --tool false
> + rebasing 1:1f28a51c3c9b "c"
Why test this with rebase instead of merge?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mer
krbullock requested changes to this revision.
krbullock added a comment.
This revision now requires changes to proceed.
I was initially confused by the description of this change, because the user
can already halt (by configuration) after the first failed file merge. But this
introduces a way
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb0910102e495: test-devel-warnings: make the test compatible
with chg (authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D915?vs=
krbullock accepted this revision.
krbullock added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D915
To: singhsrb, #hg-reviewers, krbullock
Cc: krbullock, quark, mercurial-devel
durin42 abandoned this revision.
durin42 added a comment.
(Marking as abandoned because this is landed.)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D541
To: durin42, #hg-reviewers, lothiraldan
Cc: quark, martinvonz, mercurial-devel
___
pulkit abandoned this revision.
pulkit added a comment.
Send an updated version as https://phab.mercurial-scm.org/D933 and
https://phab.mercurial-scm.org/D934.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D581
To: pulkit, #hg-reviewers
Cc: quark, akushner, mer
33 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/1baa077214ae
changeset: 34423:1baa077214ae
user:muxator
date:Sun Oct 01 01:02:22 2017 +0200
summary: docker: try to follow the best practices for writing Dockerfiles
https://www.mercurial-scm.org/repo
pulkit abandoned this revision.
pulkit added a comment.
Send an updated version as `D933`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D582
To: pulkit, #hg-reviewers, quark
Cc: quark, mercurial-devel
___
Mercurial-de
pulkit updated this revision to Diff 2427.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D933?vs=2420&id=2427
REVISION DETAIL
https://phab.mercurial-scm.org/D933
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py b/
singhsrb updated this revision to Diff 2426.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D915?vs=2425&id=2426
REVISION DETAIL
https://phab.mercurial-scm.org/D915
AFFECTED FILES
tests/test-devel-warnings.t
CHANGE DETAILS
diff --git a/tests/test-dev
singhsrb updated this revision to Diff 2425.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D915?vs=2370&id=2425
REVISION DETAIL
https://phab.mercurial-scm.org/D915
AFFECTED FILES
tests/test-devel-warnings.t
CHANGE DETAILS
diff --git a/tests/test-dev
At Tue, 3 Oct 2017 22:22:52 +0900,
Yuya Nishihara wrote:
>
> On Sun, 01 Oct 2017 17:15:06 +0100, FUJIWARA Katsunori wrote:
> > At Sun, 01 Oct 2017 13:00:18 +0100,
> > Yuya Nishihara wrote:
> > >
> > > # HG changeset patch
> > > # User Yuya Nishihara
> > > # Date 1506856910 -3600
> > > # Sun
singhsrb added inline comments.
INLINE COMMENTS
> quark wrote in test-devel-warnings.t:119-150
> Maybe use `*` so line numbers change won't cause the test to fail.
Yes, i missed that! I will fix it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D915
To: singhsrb,
# HG changeset patch
# User Denis Laxalde
# Date 1507135749 -7200
# Wed Oct 04 18:49:09 2017 +0200
# Node ID 21115bb034eb168806d485b3b28c3112
# Parent 9fdbf99392971dc9ed2c711718c919397eedcf39
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
# HG changeset patch
# User Denis Laxalde
# Date 1506844364 -7200
# Sun Oct 01 09:52:44 2017 +0200
# Node ID 9fdbf99392971dc9ed2c711718c919397eedcf39
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
durin42 added a comment.
boilerplate added
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D890
To: durin42, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.or
durin42 updated this revision to Diff 2422.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D890?vs=2302&id=2422
REVISION DETAIL
https://phab.mercurial-scm.org/D890
AFFECTED FILES
mercurial/urllibcompat.py
CHANGE DETAILS
diff --git a/mercurial/urllibc
durin42 added a comment.
Oddly, this is now working correctly for me. I'm baffled why it was broken
previously.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D886
To: durin42, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
___
durin42 updated this revision to Diff 2424.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D891?vs=2303&id=2424
REVISION DETAIL
https://phab.mercurial-scm.org/D891
AFFECTED FILES
mercurial/byterange.py
mercurial/httpconnection.py
mercurial/keepaliv
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
These are all the httpserver and urllib.* aliases. They seem to make
more sense in the slightly-more-specific urllibcompat package than the
general-purpose pycom
durin42 updated this revision to Diff 2421.
durin42 marked 3 inline comments as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D886?vs=2298&id=2421
REVISION DETAIL
https://phab.mercurial-scm.org/D886
AFFECTED FILES
mercurial/ui.py
CHANGE DETAILS
quark added a comment.
In https://phab.mercurial-scm.org/D541#15503, @lothiraldan wrote:
> This patch seems to have been queued
(https://www.mercurial-scm.org/repo/hg/rev/187bc224554a), it's weird that
Phabricator doesn't close it. Ping Phabricator expert @quark
The commit messag
dlax requested changes to this revision.
dlax added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> dlax wrote in scmutil.py:695
> Indentation still weird (though no longer wrong).
> Could you align continuation lines with the opening delimiter (`{` for
> `noded
pulkit updated this revision to Diff 2420.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D933?vs=2418&id=2420
REVISION DETAIL
https://phab.mercurial-scm.org/D933
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py b/
dlax added inline comments.
INLINE COMMENTS
> scmutil.py:695
> +fm.formatdict(nodesdict, fmt='%r --> %r', sep='\n'))
> +
> def addremove(repo, matcher, prefix, opts=None, dry_run=None,
> similarity=None):
Indentation still weird (though no longer wrong).
Could you align
pulkit updated this revision to Diff 2419.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D934?vs=2415&id=2419
REVISION DETAIL
https://phab.mercurial-scm.org/D934
AFFECTED FILES
hgext/rebase.py
mercurial/configitems.py
tests/test-rebase-base.t
CHA
pulkit updated this revision to Diff 2418.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D933?vs=2414&id=2418
REVISION DETAIL
https://phab.mercurial-scm.org/D933
AFFECTED FILES
mercurial/scmutil.py
CHANGE D
pulkit planned changes to this revision.
pulkit added a comment.
In https://phab.mercurial-scm.org/D933#15594, @dlax wrote:
> > diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
> >
> > - a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -685,6 +685,18 @@
if tostrip: repair
# HG changeset patch
# User Denis Laxalde
# Date 1507127862 -7200
# Wed Oct 04 16:37:42 2017 +0200
# Node ID f7b31d85dc0e7c7e60b85d0a7fd728a32ba210ea
# Parent 3d8ed7dafee4676b49922a3dde0edf1b1fad63ec
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
# HG changeset patch
# User Denis Laxalde
# Date 1506442667 -7200
# Tue Sep 26 18:17:47 2017 +0200
# Node ID 3d8ed7dafee4676b49922a3dde0edf1b1fad63ec
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
# HG changeset patch
# User Denis Laxalde
# Date 1507123663 -7200
# Wed Oct 04 15:27:43 2017 +0200
# Node ID 9274bdbba0f913672305ed3d91c7e05f38d1eab7
# Parent f7b31d85dc0e7c7e60b85d0a7fd728a32ba210ea
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
# HG changeset patch
# User Denis Laxalde
# Date 1507127733 -7200
# Wed Oct 04 16:35:33 2017 +0200
# Node ID 0f2d8b304223a8d00163f917fdc18082a88bceae
# Parent 9274bdbba0f913672305ed3d91c7e05f38d1eab7
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logi
dlax added a comment.
> diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
>
> - a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -685,6 +685,18 @@ if
tostrip: repair.delayedstrip(repo.ui, repo, tostrip, operation)
>
> +def showchanges(replacements, fm): +""" output t
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8337f7772aa2: fsmonitor: access copymap in new location
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D892?vs=2313&id=2416
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG718f7acd6d5e: fsmonitor: use configitem (authored by
indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D893?vs=2314&id=2417
REVISION DETAIL
# HG changeset patch
# User Yuya Nishihara
# Date 1506923984 -3600
# Mon Oct 02 06:59:44 2017 +0100
# Node ID fecbf1e8aa17474f448e126697fe287e44c92664
# Parent 2b071e9303f748de41c02efdea158883d336224a
py3: fully detach TextIOWrapper
This silences the following error message in test-basic.t,
# HG changeset patch
# User Yuya Nishihara
# Date 1506925104 -3600
# Mon Oct 02 07:18:24 2017 +0100
# Node ID 2b071e9303f748de41c02efdea158883d336224a
# Parent bc4545271d0456e83e49667e1613057918f38093
dispatch: move initialization of sys.std* files
I'll add another Python 3 hack.
diff --gi
# HG changeset patch
# User Yuya Nishihara
# Date 1506924033 -3600
# Mon Oct 02 07:00:33 2017 +0100
# Node ID e6986d59d73bb743c87856bf5ea1a4d869569b8f
# Parent fecbf1e8aa17474f448e126697fe287e44c92664
test-basic: make it work on Python 3
diff --git a/contrib/python3-whitelist b/contrib/pyth
# HG changeset patch
# User Yuya Nishihara
# Date 1506923530 -3600
# Mon Oct 02 06:52:10 2017 +0100
# Node ID bc4545271d0456e83e49667e1613057918f38093
# Parent c67db5dc131d0facdfdadc8c3344a8f3e689867d
py3: work around the scope of exception variable in dispatch.run()
https://stackoverflow.c
krbullock requested changes to this revision.
krbullock added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> mbthomas wrote in merge.py:1739-1743
> I'm not sure if we're planning to work towards PEP8, but it (and I) prefer
> using parentheses to break long if c
pulkit added subscribers: yuja, quark.
pulkit added a comment.
@quark I was unable to make 'hashchanges' resolved by templater. I took help
from Yuya and he was bit confused on how you want it to be done. (adding @yuja)
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds an experimental config, which if turned on will show hash
changes after a rebase. Support will be added to more commands which changes
hash.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds a new function named showchanges() which will output the
changes
like hashchanges, wdir change, movement of bookmarks etc. after a command.
This
# HG changeset patch
# User Boris Feld
# Date 1498787064 -7200
# Fri Jun 30 03:44:24 2017 +0200
# Node ID bde8c9cabe31010b800392507dd3ac7b524d8ec6
# Parent 1b1349c23e37cfc6e82ea05ad4bbf8fbcfc9aa09
# EXP-Topic config.register.core
configitems: register the 'smtp.port' config
diff -r 1b1349c2
# HG changeset patch
# User Boris Feld
# Date 1498786750 -7200
# Fri Jun 30 03:39:10 2017 +0200
# Node ID 6a03f7849f92bc11612fda4a599c5c3fc317ceaf
# Parent bde8c9cabe31010b800392507dd3ac7b524d8ec6
# EXP-Topic config.register.core
configitems: register the 'email.from' config
diff -r bde8c9c
# HG changeset patch
# User Boris Feld
# Date 1498787028 -7200
# Fri Jun 30 03:43:48 2017 +0200
# Node ID 1b1349c23e37cfc6e82ea05ad4bbf8fbcfc9aa09
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
# EXP-Topic config.register.core
configitems: register the 'phases.new-commit' config
diff -r
# HG changeset patch
# User Boris Feld
# Date 1498786993 -7200
# Fri Jun 30 03:43:13 2017 +0200
# Node ID 29c443ad962b078b1814489d41d94dd77d161568
# Parent 6a03f7849f92bc11612fda4a599c5c3fc317ceaf
# EXP-Topic config.register.core
configitems: register the 'merge.preferancestor' config
diff
# HG changeset patch
# User Boris Feld
# Date 1498786625 -7200
# Fri Jun 30 03:37:05 2017 +0200
# Node ID 4e0e313b1e48190dc6d466e62f41032318f7d8ce
# Parent 29c443ad962b078b1814489d41d94dd77d161568
# EXP-Topic config.register.core
configitems: register the 'debug.dirstate.delaywrite' config
# HG changeset patch
# User Yuya Nishihara
# Date 1506856910 -3600
# Sun Oct 01 12:21:50 2017 +0100
# Node ID 82606a8703b6f3b297fd0ed6d3e45e43ecd548de
# Parent b3a36705720f5ed1e7cc5129b27450ca59c7952b
extdata: show debug message if external command exits with non-zero status
This isn't fata
pulkit added inline comments.
INLINE COMMENTS
> config.txt:1248
> + or halt the merge process. Setting this to ``halt`` will automatically
> + half the merge process on any merge tool failure. The merge process
> + can be restarted by using the ``resolve`` command. When a merge is
typo, s/
ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Depends on https://phab.mercurial-scm.org/D931.
This patch introduces functions and a config option that will allow a user
to halt the merge if there are fail
ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
In future patches, we may halt the merge process based on configuration or
user requests by raising exceptions. We need to ensure that the mergestate
is uncondit
ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Currently, failed file merges will nevertheless force the user to continue
attempting to merge all additional unresolved files. Future patches will allow
the use
# HG changeset patch
# User Boris Feld
# Date 1498786879 -7200
# Fri Jun 30 03:41:19 2017 +0200
# Node ID d74488c426c9302f7d32a8954a5b1aa434a0aeae
# Parent c991c20c48c65adf35eea827c6f99a1bd92b8195
# EXP-Topic config.register.histedit
configitems: register the 'experimental.histedit.autoverb'
# HG changeset patch
# User Boris Feld
# Date 1498786960 -7200
# Fri Jun 30 03:42:40 2017 +0200
# Node ID c991c20c48c65adf35eea827c6f99a1bd92b8195
# Parent 09fb4c4519ebf7419740ec823b0141f4e26dae6a
# EXP-Topic config.register.histedit
configitems: register the 'histedit.singletransaction' con
# HG changeset patch
# User Boris Feld
# Date 1498786957 -7200
# Fri Jun 30 03:42:37 2017 +0200
# Node ID a1d86c040bd28d7f96e107d55e7a0cdda2bd63ec
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
# EXP-Topic config.register.histedit
configitems: register the 'histedit.defaultrev' config
di
# HG changeset patch
# User Boris Feld
# Date 1498786883 -7200
# Fri Jun 30 03:41:23 2017 +0200
# Node ID c52cddc01d8d446da8679fbcf1814ecb63186cc0
# Parent d74488c426c9302f7d32a8954a5b1aa434a0aeae
# EXP-Topic config.register.histedit
configitems: register the 'experimental.histeditng' config
# HG changeset patch
# User Boris Feld
# Date 1498786958 -7200
# Fri Jun 30 03:42:38 2017 +0200
# Node ID 04e7d86073c7db82a1d626c1bdeb6b40a5df9722
# Parent a1d86c040bd28d7f96e107d55e7a0cdda2bd63ec
# EXP-Topic config.register.histedit
configitems: register the 'histedit.dropmissing' config
d
# HG changeset patch
# User Boris Feld
# Date 1498786959 -7200
# Fri Jun 30 03:42:39 2017 +0200
# Node ID 09fb4c4519ebf7419740ec823b0141f4e26dae6a
# Parent 04e7d86073c7db82a1d626c1bdeb6b40a5df9722
# EXP-Topic config.register.histedit
configitems: register the 'histedit.linelen' config
diff
# HG changeset patch
# User Boris Feld
# Date 1498787069 -7200
# Fri Jun 30 03:44:29 2017 +0200
# Node ID 3d3e64d40c3a32fc7ada6c00ee56da35bf992651
# Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e
# EXP-Topic config.register.transplant
configitems: register the 'transplant.filter' config
di
# HG changeset patch
# User Boris Feld
# Date 1498787070 -7200
# Fri Jun 30 03:44:30 2017 +0200
# Node ID 4c54abac91fc6f5d931df5124b01b104f2a2ea8d
# Parent 3d3e64d40c3a32fc7ada6c00ee56da35bf992651
# EXP-Topic config.register.transplant
configitems: register the 'transplant.log' config
diff
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG26c879bbf4ee: test-hook: make test compatible with chg
(authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D927?vs=2391&id=2408
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0efdfb57b05c: config: add a missing preparewrite() call
(authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D924?vs=2384&id=2410
RE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG40b6d25ed2d5: test-strip: make test compatible with chg
(authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D928?vs=2392&id=2409
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6981d120c9d7: test-merge-subrepos: make test compatible
with chg (authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D925?vs=2394
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG533f32937182: test-setdiscovery: make test compatible with
chg (authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D926?vs=2393&i
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1f5bd3e1a7fe: test-basic: make test compatible with chg
(authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D922?vs=2382&id=2404
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG47b9c572ca32: test-convert-cvs: make test compatible with
chg (authored by singhsrb, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D923?vs=2383&id
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D924
To: quark, #hg-reviewers, yuja
Cc: yuja, mercurial-devel
__
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf78b1a24094: test-logtoprocess: make it compatible with
chg (authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D914?vs=2369&id=240
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5385b76fd1fd: zeroconf: do not crash if socket being read
is closed by another thread (authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-sc
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb0c97e44576f: test-revlog-mmapindex: make it compatible
with chg (authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D918?vs=2373&id
1 - 100 of 116 matches
Mail list logo