Mercurial > evolve
comparison tests/test-pick.t @ 5970:65d4e47d7f26
rewriteutil: use precheck from core if recent enough
This commit makes the evolve extension's `rewriteutil.precheck()`
simply delegate to the same function from Mercurial core, if that
function is deemed recent enough. The way I made that check is by
looking for `rewriteutil.find_new_divergence_from()`. That means that
there's a range of commits (ba6881c6::8125bcd2^) where the user would
see less detailed error messages if they are running with an hg
version from that range (there are no released versions in that
range).
As you can see in the tests, switching to core's version of the
function mostly affects error messages and exit codes.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 04 May 2021 09:40:18 -0700 |
parents | e5d91fd1f319 |
children | 1a13ac9ef30a 0d8d805fadbb |
comparison
equal
deleted
inserted
replaced
5969:f8ab6ad1ffc0 | 5970:65d4e47d7f26 |
---|---|
290 $ hg phase -r 7c15c05db6fa -p | 290 $ hg phase -r 7c15c05db6fa -p |
291 | 291 |
292 $ hg pick -r 7c15c05db6fa | 292 $ hg pick -r 7c15c05db6fa |
293 abort: cannot pick public changesets: 7c15c05db6fa | 293 abort: cannot pick public changesets: 7c15c05db6fa |
294 (see 'hg help phases' for details) | 294 (see 'hg help phases' for details) |
295 [255] | 295 [10] |
296 | 296 |
297 $ hg glog | 297 $ hg glog |
298 @ 10:c437988de89f foo to b | 298 @ 10:c437988de89f foo to b |
299 | | 299 | |
300 o 8:44e155eb95c7 add c | 300 o 8:44e155eb95c7 add c |