##// END OF EJS Templates
debug: add a config to abort update early...
Arseniy Alekseyev -
r50778:becd1669 default
parent child Browse files
Show More
@@ -746,6 +746,14 b' coreconfigitem('
746 b'discovery.exchange-heads',
746 b'discovery.exchange-heads',
747 default=True,
747 default=True,
748 )
748 )
749 # If devel.debug.abort-update is True, then any merge with the working copy,
750 # e.g. [hg update], will be aborted after figuring out what needs to be done,
751 # but before spawning the parallel worker
752 coreconfigitem(
753 b'devel',
754 b'debug.abort-update',
755 default=False,
756 )
749 # If discovery.grow-sample is False, the sample size used in set discovery will
757 # If discovery.grow-sample is False, the sample size used in set discovery will
750 # not be increased through the process
758 # not be increased through the process
751 coreconfigitem(
759 coreconfigitem(
@@ -1142,6 +1142,8 b' def calculateupdates('
1142 followcopies,
1142 followcopies,
1143 )
1143 )
1144 _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
1144 _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
1145 if repo.ui.configbool(b'devel', b'debug.abort-update'):
1146 exit(1)
1145
1147
1146 else: # only when merge.preferancestor=* - the default
1148 else: # only when merge.preferancestor=* - the default
1147 repo.ui.note(
1149 repo.ui.note(
General Comments 0
You need to be logged in to leave comments. Login now