Mercurial > hg

log hgext/rebase.py @ 51676:031d66801d5f

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, 27 Mar 2024 17:29:48 +0000 Pierre-Yves David postincoming: move to cmdutil
Thu, 25 May 2023 00:23:05 +0200 Pierre-Yves David rewrite: simplify the `retained_extras` extra logic
Fri, 14 Apr 2023 10:41:40 +0200 Raphaël Gomès branching: merge stable into default
Tue, 21 Mar 2023 20:47:30 -0400 Jason R. Coombs extras: re-use Projection from jaraco.collections
Tue, 21 Mar 2023 17:21:45 -0400 Jason R. Coombs extras: expose 'retained_extras' for extensions to extend
Tue, 21 Mar 2023 17:17:09 -0400 Jason R. Coombs extras: extract function for projecting names from a gettable object
Thu, 13 Apr 2023 04:12:31 +0200 Pierre-Yves David rebase: do not cleanup the working copy when --dry-run is used (issue6802) stable
Thu, 02 Mar 2023 14:44:33 +0100 Pierre-Yves David branch: pass current transaction when writing branch in rebase
Mon, 20 Feb 2023 12:06:03 +0100 Pierre-Yves David rebase: scope parent change into a changing_parents context
Tue, 14 Feb 2023 00:39:49 +0100 Pierre-Yves David dirstate-guard: replace a usage in `rebase` with a transaction
Tue, 14 Feb 2023 00:31:41 +0100 Pierre-Yves David dirstate-guard: remove usage in `rebase`
Wed, 20 Apr 2022 19:24:39 +0200 C. Masloch rebase: add boolean config item rebase.store-source
Tue, 31 May 2022 22:50:01 +0200 Manuel Jacob py3: catch FileNotFoundError instead of checking errno == ENOENT
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object):
Tue, 01 Mar 2022 20:52:32 -0800 Gregory Szorc py3: replace pycompat.itervalues(x) with x.values()
Thu, 03 Mar 2022 18:28:30 -0800 Gregory Szorc global: bulk replace simple pycompat.iteritems(x) with x.items()
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Tue, 18 Jan 2022 14:57:15 -0800 Martin von Zweigbergk rebase: set custom conflict label for base commit
Tue, 28 Sep 2021 15:11:22 -0700 Martin von Zweigbergk errors: raise InputError from revsingle() iff revset provided by the user
Tue, 28 Sep 2021 08:47:11 -0700 Martin von Zweigbergk errors: raise InputError on bad revset to revrange() iff provided by the user
Wed, 28 Jul 2021 13:45:41 +0300 Anton Shestakov rebase: use obsolete.isenabled() to check for experimental.allowdivergence
Mon, 21 Jun 2021 10:01:55 -0700 Martin von Zweigbergk rebase: use str-keyed opts in remaining places
Mon, 21 Jun 2021 09:54:36 -0700 Martin von Zweigbergk rebase: keep str-keyed opts long enough to make `action` a str
Tue, 23 Feb 2021 10:28:42 -0800 Martin von Zweigbergk rewriteutil: check for divergence
Thu, 25 Mar 2021 11:35:16 -0700 Martin von Zweigbergk rebase: when using --keep, don't care about pruned commits or divergence
Thu, 25 Mar 2021 08:38:16 -0700 Martin von Zweigbergk rebase: remove duplicate initialization of a field
Tue, 23 Mar 2021 22:48:27 -0700 Martin von Zweigbergk rebase: don't call rewriteutil.precheck() with to-be-skipped commits
Tue, 23 Mar 2021 14:15:40 -0700 Martin von Zweigbergk reabase: call rewriteutil.precheck() a bit later
Tue, 23 Mar 2021 14:49:31 -0700 Martin von Zweigbergk rebase: set `prepared = True` at very end of `_preparenewrebase()`
Fri, 19 Mar 2021 22:52:59 -0700 Martin von Zweigbergk rebase: filter out descendants of divergence-causing commits earlier
Fri, 19 Mar 2021 10:34:16 -0700 Martin von Zweigbergk rebase: clarify names of variables and function related to obsolete revisions
Fri, 12 Feb 2021 16:05:02 -0800 Martin von Zweigbergk rebase: calculate obsolescense-related info earlier
Fri, 12 Feb 2021 16:19:33 -0800 Martin von Zweigbergk rebase: let _handleskippingobsolete(self) read directly from self
Fri, 19 Mar 2021 12:08:46 -0700 Martin von Zweigbergk rebase: skip obsolete commits even if they have pruned successors
Fri, 12 Feb 2021 16:13:34 -0800 Martin von Zweigbergk rebase: inline simple function for finding obsolete subset of commits
Fri, 29 Jan 2021 16:33:12 -0800 Martin von Zweigbergk errors: use more specific errors in rebase extension
Thu, 28 May 2020 17:31:41 -0400 Augie Fackler rebase: add a config knob for forcing in-memory rebasing
Sat, 26 Dec 2020 18:26:32 +0530 Sushil khanchi rebase: handle the case when nothing to rebase (dry-run)
Tue, 01 Dec 2020 21:54:46 +0100 Joerg Sonnenberger node: import symbols explicitly
Thu, 03 Dec 2020 14:15:39 -0500 Augie Fackler merge with stable
Wed, 02 Dec 2020 15:39:01 -0800 Martin von Zweigbergk rebase: clear merge state when aborting in-memory merge on dirty working copy stable 5.6.1
Wed, 02 Dec 2020 15:39:01 -0800 Martin von Zweigbergk rebase: clear merge state when aborting in-memory merge on dirty working copy
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Tue, 13 Oct 2020 14:16:21 -0400 Matt Harbison rebase: update commit hash references in the new commits
Tue, 27 Oct 2020 15:33:15 -0700 Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary
Thu, 22 Oct 2020 23:10:06 -0700 Martin von Zweigbergk rebase: make summary template configurable, with default to shared template
Thu, 22 Oct 2020 22:29:22 -0700 Martin von Zweigbergk rebase: use hard-coded template for one-line commit description
Mon, 21 Sep 2020 11:53:44 -0700 Martin von Zweigbergk merge: replace calls to hg.updaterepo() by merge.update()
Mon, 21 Sep 2020 09:57:29 -0700 Martin von Zweigbergk merge: add a higher-level update() for the common `hg update` use case
Mon, 21 Sep 2020 11:12:58 -0700 Martin von Zweigbergk merge: make low-level update() private (API)
Mon, 21 Sep 2020 10:09:39 -0700 Martin von Zweigbergk merge: use merge.clean_update() when applicable
Fri, 18 Sep 2020 15:03:06 -0700 Martin von Zweigbergk rebase: teach in-memory rebase to not restart with on-disk rebase on conflict
Wed, 23 Sep 2020 09:04:32 -0700 Martin von Zweigbergk rebase: move check for unresolved conflicts into lower-level rebasenode()
Fri, 18 Sep 2020 15:40:26 -0700 Martin von Zweigbergk rebase: add dryrun property to rebaseruntime
Wed, 23 Sep 2020 09:21:26 -0700 Martin von Zweigbergk rebase: when collapsing, p1 == dest, so use the former only
Fri, 18 Sep 2020 15:37:03 -0700 Martin von Zweigbergk rebase: remove redundant isinmemory argument from _origrebase()
Fri, 18 Sep 2020 15:10:14 -0700 Martin von Zweigbergk rebase: stop clearing on-disk mergestate when running in memory
Fri, 18 Sep 2020 10:15:13 -0700 Martin von Zweigbergk rebase: delete unused p1 argument to _concludenode()
Fri, 18 Sep 2020 10:04:02 -0700 Martin von Zweigbergk rebase: fix an inconsistent hyphenation in a debug message
Tue, 28 Jul 2020 20:47:50 +0200 Manuel Jacob rebase: fix regression in file change detection introduced by 0ecb3b11fcad stable
Tue, 14 Jul 2020 13:35:54 -0700 Daniel Ploch error: normalize "unresolved conflicts" error messages with a custom class
Mon, 13 Jul 2020 16:42:44 -0700 Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'
Mon, 01 Jun 2020 08:38:42 +0200 Manuel Jacob rebase: consider rewrite.empty-successor configuration
Sat, 11 Jul 2020 03:10:23 +0200 Manuel Jacob rebase: correctly check for empty commit in in-memory mode
Sat, 11 Jul 2020 00:53:34 +0200 Manuel Jacob overlayworkingctx: rename misleadingly named `isempty()` method
Thu, 09 Jul 2020 07:00:32 +0200 Manuel Jacob rebase: remove now unnecessary logic to allow empty commit when branch changes
Mon, 15 Jun 2020 12:00:15 -0400 Augie Fackler merge with stable
Thu, 30 Apr 2020 00:33:00 -0400 Matt Harbison rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291) stable
Mon, 18 May 2020 14:59:59 -0400 Augie Fackler mergestate: split out merge state handling code from main merge module
Wed, 01 Apr 2020 14:34:21 -0700 Martin von Zweigbergk rebase: don't create merge when continuing rebase interrupted by old hg
Fri, 13 Mar 2020 16:57:38 -0700 Martin von Zweigbergk rebase: accept multiple --base arguments (BC)
Fri, 13 Mar 2020 16:39:32 -0700 Martin von Zweigbergk rebase: accept multiple --source arguments (BC)
Fri, 13 Mar 2020 19:29:02 -0700 Martin von Zweigbergk rebase: mention -r argument in synopsis
Fri, 13 Mar 2020 16:36:31 -0700 Martin von Zweigbergk rebase: remove unused defaults argument values from _definedestmap()
Fri, 06 Mar 2020 13:27:41 -0500 Augie Fackler cleanup: run pyupgrade on our source tree to clean up varying things
Fri, 28 Feb 2020 11:32:27 -0800 Martin von Zweigbergk cleanup: remove redundant clearing of mergestate in rebase and shelve
Fri, 10 Jan 2020 17:20:12 -0800 Martin von Zweigbergk rebase: remove some now-unused parent arguments
Fri, 10 Jan 2020 21:40:01 -0800 Martin von Zweigbergk rebase: remove some redundant setting of dirstate parents
Fri, 10 Jan 2020 14:22:20 -0800 Martin von Zweigbergk rebase: don't use rebased node as dirstate p2 (BC)
Fri, 10 Jan 2020 14:17:56 -0800 Martin von Zweigbergk rebase: stop relying on having two parents to resume rebase
Thu, 16 Jan 2020 00:03:19 -0800 Martin von Zweigbergk rebase: always be graft-like, not merge-like, also for merges
Wed, 15 Jan 2020 15:30:25 -0800 Martin von Zweigbergk merge: introduce a clean_update() for that use-case
Fri, 31 Jan 2020 10:53:50 -0800 Martin von Zweigbergk rebase: abort if the user tries to rebase the working copy
Wed, 15 Jan 2020 22:24:16 -0800 Martin von Zweigbergk rebase: define base in only place in defineparents()
Mon, 27 Jan 2020 09:14:19 -0800 Martin von Zweigbergk cmdutil: change check_incompatible_arguments() *arg to single iterable
Wed, 15 Jan 2020 17:15:45 -0800 Martin von Zweigbergk rebase: move some variables after an error cases where they're not needed
Wed, 15 Jan 2020 10:44:23 -0800 Martin von Zweigbergk rebase: clarify a little by calculating a set in Python instead of in revset
Mon, 13 Jan 2020 11:18:29 -0800 Martin von Zweigbergk rebase: fix bug where `--collapse` would apply diff on missing file
Mon, 13 Jan 2020 11:11:20 -0800 Martin von Zweigbergk rebase: extract a variable for a repeated `repo[p1]`
Fri, 27 Dec 2019 13:47:59 -0800 Martin von Zweigbergk graftcopies: remove `skip` and `repo` arguments
Mon, 06 Jan 2020 15:24:36 -0800 Martin von Zweigbergk copies: replace duplicatecopies() by function that takes contexts
Fri, 10 Jan 2020 15:47:39 -0800 Martin von Zweigbergk rebase: delete seemingly unnecessary needupdate()
Fri, 10 Jan 2020 21:41:28 -0800 Martin von Zweigbergk overlayworkginctx: implement a setparents() to mirror dirstate.setparents()
Fri, 10 Jan 2020 17:03:23 -0800 Martin von Zweigbergk overlayworkingctx: default branch to base context's branch
Fri, 27 Dec 2019 13:52:39 -0500 Matt Harbison rebase: drop an unused variable assignment
Wed, 18 Dec 2019 10:55:06 -0800 Martin von Zweigbergk rebase: restore i18n of a hint message
Wed, 18 Dec 2019 09:18:02 +0300 Martin von Zweigbergk rebase: use rewriteutil.precheck() instead of reimplementing it
Thu, 12 Dec 2019 23:25:16 -0800 Martin von Zweigbergk rebase: inline single-use variables passed to _definedestmap()
Thu, 12 Dec 2019 23:20:48 -0800 Martin von Zweigbergk rebase: use cmdutil.check_at_most_one_arg() for action+revision
Thu, 12 Dec 2019 23:03:52 -0800 Martin von Zweigbergk rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans
Thu, 12 Dec 2019 22:43:15 -0800 Martin von Zweigbergk rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r
Thu, 12 Dec 2019 23:11:33 -0800 Martin von Zweigbergk rebase: inline single-use `dryrun` and `confirm` variables
Fri, 13 Dec 2019 14:50:42 -0800 Martin von Zweigbergk rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
Fri, 13 Dec 2019 14:49:48 -0800 Martin von Zweigbergk rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run
Thu, 12 Dec 2019 15:55:33 -0800 Martin von Zweigbergk rebase: use cmdutil.check_at_most_one_arg() for action
Fri, 13 Dec 2019 15:46:25 -0800 Kyle Lippincott rebase: make rebase not crash if p1 == p2 != nullid
Sun, 01 Dec 2019 18:46:10 -0500 Matt Harbison cleanup: fix docstring formatting
Wed, 06 Nov 2019 18:28:11 -0800 Kyle Lippincott rebase: check for unfinished ops even when inmemory (issue6214)
Sat, 09 Nov 2019 13:23:54 +0100 Pierre-Yves David index: use `index.get_rev` in `rebase._computeobsoletenotrebased`
Sat, 09 Nov 2019 13:23:53 +0100 Pierre-Yves David index: use `index.get_rev` in `rebase.successorrevs`
Fri, 08 Nov 2019 11:19:20 -0800 Augie Fackler cleanup: remove pointless r-prefixes on single-quoted strings
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
Sun, 06 Oct 2019 19:25:18 -0400 Gregory Szorc py3: define and use pycompat.iteritems() for hgext/
Sun, 06 Oct 2019 17:59:15 -0400 Gregory Szorc py3: define and use pycompat.itervalues()
Sun, 06 Oct 2019 13:28:56 -0400 Gregory Szorc py3: manually import pycompat.open into files that need it
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Wed, 25 Sep 2019 10:59:29 -0400 Paul Gossman rebase: track new nodes when --keep is set
Tue, 16 Jul 2019 01:59:28 +0530 Taapas Agrawal continue: added support for rebase
less more | (0) -120 tip