| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 10:09:39 -0700 |
Martin von Zweigbergk |
merge: use merge.clean_update() when applicable
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Wed, 23 Sep 2020 09:04:32 -0700 |
Martin von Zweigbergk |
rebase: move check for unresolved conflicts into lower-level rebasenode()
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 15:40:26 -0700 |
Martin von Zweigbergk |
rebase: add dryrun property to rebaseruntime
|
file |
diff |
annotate
|
| Wed, 23 Sep 2020 09:21:26 -0700 |
Martin von Zweigbergk |
rebase: when collapsing, p1 == dest, so use the former only
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 15:37:03 -0700 |
Martin von Zweigbergk |
rebase: remove redundant isinmemory argument from _origrebase()
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 15:10:14 -0700 |
Martin von Zweigbergk |
rebase: stop clearing on-disk mergestate when running in memory
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 10:15:13 -0700 |
Martin von Zweigbergk |
rebase: delete unused p1 argument to _concludenode()
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 10:04:02 -0700 |
Martin von Zweigbergk |
rebase: fix an inconsistent hyphenation in a debug message
|
file |
diff |
annotate
|
| Tue, 28 Jul 2020 20:47:50 +0200 |
Manuel Jacob |
rebase: fix regression in file change detection introduced by 0ecb3b11fcad
stable
|
file |
diff |
annotate
|
| Tue, 14 Jul 2020 13:35:54 -0700 |
Daniel Ploch |
error: normalize "unresolved conflicts" error messages with a custom class
|
file |
diff |
annotate
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
file |
diff |
annotate
|
| Mon, 01 Jun 2020 08:38:42 +0200 |
Manuel Jacob |
rebase: consider rewrite.empty-successor configuration
|
file |
diff |
annotate
|
| Sat, 11 Jul 2020 03:10:23 +0200 |
Manuel Jacob |
rebase: correctly check for empty commit in in-memory mode
|
file |
diff |
annotate
|
| Sat, 11 Jul 2020 00:53:34 +0200 |
Manuel Jacob |
overlayworkingctx: rename misleadingly named `isempty()` method
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 07:00:32 +0200 |
Manuel Jacob |
rebase: remove now unnecessary logic to allow empty commit when branch changes
|
file |
diff |
annotate
|
| Mon, 15 Jun 2020 12:00:15 -0400 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Thu, 30 Apr 2020 00:33:00 -0400 |
Matt Harbison |
rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291)
stable
|
file |
diff |
annotate
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
|
| Wed, 01 Apr 2020 14:34:21 -0700 |
Martin von Zweigbergk |
rebase: don't create merge when continuing rebase interrupted by old hg
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 16:57:38 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --base arguments (BC)
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 16:39:32 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --source arguments (BC)
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 19:29:02 -0700 |
Martin von Zweigbergk |
rebase: mention -r argument in synopsis
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 16:36:31 -0700 |
Martin von Zweigbergk |
rebase: remove unused defaults argument values from _definedestmap()
|
file |
diff |
annotate
|
| Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
file |
diff |
annotate
|
| Fri, 28 Feb 2020 11:32:27 -0800 |
Martin von Zweigbergk |
cleanup: remove redundant clearing of mergestate in rebase and shelve
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 17:20:12 -0800 |
Martin von Zweigbergk |
rebase: remove some now-unused parent arguments
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 21:40:01 -0800 |
Martin von Zweigbergk |
rebase: remove some redundant setting of dirstate parents
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:17:56 -0800 |
Martin von Zweigbergk |
rebase: stop relying on having two parents to resume rebase
|
file |
diff |
annotate
|
| Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
file |
diff |
annotate
|
| Fri, 31 Jan 2020 10:53:50 -0800 |
Martin von Zweigbergk |
rebase: abort if the user tries to rebase the working copy
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 22:24:16 -0800 |
Martin von Zweigbergk |
rebase: define base in only place in defineparents()
|
file |
diff |
annotate
|
| Mon, 27 Jan 2020 09:14:19 -0800 |
Martin von Zweigbergk |
cmdutil: change check_incompatible_arguments() *arg to single iterable
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 17:15:45 -0800 |
Martin von Zweigbergk |
rebase: move some variables after an error cases where they're not needed
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Mon, 13 Jan 2020 11:18:29 -0800 |
Martin von Zweigbergk |
rebase: fix bug where `--collapse` would apply diff on missing file
|
file |
diff |
annotate
|
| Mon, 13 Jan 2020 11:11:20 -0800 |
Martin von Zweigbergk |
rebase: extract a variable for a repeated `repo[p1]`
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:47:59 -0800 |
Martin von Zweigbergk |
graftcopies: remove `skip` and `repo` arguments
|
file |
diff |
annotate
|
| Mon, 06 Jan 2020 15:24:36 -0800 |
Martin von Zweigbergk |
copies: replace duplicatecopies() by function that takes contexts
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 15:47:39 -0800 |
Martin von Zweigbergk |
rebase: delete seemingly unnecessary needupdate()
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 21:41:28 -0800 |
Martin von Zweigbergk |
overlayworkginctx: implement a setparents() to mirror dirstate.setparents()
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 17:03:23 -0800 |
Martin von Zweigbergk |
overlayworkingctx: default branch to base context's branch
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:52:39 -0500 |
Matt Harbison |
rebase: drop an unused variable assignment
|
file |
diff |
annotate
|
| Wed, 18 Dec 2019 10:55:06 -0800 |
Martin von Zweigbergk |
rebase: restore i18n of a hint message
|
file |
diff |
annotate
|
| Wed, 18 Dec 2019 09:18:02 +0300 |
Martin von Zweigbergk |
rebase: use rewriteutil.precheck() instead of reimplementing it
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 23:25:16 -0800 |
Martin von Zweigbergk |
rebase: inline single-use variables passed to _definedestmap()
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 23:20:48 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_at_most_one_arg() for action+revision
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 23:03:52 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 22:43:15 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 23:11:33 -0800 |
Martin von Zweigbergk |
rebase: inline single-use `dryrun` and `confirm` variables
|
file |
diff |
annotate
|
| Fri, 13 Dec 2019 14:50:42 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
|
file |
diff |
annotate
|
| Fri, 13 Dec 2019 14:49:48 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 15:55:33 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_at_most_one_arg() for action
|
file |
diff |
annotate
|
| Fri, 13 Dec 2019 15:46:25 -0800 |
Kyle Lippincott |
rebase: make rebase not crash if p1 == p2 != nullid
|
file |
diff |
annotate
|
| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
file |
diff |
annotate
|
| Wed, 06 Nov 2019 18:28:11 -0800 |
Kyle Lippincott |
rebase: check for unfinished ops even when inmemory (issue6214)
|
file |
diff |
annotate
|
| Sat, 09 Nov 2019 13:23:54 +0100 |
Pierre-Yves David |
index: use `index.get_rev` in `rebase._computeobsoletenotrebased`
|
file |
diff |
annotate
|