| 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()
|
