| Fri, 12 Feb 2021 16:13:34 -0800 |
Martin von Zweigbergk |
rebase: inline simple function for finding obsolete subset of commits
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 16:33:12 -0800 |
Martin von Zweigbergk |
errors: use more specific errors in rebase extension
|
file |
diff |
annotate
|
| Thu, 28 May 2020 17:31:41 -0400 |
Augie Fackler |
rebase: add a config knob for forcing in-memory rebasing
|
file |
diff |
annotate
|
| Sat, 26 Dec 2020 18:26:32 +0530 |
Sushil khanchi |
rebase: handle the case when nothing to rebase (dry-run)
|
file |
diff |
annotate
|
| Tue, 01 Dec 2020 21:54:46 +0100 |
Joerg Sonnenberger |
node: import symbols explicitly
|
file |
diff |
annotate
|
| Thu, 03 Dec 2020 14:15:39 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Wed, 02 Dec 2020 15:39:01 -0800 |
Martin von Zweigbergk |
rebase: clear merge state when aborting in-memory merge on dirty working copy
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Tue, 13 Oct 2020 14:16:21 -0400 |
Matt Harbison |
rebase: update commit hash references in the new commits
|
file |
diff |
annotate
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
file |
diff |
annotate
|
| Thu, 22 Oct 2020 23:10:06 -0700 |
Martin von Zweigbergk |
rebase: make summary template configurable, with default to shared template
|
file |
diff |
annotate
|
| Thu, 22 Oct 2020 22:29:22 -0700 |
Martin von Zweigbergk |
rebase: use hard-coded template for one-line commit description
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:53:44 -0700 |
Martin von Zweigbergk |
merge: replace calls to hg.updaterepo() by merge.update()
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
file |
diff |
annotate
|
| 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
|
| Sat, 09 Nov 2019 13:23:53 +0100 |
Pierre-Yves David |
index: use `index.get_rev` in `rebase.successorrevs`
|
file |
diff |
annotate
|
| Fri, 08 Nov 2019 11:19:20 -0800 |
Augie Fackler |
cleanup: remove pointless r-prefixes on single-quoted strings
|
file |
diff |
annotate
|
| Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 19:25:18 -0400 |
Gregory Szorc |
py3: define and use pycompat.iteritems() for hgext/
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 17:59:15 -0400 |
Gregory Szorc |
py3: define and use pycompat.itervalues()
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 13:28:56 -0400 |
Gregory Szorc |
py3: manually import pycompat.open into files that need it
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Wed, 25 Sep 2019 10:59:29 -0400 |
Paul Gossman |
rebase: track new nodes when --keep is set
|
file |
diff |
annotate
|
| Tue, 16 Jul 2019 01:59:28 +0530 |
Taapas Agrawal |
continue: added support for rebase
|
file |
diff |
annotate
|
| Sun, 23 Jun 2019 23:11:35 +0530 |
Taapas Agrawal |
abort: added support for rebase
|
file |
diff |
annotate
|
| Thu, 20 Jun 2019 11:40:08 +0530 |
Taapas Agrawal |
statecheck: added support for cmdutil.afterresolvedstates
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 02:12:58 +0530 |
Taapas Agrawal |
statecheck: added support for STATES
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 00:43:36 +0530 |
Taapas Agrawal |
state: created new class statecheck to handle unfinishedstates
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 23:43:53 +0530 |
Taapas Agrawal |
states: moved cmdutil.unfinishedstates to state.py
|
file |
diff |
annotate
|
| Mon, 10 Jun 2019 15:35:06 -0700 |
Kyle Lippincott |
rebase: tweak description of inmemory working even w/ dirty working dir
|
file |
diff |
annotate
|
| Mon, 13 May 2019 14:19:36 -0400 |
timeless |
rebase: hide help for revisions.Predicates._destautoorphanrebase
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 12:06:13 -0400 |
Augie Fackler |
rebase: fix bug that prevented dry-run rebases from printing failures
|
file |
diff |
annotate
|
| Wed, 03 Apr 2019 11:21:27 -0700 |
Martin von Zweigbergk |
cleanup: use set literals where possible
|
file |
diff |
annotate
|
| Sat, 02 Mar 2019 09:41:17 +0900 |
Yuya Nishihara |
merge with stable
|
file |
diff |
annotate
|
| Sat, 23 Feb 2019 21:13:27 +0100 |
Manuel Jacob |
rebase: add missing dashes in help text
stable
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 09:07:00 -0800 |
Gregory Szorc |
global: make some docstrings raw strings
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
file |
diff |
annotate
|
| Sat, 12 Jan 2019 17:43:36 +0900 |
Yuya Nishihara |
repair: move ui.history-editing-backup to [rewrite] section
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:23:17 -0800 |
Martin von Zweigbergk |
rebase: clarify that commits that become empty are skipped
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:17:09 -0800 |
Martin von Zweigbergk |
rebase: format commit in usual way when explaining that it became empty
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 08:50:12 -0800 |
Martin von Zweigbergk |
rebase: remove now-unnecessary arguments to _abort()
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 08:41:29 -0800 |
Martin von Zweigbergk |
rebase: move abort() onto rebaseruntime
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 17:13:01 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 03 Dec 2018 09:36:40 -0800 |
Martin von Zweigbergk |
rebase: abort in-mem rebase if there's a dirty merge state
stable
|
file |
diff |
annotate
|
| Fri, 30 Nov 2018 16:21:37 -0800 |
Martin von Zweigbergk |
rebase: preserve working copy when redoing in-mem rebase on disk
stable
|
file |
diff |
annotate
|
| Thu, 15 Nov 2018 13:16:46 -0800 |
Kyle Lippincott |
rebase: fix two ui.logs to actually have text when using default blackbox log
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:17:40 -0800 |
Martin von Zweigbergk |
update: clarify update() call sites by specifying argument names
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 02:17:41 -0700 |
rdamazio |
help: assigning categories to existing commands
|
file |
diff |
annotate
|
| Wed, 26 Sep 2018 22:45:44 +0200 |
Boris Feld |
rebase: explicitly track collapses as fold
|
file |
diff |
annotate
|
| Wed, 26 Sep 2018 23:51:11 +0200 |
Boris Feld |
rebase: use tuple as `replacement` keys
|
file |
diff |
annotate
|
| Thu, 27 Sep 2018 00:15:21 +0200 |
Boris Feld |
rebase: expand a long "one-liner"
|
file |
diff |
annotate
|
| Wed, 26 Sep 2018 22:05:28 +0200 |
Boris Feld |
rebase: don't try to prune obsolete changeset already in the destination
|
file |
diff |
annotate
|
| Thu, 12 Jul 2018 12:11:20 -0700 |
Martin von Zweigbergk |
rebase: skip extinct revisions even if it has no successor in rebase set
|
file |
diff |
annotate
|
| Fri, 17 Aug 2018 10:21:25 +0900 |
Yuya Nishihara |
rebase: do not pass in user option to rollback in-memory merge conflict
|
file |
diff |
annotate
|
| Thu, 16 Aug 2018 18:53:51 +0000 |
Gregory Szorc |
rebase: call _dorebase() properly
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 11:27:57 +0530 |
Sushil khanchi |
rebase: cover restorestatus() by lock to prevent it from being updated
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 10:57:47 +0900 |
Yuya Nishihara |
rebase: turn off inmemory flag on --stop
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 10:47:07 +0900 |
Yuya Nishihara |
rebase: use action variable to select things to do
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 10:41:26 +0900 |
Yuya Nishihara |
rebase: consolidate check for --dry-run/--confirm on abort/stop/continue
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 10:36:06 +0900 |
Yuya Nishihara |
rebase: consolidate check for --abort/--stop/--continue conflicts
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 10:32:10 +0900 |
Yuya Nishihara |
rebase: do not set internal dryrun flag by --confirm
|
file |
diff |
annotate
|
| Sun, 22 Jul 2018 22:08:14 +0530 |
Sushil khanchi |
rebase: include --stop option in documentation
|
file |
diff |
annotate
|
| Sun, 22 Jul 2018 22:04:49 +0530 |
Sushil khanchi |
rebase: raise error for options conflicting with --stop
|
file |
diff |
annotate
|
| Wed, 18 Jul 2018 00:25:52 +0530 |
Sushil khanchi |
rebase: add --stop option to stop rebase at any point (issue5206)
|
file |
diff |
annotate
|
| Fri, 03 Aug 2018 00:10:52 +0530 |
Sushil khanchi |
rebase: move "backup" flag to rebaseruntime
|
file |
diff |
annotate
|
| Thu, 05 Jul 2018 10:42:48 +0530 |
Sushil khanchi |
rebase: support "history-editing-backup" config option
|
file |
diff |
annotate
|
| 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
|