Mercurial > hg

log hgext/rebase.py @ 35724:853bf7d90804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -60 tip
age author description
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
Thu, 07 Dec 2017 13:25:23 -0800 Phil Cohen rebase: add the --inmemory option flag; assign a wctx object for the rebase
Fri, 13 Oct 2017 14:08:14 -0700 Jun Wu rebase: enable multidest by default
Sat, 28 Oct 2017 17:50:25 +0530 Pulkit Goyal rebase: use fm.formatlist() and fm.formatdict() to support user template
Tue, 14 Nov 2017 22:46:10 +0100 Denis Laxalde rebase: exclude descendants of obsoletes w/o a successor in dest (issue5300)
Mon, 23 Oct 2017 00:04:47 +0530 Pulkit Goyal py3: handle keyword arguments in hgext/rebase.py
Sat, 21 Oct 2017 17:01:20 +0900 Yuya Nishihara rebase: drop --style option
Wed, 18 Oct 2017 04:31:46 +0530 Pulkit Goyal rebase: add support to output nodechanges
Tue, 17 Oct 2017 16:54:31 +0200 Boris Feld config: gather allowdivergence under the evolution namespace
Fri, 13 Oct 2017 23:00:31 +0200 Boris Feld configitems: move rebase config into core
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen context: add workingfilectx.markcopied
Wed, 11 Oct 2017 04:57:54 +0200 Boris Feld configitems: register the 'rebase.singletransaction' config
Fri, 30 Jun 2017 03:32:25 +0200 Boris Feld configitems: register the 'commands.rebase.requiredest' config
Fri, 30 Jun 2017 03:42:06 +0200 Boris Feld configitems: register the 'experimental.rebaseskipobsolete' config
Sat, 30 Sep 2017 07:52:48 -0700 Martin von Zweigbergk merge with stable
Mon, 18 Sep 2017 10:54:00 -0700 Jun Wu rebase: move bookmarks with --keep (issue5682) stable 4.3.3
Tue, 19 Sep 2017 22:06:26 -0700 Martin von Zweigbergk rebase: also include other namespaces in changeset description
Wed, 06 Sep 2017 16:17:04 -0700 Jun Wu rebase: remove unnecessary '.unfiltered()' calls
Wed, 06 Sep 2017 16:13:04 -0700 Jun Wu rebase: remove complex unhiding code
Wed, 06 Sep 2017 15:23:19 -0700 Jun Wu rebase: use unfiltered repo when loading state
Wed, 06 Sep 2017 12:40:00 -0700 Jun Wu rebase: do not crash rebasing merge with a parent having hidden successor
Tue, 29 Aug 2017 17:51:54 -0700 Jun Wu rebase: use _ctxdesc in one more place
Sun, 27 Aug 2017 02:47:47 -0700 Jun Wu rebase: move working parent and bookmark for obsoleted revs (BC)
Tue, 29 Aug 2017 17:49:13 -0700 Jun Wu rebase: remove an unnecessary adjustdest in clearrebased
Mon, 21 Aug 2017 20:22:07 -0700 Jun Wu rebase: sort destmap topologically
Tue, 29 Aug 2017 17:27:37 -0700 Jun Wu rebase: initial support for multiple destinations
Fri, 11 Aug 2017 00:32:19 -0700 Jun Wu rebase: change internal format to support destination map
Fri, 11 Aug 2017 00:31:52 -0700 Jun Wu rebase: rewrite _computeobsoletenotrebased
Fri, 11 Aug 2017 01:34:11 -0700 Jun Wu rebase: only change self.state when collapsing in _finishrebase
Thu, 10 Aug 2017 22:17:15 -0700 Jun Wu rebase: choose merge base without unwanted revisions
Fri, 11 Aug 2017 01:08:07 -0700 Jun Wu rebase: optimize "source" calculation in adjustdest
Fri, 11 Aug 2017 01:36:59 -0700 Jun Wu rebase: remove "state >= revtodo" condition
Fri, 11 Aug 2017 01:05:47 -0700 Jun Wu rebase: remove self.destancestors
Fri, 14 Jul 2017 09:01:45 -0700 Jun Wu rebase: remove rebaseset from _checkobsrebase
Mon, 10 Jul 2017 12:18:32 -0700 Jun Wu rebase: remove revignored and nullmerge states
Sat, 08 Jul 2017 20:38:34 -0700 Jun Wu rebase: remove messages for nullmerge and revignored (BC)
Sat, 08 Jul 2017 20:38:34 -0700 Jun Wu rebase: remove revprecursor and revpruned states (BC)
Sat, 08 Jul 2017 20:14:33 -0700 Jun Wu rebase: move obsoleted not rebased messages earlier (BC)
Sat, 08 Jul 2017 20:05:52 -0700 Jun Wu rebase: extract ctx description logic to a function
Sat, 12 Aug 2017 21:01:06 -0700 Jun Wu rebase: change "result would have 3 parent" error message (BC)
Thu, 10 Aug 2017 21:30:31 -0700 Jun Wu rebase: rewrite core algorithm (issue5578) (issue5630)
Thu, 10 Aug 2017 14:23:41 -0400 Augie Fackler merge with stable
Wed, 02 Aug 2017 21:52:22 +0900 Yuya Nishihara rebase: sort collapsed revisions in commit message (issue5643) stable
Thu, 20 Jul 2017 01:30:41 -0700 Durham Goode rebase: use one dirstateguard for when using rebase.singletransaction
Mon, 24 Jul 2017 23:52:56 -0700 Jun Wu rebase: move bookmark to destination for commits becoming empty (issue5627) stable
less more | (0) -300 -100 -60 tip