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