| Wed, 28 Feb 2018 21:45:15 +0530 |
Pulkit Goyal |
py3: use '%d' for integers instead of b'%s'
|
| Wed, 28 Feb 2018 21:42:37 +0530 |
Pulkit Goyal |
py3: replace str() calls with their preferred bytes equivalent
|
| Sat, 24 Feb 2018 11:07:07 -0800 |
Gregory Szorc |
rebase: use ctx.rev() instead of %d % ctx
|
| Sat, 24 Feb 2018 16:18:40 +0530 |
Pulkit Goyal |
py3: fix handling of keyword arguments at more places
|
| Sat, 24 Feb 2018 16:07:45 +0530 |
Pulkit Goyal |
py3: replace file() with open()
|
| Sun, 18 Feb 2018 00:43:50 -0500 |
Augie Fackler |
py3: use default dict iterator instead of iterkeys
|
| Sat, 17 Feb 2018 21:47:26 -0500 |
Augie Fackler |
rebase: sort roots by revision
|
| Wed, 14 Feb 2018 17:05:33 +0530 |
Pulkit Goyal |
py3: use "%d" to convert integers to bytes
|
| Sun, 11 Feb 2018 18:34:22 -0800 |
Gregory Szorc |
py3: port string formatting
|
| Sat, 10 Feb 2018 19:33:19 +0100 |
Denis Laxalde |
rebase: make "successors" a set in _computeobsoletenotrebased()
|
| Fri, 09 Feb 2018 22:49:20 +0100 |
Denis Laxalde |
rebase: do not consider extincts for divergence detection (issue5782)
|
| Fri, 09 Feb 2018 21:45:16 +0100 |
Denis Laxalde |
rebase: eliminate node from successors early in _computeobsoletenotrebased()
|
| Mon, 05 Feb 2018 13:12:01 +0530 |
Pulkit Goyal |
py3: use pycompat.strkwargs() to convert kwargs' key to str
|
| Mon, 05 Feb 2018 13:01:35 +0530 |
Pulkit Goyal |
py3: use "%d" to convert integer to bytes
|
| Wed, 27 Dec 2017 17:38:28 -0600 |
Phil Cohen |
rebase: don't run IMM if running rebase in a transaction
|
| Fri, 22 Dec 2017 13:13:45 -0600 |
Phil Cohen |
rebase: switch ui.log calls to common style
|
| Fri, 22 Dec 2017 00:44:36 -0600 |
Phil Cohen |
rebase: don't take out a dirstate guard for in-memory rebase
|
| Wed, 13 Dec 2017 10:29:22 -0800 |
Phil Cohen |
rebase: add ui.log calls for whether IMM used, whether rebasing WCP
|
| Tue, 12 Dec 2017 22:05:21 -0800 |
Phil Cohen |
rebase: fix for hgsubversion
|
| Mon, 11 Dec 2017 22:16:13 -0800 |
Phil Cohen |
rebase: replace --inmemory flag with rebase.experimental.inmemory config
|
| Sun, 10 Dec 2017 22:39:46 -0800 |
Phil Cohen |
tests: add a simple test for in-memory rebase
|
| Fri, 08 Dec 2017 12:44:27 -0800 |
Phil Cohen |
rebase: extract _assignworkingcopy
|
| Fri, 08 Dec 2017 15:27:58 -0800 |
Phil Cohen |
rebase: disable `inmemory` if the rebaseset contains the working copy
|
| Fri, 08 Dec 2017 12:14:38 -0800 |
Phil Cohen |
rebase: rerun a rebase on-disk if IMM merge conflicts arise
|
| Thu, 07 Dec 2017 22:35:43 -0800 |
Phil Cohen |
rebase: add concludememorynode(), and call it when rebasing in-memory
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass the wctx object (IMM or on-disk) to merge.update
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: do not update if IMM; instead, set the overlaywctx's parents
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass wctx to rebasenode()
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebase: do not bail on uncomitted changes if rebasing in-memory
|
