Mercurial > hg

log hgext/rebase.py @ 39279:cb9cf42c902f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
Fri, 17 Aug 2018 10:21:25 +0900 Yuya Nishihara rebase: do not pass in user option to rollback in-memory merge conflict
Thu, 16 Aug 2018 18:53:51 +0000 Gregory Szorc rebase: call _dorebase() properly
Wed, 15 Aug 2018 11:27:57 +0530 Sushil khanchi rebase: cover restorestatus() by lock to prevent it from being updated
Wed, 15 Aug 2018 10:57:47 +0900 Yuya Nishihara rebase: turn off inmemory flag on --stop
Wed, 15 Aug 2018 10:47:07 +0900 Yuya Nishihara rebase: use action variable to select things to do
Wed, 15 Aug 2018 10:41:26 +0900 Yuya Nishihara rebase: consolidate check for --dry-run/--confirm on abort/stop/continue
Wed, 15 Aug 2018 10:36:06 +0900 Yuya Nishihara rebase: consolidate check for --abort/--stop/--continue conflicts
Wed, 15 Aug 2018 10:32:10 +0900 Yuya Nishihara rebase: do not set internal dryrun flag by --confirm
Sun, 22 Jul 2018 22:08:14 +0530 Sushil khanchi rebase: include --stop option in documentation
Sun, 22 Jul 2018 22:04:49 +0530 Sushil khanchi rebase: raise error for options conflicting with --stop
Wed, 18 Jul 2018 00:25:52 +0530 Sushil khanchi rebase: add --stop option to stop rebase at any point (issue5206)
Fri, 03 Aug 2018 00:10:52 +0530 Sushil khanchi rebase: move "backup" flag to rebaseruntime
Thu, 05 Jul 2018 10:42:48 +0530 Sushil khanchi rebase: support "history-editing-backup" config option
Sun, 15 Jul 2018 15:48:18 +0530 Sushil khanchi rebase: remove unused variable "release" and an extra blank line
Sat, 14 Jul 2018 23:00:22 +0530 Sushil khanchi rebase: remove unnecessary confirm block
Sat, 14 Jul 2018 08:59:42 +0530 Sushil khanchi rebase: in --confirm option just abort if hit a conflict
Thu, 12 Jul 2018 22:35:54 +0530 Sushil khanchi rebase: correct misleading message in --confirm option
Thu, 12 Jul 2018 22:23:51 +0530 Sushil khanchi rebase: make sure we don't loose the return code in --confirm option
Wed, 11 Jul 2018 15:12:01 -0700 Martin von Zweigbergk rebase: use revnums (not nodes) for set of extinct revisions
Wed, 11 Jul 2018 15:01:47 -0700 Martin von Zweigbergk rebase: avoid converting from nodes to revnums twice
Wed, 11 Jul 2018 15:03:39 -0700 Martin von Zweigbergk rebase: reduce scope of a variable
Sat, 30 Jun 2018 12:42:49 +0530 Sushil khanchi rebase: add --confirm option
Wed, 11 Jul 2018 16:29:23 -0700 Martin von Zweigbergk revlog: introduce a isancestorrev() and use it in rebase
Fri, 29 Jun 2018 01:35:09 +0530 Sushil khanchi rebase: improve output of --dry-run
Sun, 01 Jul 2018 01:00:39 +0530 Pulkit Goyal rebase: check whether the rebasestate exists or not a bit early
Sun, 01 Jul 2018 00:52:25 +0530 Pulkit Goyal rebase: use staeobj to check whether interrupted rebase exists
Sun, 01 Jul 2018 00:46:59 +0530 Pulkit Goyal rebase: add a stateobj variable to rebaseruntime class
Sun, 01 Jul 2018 00:31:57 +0530 Pulkit Goyal rebase: refactor logic to read rebasestate in a separate function
Sun, 01 Jul 2018 21:40:55 +0900 Yuya Nishihara cleanup: pass in overwrite flag to hg.updaterepo() as named argument
Sat, 30 Jun 2018 11:33:05 +0900 Yuya Nishihara rebase: convert opts dict to bytes at once
Sat, 30 Jun 2018 11:29:48 +0900 Yuya Nishihara rebase: isolate command options from internal flags
Fri, 29 Jun 2018 01:05:08 +0530 Sushil khanchi rebase: suppress warning thrown when aborting rebase in case of dryrun
Fri, 29 Jun 2018 00:47:33 +0530 Sushil khanchi rebase: no need to store backup in case of dryrun
Fri, 29 Jun 2018 00:22:50 +0530 Sushil khanchi rebase: split _origrebase() for conveniece in dryrun
Thu, 28 Jun 2018 23:57:15 +0530 Sushil khanchi rebase: extract dryrun as a function
Thu, 28 Jun 2018 23:36:45 +0530 Sushil khanchi rebase: add lock to cover whole dryrun process
Thu, 28 Jun 2018 21:24:47 +0530 Pulkit Goyal py3: convert opts keys to bytes using pycompat.byteskwargs()
Wed, 27 Jun 2018 12:24:21 +0530 Sushil khanchi rebase: refactor dryrun implementation
Sat, 23 Jun 2018 08:59:18 +0530 Sushil khanchi rebase: make dry-run return 1 or 0 according to result
Sat, 16 Jun 2018 18:36:25 +0530 Sushil khanchi rebase: delete the comment which was not following "do not eat my data"
Sun, 17 Jun 2018 22:01:59 -0700 Martin von Zweigbergk rebase: use progress helper
Sat, 16 Jun 2018 08:22:10 +0530 Sushil khanchi rebase: add dry-run functionality
Wed, 06 Jun 2018 13:31:24 -0400 Augie Fackler merge with stable
Tue, 05 Jun 2018 23:49:54 -0400 Matt Harbison rebase: avoid RevlogError when computing obsoletenotrebased (issue5907) stable
Sat, 19 May 2018 21:47:59 +0530 Pulkit Goyal py3: use pycompat.bytestr() to convert str into bytes
Sat, 19 May 2018 21:46:54 +0530 Pulkit Goyal py3: fix kwargs handling in hgext/rebase.py
Sun, 04 Mar 2018 15:29:41 -0500 Augie Fackler rebase: introduce support for automatically rebasing orphan changes
Thu, 05 Apr 2018 11:01:42 -0700 Martin von Zweigbergk rebase: remove unnecessary and incorrect handling of nullid
Thu, 05 Apr 2018 10:13:45 -0700 Martin von Zweigbergk rebase: convert "oldrev" to revnum earlier
Thu, 05 Apr 2018 10:12:10 -0700 Martin von Zweigbergk rebase: make "destnode" consistently a revnum and rename it to "destrev"
Wed, 04 Apr 2018 10:32:48 -0700 Martin von Zweigbergk rebase: use single transaction when running in memory
Mon, 05 Mar 2018 00:30:00 -0500 Gregory Szorc merge: deprecate accessing update results by index
Wed, 21 Mar 2018 09:56:41 -0700 Martin von Zweigbergk rebase: rename conclude[memory]node() to commit[memory]node()
Tue, 20 Mar 2018 22:11:10 -0700 Martin von Zweigbergk rebase: pass in "user" instead of "ctx" to conclude[memory]node()
Tue, 20 Mar 2018 21:59:04 -0700 Martin von Zweigbergk rebase: look up default date outside of conclude[memory]node()
Tue, 20 Mar 2018 21:58:32 -0700 Martin von Zweigbergk rebase: move config override out of conclude[memory]node()
Tue, 20 Mar 2018 21:53:36 -0700 Martin von Zweigbergk rebase: pass in entire "overrides" dict to conclude[memory]node()
Tue, 20 Mar 2018 21:49:09 -0700 Martin von Zweigbergk rebase: pass in "keepbranch" to conclude[memory]node()
Tue, 20 Mar 2018 21:45:48 -0700 Martin von Zweigbergk rebase: inline _makextrafn() now that we have only one caller
Tue, 20 Mar 2018 21:41:53 -0700 Martin von Zweigbergk rebase: pass in "extra" itself into conclude[memory]node()
Wed, 21 Mar 2018 11:05:32 -0700 Martin von Zweigbergk rebase: look up commit message to reuse outside of conclude[memory]node()
Wed, 21 Mar 2018 11:04:13 -0700 Martin von Zweigbergk rebase: pass in ctx, not rev, to conclude[memory]node()
Wed, 21 Mar 2018 11:03:31 -0700 Martin von Zweigbergk rebase: extract common _concludenode()
Wed, 21 Mar 2018 11:01:19 -0700 Martin von Zweigbergk rebase: store rebase state after each commit
Wed, 21 Mar 2018 10:46:00 -0700 Martin von Zweigbergk rebase: register status file generator only once when using single transaction
Tue, 20 Mar 2018 17:25:16 -0700 Martin von Zweigbergk rebase: remove unused default argument values from conclude[memory]node()
Tue, 20 Mar 2018 17:30:08 -0700 Martin von Zweigbergk rebase: get "inmemory" state directly from rebase runtime
Tue, 20 Mar 2018 13:53:02 -0700 Martin von Zweigbergk rebase: pass "inmemory" directly to _definedestmap()
Mon, 19 Mar 2018 08:07:18 -0700 Martin von Zweigbergk merge with stable
Thu, 15 Mar 2018 22:35:07 -0700 Martin von Zweigbergk rebase: on abort, don't strip commits that didn't need rebased (issue5822) stable
Thu, 15 Mar 2018 21:40:51 -0700 Martin von Zweigbergk rebase: avoid defining two lists with the same contents stable
Thu, 15 Mar 2018 13:19:55 -0700 Martin von Zweigbergk rebase: allow in-memory merge of the working copy parent
Mon, 05 Mar 2018 00:18:07 -0500 Gregory Szorc commands: don't check for merge.update() truthiness
Sun, 04 Mar 2018 09:07:06 -0800 Martin von Zweigbergk rebase: move constant expressions out of inner loop in _performrebase()
Fri, 02 Mar 2018 15:38:20 -0800 Martin von Zweigbergk rebase: inline _performrebasesubset()
Mon, 12 Mar 2018 10:39:42 -0700 Martin von Zweigbergk rebase: extract function for rebasing a single node
Fri, 09 Mar 2018 12:48:00 -0800 Martin von Zweigbergk rebase: use configoverride context manager for ui.forcemerge
Fri, 09 Mar 2018 12:45:50 -0800 Martin von Zweigbergk rebase: also restore "ui.allowemptycommit" value
Thu, 08 Mar 2018 14:17:24 -0800 Martin von Zweigbergk rebase: fix issue 5494 also with --collapse
Fri, 09 Mar 2018 10:35:48 -0800 Martin von Zweigbergk rebase: also include commit of collapsed commits in single transaction
Tue, 06 Mar 2018 14:29:20 -0800 Martin von Zweigbergk rebase: only store collapse message once
Tue, 06 Mar 2018 09:39:24 -0800 Martin von Zweigbergk rebase: collapse two nested if-conditions
Thu, 01 Mar 2018 20:12:25 -0800 Martin von Zweigbergk rebase: reduce scope of "dsguard" variables a bit
Wed, 07 Mar 2018 09:46:53 -0800 Martin von Zweigbergk rebase: remove unused argument "state" from rebasenode()
Wed, 07 Mar 2018 10:31:01 -0800 Martin von Zweigbergk rebase: delete obsolete internal "keepopen" option
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
less more | (0) -120 tip