| Fri, 09 Feb 2018 22:49:20 +0100 |
Denis Laxalde |
rebase: do not consider extincts for divergence detection (issue5782)
|
file |
diff |
annotate
|
| Fri, 09 Feb 2018 21:45:16 +0100 |
Denis Laxalde |
rebase: eliminate node from successors early in _computeobsoletenotrebased()
|
file |
diff |
annotate
|
| Mon, 05 Feb 2018 13:12:01 +0530 |
Pulkit Goyal |
py3: use pycompat.strkwargs() to convert kwargs' key to str
|
file |
diff |
annotate
|
| Mon, 05 Feb 2018 13:01:35 +0530 |
Pulkit Goyal |
py3: use "%d" to convert integer to bytes
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 17:38:28 -0600 |
Phil Cohen |
rebase: don't run IMM if running rebase in a transaction
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 13:13:45 -0600 |
Phil Cohen |
rebase: switch ui.log calls to common style
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 00:44:36 -0600 |
Phil Cohen |
rebase: don't take out a dirstate guard for in-memory rebase
|
file |
diff |
annotate
|
| Wed, 13 Dec 2017 10:29:22 -0800 |
Phil Cohen |
rebase: add ui.log calls for whether IMM used, whether rebasing WCP
|
file |
diff |
annotate
|
| Tue, 12 Dec 2017 22:05:21 -0800 |
Phil Cohen |
rebase: fix for hgsubversion
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 22:16:13 -0800 |
Phil Cohen |
rebase: replace --inmemory flag with rebase.experimental.inmemory config
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:39:46 -0800 |
Phil Cohen |
tests: add a simple test for in-memory rebase
|
file |
diff |
annotate
|
| Fri, 08 Dec 2017 12:44:27 -0800 |
Phil Cohen |
rebase: extract _assignworkingcopy
|
file |
diff |
annotate
|
| Fri, 08 Dec 2017 15:27:58 -0800 |
Phil Cohen |
rebase: disable `inmemory` if the rebaseset contains the working copy
|
file |
diff |
annotate
|
| Fri, 08 Dec 2017 12:14:38 -0800 |
Phil Cohen |
rebase: rerun a rebase on-disk if IMM merge conflicts arise
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 22:35:43 -0800 |
Phil Cohen |
rebase: add concludememorynode(), and call it when rebasing in-memory
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass the wctx object (IMM or on-disk) to merge.update
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: do not update if IMM; instead, set the overlaywctx's parents
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass wctx to rebasenode()
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebase: do not bail on uncomitted changes if rebasing in-memory
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 13:25:23 -0800 |
Phil Cohen |
rebase: add the --inmemory option flag; assign a wctx object for the rebase
|
file |
diff |
annotate
|
| Fri, 13 Oct 2017 14:08:14 -0700 |
Jun Wu |
rebase: enable multidest by default
|
file |
diff |
annotate
|
| Sat, 28 Oct 2017 17:50:25 +0530 |
Pulkit Goyal |
rebase: use fm.formatlist() and fm.formatdict() to support user template
|
file |
diff |
annotate
|
| Tue, 14 Nov 2017 22:46:10 +0100 |
Denis Laxalde |
rebase: exclude descendants of obsoletes w/o a successor in dest (issue5300)
|
file |
diff |
annotate
|
| Mon, 23 Oct 2017 00:04:47 +0530 |
Pulkit Goyal |
py3: handle keyword arguments in hgext/rebase.py
|
file |
diff |
annotate
|
| Sat, 21 Oct 2017 17:01:20 +0900 |
Yuya Nishihara |
rebase: drop --style option
|
file |
diff |
annotate
|
| Wed, 18 Oct 2017 04:31:46 +0530 |
Pulkit Goyal |
rebase: add support to output nodechanges
|
file |
diff |
annotate
|
| Tue, 17 Oct 2017 16:54:31 +0200 |
Boris Feld |
config: gather allowdivergence under the evolution namespace
|
file |
diff |
annotate
|
| Fri, 13 Oct 2017 23:00:31 +0200 |
Boris Feld |
configitems: move rebase config into core
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
context: add workingfilectx.markcopied
|
file |
diff |
annotate
|
| Wed, 11 Oct 2017 04:57:54 +0200 |
Boris Feld |
configitems: register the 'rebase.singletransaction' config
|
file |
diff |
annotate
|
| Fri, 30 Jun 2017 03:32:25 +0200 |
Boris Feld |
configitems: register the 'commands.rebase.requiredest' config
|
file |
diff |
annotate
|
| Fri, 30 Jun 2017 03:42:06 +0200 |
Boris Feld |
configitems: register the 'experimental.rebaseskipobsolete' config
|
file |
diff |
annotate
|
| Sat, 30 Sep 2017 07:52:48 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Mon, 18 Sep 2017 10:54:00 -0700 |
Jun Wu |
rebase: move bookmarks with --keep (issue5682)
stable 4.3.3
|
file |
diff |
annotate
|
| Tue, 19 Sep 2017 22:06:26 -0700 |
Martin von Zweigbergk |
rebase: also include other namespaces in changeset description
|
file |
diff |
annotate
|
| Wed, 06 Sep 2017 16:17:04 -0700 |
Jun Wu |
rebase: remove unnecessary '.unfiltered()' calls
|
file |
diff |
annotate
|
| Wed, 06 Sep 2017 16:13:04 -0700 |
Jun Wu |
rebase: remove complex unhiding code
|
file |
diff |
annotate
|
| Wed, 06 Sep 2017 15:23:19 -0700 |
Jun Wu |
rebase: use unfiltered repo when loading state
|
file |
diff |
annotate
|
| Wed, 06 Sep 2017 12:40:00 -0700 |
Jun Wu |
rebase: do not crash rebasing merge with a parent having hidden successor
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:51:54 -0700 |
Jun Wu |
rebase: use _ctxdesc in one more place
|
file |
diff |
annotate
|
| Sun, 27 Aug 2017 02:47:47 -0700 |
Jun Wu |
rebase: move working parent and bookmark for obsoleted revs (BC)
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:49:13 -0700 |
Jun Wu |
rebase: remove an unnecessary adjustdest in clearrebased
|
file |
diff |
annotate
|
| Mon, 21 Aug 2017 20:22:07 -0700 |
Jun Wu |
rebase: sort destmap topologically
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:27:37 -0700 |
Jun Wu |
rebase: initial support for multiple destinations
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 00:32:19 -0700 |
Jun Wu |
rebase: change internal format to support destination map
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 00:31:52 -0700 |
Jun Wu |
rebase: rewrite _computeobsoletenotrebased
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:34:11 -0700 |
Jun Wu |
rebase: only change self.state when collapsing in _finishrebase
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 22:17:15 -0700 |
Jun Wu |
rebase: choose merge base without unwanted revisions
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:08:07 -0700 |
Jun Wu |
rebase: optimize "source" calculation in adjustdest
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:36:59 -0700 |
Jun Wu |
rebase: remove "state >= revtodo" condition
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:05:47 -0700 |
Jun Wu |
rebase: remove self.destancestors
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 09:01:45 -0700 |
Jun Wu |
rebase: remove rebaseset from _checkobsrebase
|
file |
diff |
annotate
|
| Mon, 10 Jul 2017 12:18:32 -0700 |
Jun Wu |
rebase: remove revignored and nullmerge states
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove messages for nullmerge and revignored (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove revprecursor and revpruned states (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:14:33 -0700 |
Jun Wu |
rebase: move obsoleted not rebased messages earlier (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:05:52 -0700 |
Jun Wu |
rebase: extract ctx description logic to a function
|
file |
diff |
annotate
|
| Sat, 12 Aug 2017 21:01:06 -0700 |
Jun Wu |
rebase: change "result would have 3 parent" error message (BC)
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 21:30:31 -0700 |
Jun Wu |
rebase: rewrite core algorithm (issue5578) (issue5630)
|
file |
diff |
annotate
|