Mercurial > hg

log hgext/rebase.py @ 36681:340e4b711df7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
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
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
Tue, 18 Jul 2017 07:47:28 -0700 Durham Goode rebase: add config to move rebase into a single transaction
Fri, 07 Jul 2017 19:03:03 -0700 Jun Wu rebase: remove "if True"
Fri, 07 Jul 2017 18:51:46 -0700 Jun Wu rebase: use scmutil.cleanupnodes (issue5606) (BC)
Wed, 28 Jun 2017 14:53:54 -0700 Martin von Zweigbergk rebase: always pass destination as revnum to _handleskippingobsolete()
Tue, 27 Jun 2017 01:36:20 +0200 Pierre-Yves David obsutil: move 'allsuccessors' to the new modules
Thu, 29 Jun 2017 15:21:52 -0700 Martin von Zweigbergk merge with stable
Tue, 27 Jun 2017 17:40:24 +0200 Pierre-Yves David rebase: backed out changeset cf8ad0e6c0e4 (issue5610) stable
Tue, 27 Jun 2017 17:39:55 +0200 Pierre-Yves David rebase: backed out changeset 2519994d25ca stable
Sat, 24 Jun 2017 21:13:48 -0700 Jun Wu rebase: clean up rebasestate from active transaction
Mon, 19 Jun 2017 11:18:12 -0700 Martin von Zweigbergk rebase: use context manager for locking in pullrebase()
Mon, 19 Jun 2017 11:18:05 -0700 Martin von Zweigbergk rebase: use context manager for locking in rebase()
Sat, 17 Jun 2017 23:09:47 -0700 Martin von Zweigbergk rebase: rewrite "x in y.children()" as "y in x.parents()"
Wed, 31 May 2017 19:46:04 -0700 Siddharth Agarwal rebase: drop unnecessary parentchange call
Sat, 27 May 2017 21:08:51 -0700 Martin von Zweigbergk hidden: rename "revealedrevs" to "pinnedrevs" (API)
Sat, 20 May 2017 19:43:58 +0200 Pierre-Yves David repoview: rename '_getdynamicblockers' to 'revealedrevs' (API)
Sun, 14 May 2017 16:19:47 +0900 Yuya Nishihara commands: move templates of common command options to cmdutil (API)
Thu, 18 May 2017 17:11:01 -0400 Augie Fackler rebase: migrate to context manager for changing dirstate parents
Sat, 09 Jan 2016 23:07:20 +0900 Yuya Nishihara registrar: move cmdutil.command to registrar module (API)
Tue, 09 May 2017 16:29:31 -0700 Durham Goode obsolete: add operation metadata to rebase/amend/histedit obsmarkers
Thu, 18 May 2017 13:18:05 -0700 Jeremy Fitzhardinge rebase: make sure merge state is cleaned up for no-op rebases (issue5494)
Fri, 10 Feb 2017 16:56:29 -0800 Martin von Zweigbergk cleanup: use set literals
Thu, 11 May 2017 11:37:18 -0700 Martin von Zweigbergk rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
Thu, 11 May 2017 22:38:15 -0700 Martin von Zweigbergk rebase: rename "target" to "destination" in messages
Thu, 11 May 2017 22:38:03 -0700 Martin von Zweigbergk rebase: rename "target" to "dest" in variable names
Sat, 11 Mar 2017 12:25:56 -0800 Martin von Zweigbergk rebase: don't update state dict same way for each root
Mon, 01 May 2017 05:52:32 +0900 FUJIWARA Katsunori help: apply bulk fixes for indentation and literal blocking issues stable
Mon, 01 May 2017 05:38:52 +0900 FUJIWARA Katsunori rebase: fix incorrect configuration example stable
Thu, 30 Mar 2017 03:50:10 -0700 Ryan McElroy rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514)
Thu, 30 Mar 2017 03:50:10 -0700 Ryan McElroy rebase: allow destination-free continue and abort (issue5513)
Fri, 24 Mar 2017 16:20:10 -0700 Martin von Zweigbergk rebase: don't require destination if commands.rebase.requiredest=False
Sun, 12 Mar 2017 12:33:35 -0700 Durham Goode rebase: move state serialization to use unfiltered repo
Tue, 21 Mar 2017 21:26:52 -0700 Martin von Zweigbergk plain: ignore [commands] config
Tue, 14 Mar 2017 17:43:44 -0700 Ryan McElroy rebase: add flag to require destination
Sun, 19 Mar 2017 11:54:15 -0700 Durham Goode rebase: use one dirstateguard for entire rebase
Thu, 16 Mar 2017 14:40:34 -0700 Jun Wu rebase: get rid of ui.backupconfig
Wed, 15 Mar 2017 15:03:43 -0700 Pierre-Yves David rebase: explicitly tests for None
Sun, 12 Mar 2017 21:56:39 -0700 Gregory Szorc rebase: don't use mutable default argument value
Sun, 12 Mar 2017 16:44:01 -0700 Mads Kiilerich rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
Sat, 11 Mar 2017 11:02:25 -0800 Mads Kiilerich vfs: use repo.vfs.unlinkpath
Sat, 11 Mar 2017 10:35:44 -0800 Martin von Zweigbergk rebase: abort if *any* commit in rebase set is public
Fri, 10 Mar 2017 23:07:20 -0800 Martin von Zweigbergk rebase: unhide original working directory node as well (issue5219)
Fri, 10 Mar 2017 23:06:31 -0800 Martin von Zweigbergk rebase: pass in a regular set to _setrebasesetvisibility()
Tue, 07 Mar 2017 16:27:32 -0800 Durham Goode rebase: move actual rebase into a single transaction
Tue, 07 Mar 2017 16:30:31 -0800 Durham Goode rebase: allow aborting if last-message.txt is missing
Tue, 07 Mar 2017 14:04:29 -0800 Durham Goode rebase: add storestatus support for transactions
Tue, 07 Mar 2017 14:11:44 -0800 Durham Goode rebase: move storestatus onto rebaseruntime
less more | (0) -120 tip