| 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
|
| Wed, 06 Sep 2017 15:23:19 -0700 |
Jun Wu |
rebase: use unfiltered repo when loading state
|
file |
diff |
annotate
|
| Wed, 06 Sep 2017 12:40:00 -0700 |
Jun Wu |
rebase: do not crash rebasing merge with a parent having hidden successor
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:51:54 -0700 |
Jun Wu |
rebase: use _ctxdesc in one more place
|
file |
diff |
annotate
|
| Sun, 27 Aug 2017 02:47:47 -0700 |
Jun Wu |
rebase: move working parent and bookmark for obsoleted revs (BC)
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:49:13 -0700 |
Jun Wu |
rebase: remove an unnecessary adjustdest in clearrebased
|
file |
diff |
annotate
|
| Mon, 21 Aug 2017 20:22:07 -0700 |
Jun Wu |
rebase: sort destmap topologically
|
file |
diff |
annotate
|
| Tue, 29 Aug 2017 17:27:37 -0700 |
Jun Wu |
rebase: initial support for multiple destinations
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 00:32:19 -0700 |
Jun Wu |
rebase: change internal format to support destination map
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 00:31:52 -0700 |
Jun Wu |
rebase: rewrite _computeobsoletenotrebased
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:34:11 -0700 |
Jun Wu |
rebase: only change self.state when collapsing in _finishrebase
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 22:17:15 -0700 |
Jun Wu |
rebase: choose merge base without unwanted revisions
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:08:07 -0700 |
Jun Wu |
rebase: optimize "source" calculation in adjustdest
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:36:59 -0700 |
Jun Wu |
rebase: remove "state >= revtodo" condition
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 01:05:47 -0700 |
Jun Wu |
rebase: remove self.destancestors
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 09:01:45 -0700 |
Jun Wu |
rebase: remove rebaseset from _checkobsrebase
|
file |
diff |
annotate
|
| Mon, 10 Jul 2017 12:18:32 -0700 |
Jun Wu |
rebase: remove revignored and nullmerge states
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove messages for nullmerge and revignored (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:38:34 -0700 |
Jun Wu |
rebase: remove revprecursor and revpruned states (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:14:33 -0700 |
Jun Wu |
rebase: move obsoleted not rebased messages earlier (BC)
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 20:05:52 -0700 |
Jun Wu |
rebase: extract ctx description logic to a function
|
file |
diff |
annotate
|
| Sat, 12 Aug 2017 21:01:06 -0700 |
Jun Wu |
rebase: change "result would have 3 parent" error message (BC)
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 21:30:31 -0700 |
Jun Wu |
rebase: rewrite core algorithm (issue5578) (issue5630)
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 14:23:41 -0400 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Wed, 02 Aug 2017 21:52:22 +0900 |
Yuya Nishihara |
rebase: sort collapsed revisions in commit message (issue5643)
stable
|
file |
diff |
annotate
|
| Thu, 20 Jul 2017 01:30:41 -0700 |
Durham Goode |
rebase: use one dirstateguard for when using rebase.singletransaction
|
file |
diff |
annotate
|
| Mon, 24 Jul 2017 23:52:56 -0700 |
Jun Wu |
rebase: move bookmark to destination for commits becoming empty (issue5627)
stable
|
file |
diff |
annotate
|
| Tue, 18 Jul 2017 07:47:28 -0700 |
Durham Goode |
rebase: add config to move rebase into a single transaction
|
file |
diff |
annotate
|
| Fri, 07 Jul 2017 19:03:03 -0700 |
Jun Wu |
rebase: remove "if True"
|
file |
diff |
annotate
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
file |
diff |
annotate
|
| Wed, 28 Jun 2017 14:53:54 -0700 |
Martin von Zweigbergk |
rebase: always pass destination as revnum to _handleskippingobsolete()
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 01:36:20 +0200 |
Pierre-Yves David |
obsutil: move 'allsuccessors' to the new modules
|
file |
diff |
annotate
|
| Thu, 29 Jun 2017 15:21:52 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 17:40:24 +0200 |
Pierre-Yves David |
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 17:39:55 +0200 |
Pierre-Yves David |
rebase: backed out changeset 2519994d25ca
stable
|
file |
diff |
annotate
|
| Sat, 24 Jun 2017 21:13:48 -0700 |
Jun Wu |
rebase: clean up rebasestate from active transaction
|
file |
diff |
annotate
|
| Mon, 19 Jun 2017 11:18:12 -0700 |
Martin von Zweigbergk |
rebase: use context manager for locking in pullrebase()
|
file |
diff |
annotate
|
| Mon, 19 Jun 2017 11:18:05 -0700 |
Martin von Zweigbergk |
rebase: use context manager for locking in rebase()
|
file |
diff |
annotate
|
| Sat, 17 Jun 2017 23:09:47 -0700 |
Martin von Zweigbergk |
rebase: rewrite "x in y.children()" as "y in x.parents()"
|
file |
diff |
annotate
|
| Wed, 31 May 2017 19:46:04 -0700 |
Siddharth Agarwal |
rebase: drop unnecessary parentchange call
|
file |
diff |
annotate
|
| Sat, 27 May 2017 21:08:51 -0700 |
Martin von Zweigbergk |
hidden: rename "revealedrevs" to "pinnedrevs" (API)
|
file |
diff |
annotate
|
| Sat, 20 May 2017 19:43:58 +0200 |
Pierre-Yves David |
repoview: rename '_getdynamicblockers' to 'revealedrevs' (API)
|
file |
diff |
annotate
|
| Sun, 14 May 2017 16:19:47 +0900 |
Yuya Nishihara |
commands: move templates of common command options to cmdutil (API)
|
file |
diff |
annotate
|
| Thu, 18 May 2017 17:11:01 -0400 |
Augie Fackler |
rebase: migrate to context manager for changing dirstate parents
|
file |
diff |
annotate
|
| Sat, 09 Jan 2016 23:07:20 +0900 |
Yuya Nishihara |
registrar: move cmdutil.command to registrar module (API)
|
file |
diff |
annotate
|
| Tue, 09 May 2017 16:29:31 -0700 |
Durham Goode |
obsolete: add operation metadata to rebase/amend/histedit obsmarkers
|
file |
diff |
annotate
|
| Thu, 18 May 2017 13:18:05 -0700 |
Jeremy Fitzhardinge |
rebase: make sure merge state is cleaned up for no-op rebases (issue5494)
|
file |
diff |
annotate
|
| Fri, 10 Feb 2017 16:56:29 -0800 |
Martin von Zweigbergk |
cleanup: use set literals
|
file |
diff |
annotate
|
| Thu, 11 May 2017 11:37:18 -0700 |
Martin von Zweigbergk |
rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)
|
file |
diff |
annotate
|
| Thu, 11 May 2017 22:38:15 -0700 |
Martin von Zweigbergk |
rebase: rename "target" to "destination" in messages
|
file |
diff |
annotate
|
| Thu, 11 May 2017 22:38:03 -0700 |
Martin von Zweigbergk |
rebase: rename "target" to "dest" in variable names
|
file |
diff |
annotate
|
| Sat, 11 Mar 2017 12:25:56 -0800 |
Martin von Zweigbergk |
rebase: don't update state dict same way for each root
|
file |
diff |
annotate
|
| Mon, 01 May 2017 05:52:32 +0900 |
FUJIWARA Katsunori |
help: apply bulk fixes for indentation and literal blocking issues
stable
|
file |
diff |
annotate
|
| Mon, 01 May 2017 05:38:52 +0900 |
FUJIWARA Katsunori |
rebase: fix incorrect configuration example
stable
|
file |
diff |
annotate
|
| Thu, 30 Mar 2017 03:50:10 -0700 |
Ryan McElroy |
rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514)
|
file |
diff |
annotate
|
| Thu, 30 Mar 2017 03:50:10 -0700 |
Ryan McElroy |
rebase: allow destination-free continue and abort (issue5513)
|
file |
diff |
annotate
|
| Fri, 24 Mar 2017 16:20:10 -0700 |
Martin von Zweigbergk |
rebase: don't require destination if commands.rebase.requiredest=False
|
file |
diff |
annotate
|
| Sun, 12 Mar 2017 12:33:35 -0700 |
Durham Goode |
rebase: move state serialization to use unfiltered repo
|
file |
diff |
annotate
|
| Tue, 21 Mar 2017 21:26:52 -0700 |
Martin von Zweigbergk |
plain: ignore [commands] config
|
file |
diff |
annotate
|
| Tue, 14 Mar 2017 17:43:44 -0700 |
Ryan McElroy |
rebase: add flag to require destination
|
file |
diff |
annotate
|
| Sun, 19 Mar 2017 11:54:15 -0700 |
Durham Goode |
rebase: use one dirstateguard for entire rebase
|
file |
diff |
annotate
|
| Thu, 16 Mar 2017 14:40:34 -0700 |
Jun Wu |
rebase: get rid of ui.backupconfig
|
file |
diff |
annotate
|
| Wed, 15 Mar 2017 15:03:43 -0700 |
Pierre-Yves David |
rebase: explicitly tests for None
|
file |
diff |
annotate
|
| Sun, 12 Mar 2017 21:56:39 -0700 |
Gregory Szorc |
rebase: don't use mutable default argument value
|
file |
diff |
annotate
|
| Sun, 12 Mar 2017 16:44:01 -0700 |
Mads Kiilerich |
rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
|
file |
diff |
annotate
|
| Sat, 11 Mar 2017 11:02:25 -0800 |
Mads Kiilerich |
vfs: use repo.vfs.unlinkpath
|
file |
diff |
annotate
|
| Sat, 11 Mar 2017 10:35:44 -0800 |
Martin von Zweigbergk |
rebase: abort if *any* commit in rebase set is public
|
file |
diff |
annotate
|
| Fri, 10 Mar 2017 23:07:20 -0800 |
Martin von Zweigbergk |
rebase: unhide original working directory node as well (issue5219)
|
file |
diff |
annotate
|
| Fri, 10 Mar 2017 23:06:31 -0800 |
Martin von Zweigbergk |
rebase: pass in a regular set to _setrebasesetvisibility()
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 16:27:32 -0800 |
Durham Goode |
rebase: move actual rebase into a single transaction
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 16:30:31 -0800 |
Durham Goode |
rebase: allow aborting if last-message.txt is missing
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 14:04:29 -0800 |
Durham Goode |
rebase: add storestatus support for transactions
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 14:11:44 -0800 |
Durham Goode |
rebase: move storestatus onto rebaseruntime
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 14:19:08 -0800 |
Durham Goode |
rebase: clear updatestate during rebase --abort in more cases
|
file |
diff |
annotate
|
| Sun, 19 Feb 2017 18:16:09 +0900 |
Yuya Nishihara |
revset: import set classes directly from smartset module
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 08:47:27 -0800 |
Martin von Zweigbergk |
rebase: fix code comment to refer to right issue (4504, not 4505)
|
file |
diff |
annotate
|
| Tue, 10 Jan 2017 09:32:27 +0100 |
Valters Vingolds |
rebase: provide detailed hint to abort message if working dir is not clean
|
file |
diff |
annotate
|
| Sun, 01 Jan 2017 13:16:29 +0100 |
Valters Vingolds |
rebase: fail-fast the pull if working dir is not clean (BC)
|
file |
diff |
annotate
|
| Fri, 06 Jan 2017 09:58:41 +0100 |
Valters Vingolds |
rebase: use repo.vfs.exists in 'hg summary' hook
|
file |
diff |
annotate
|
| Sat, 24 Dec 2016 15:38:27 -0500 |
Augie Fackler |
rebase: un-wrap function signature since it fits in 80 columns
|
file |
diff |
annotate
|
| Mon, 28 Nov 2016 05:45:22 +0000 |
Jun Wu |
rebase: calculate ancestors for --base separately (issue5420)
|
file |
diff |
annotate
|
| Mon, 21 Nov 2016 21:32:39 -0500 |
Augie Fackler |
rebase: refer to checkunresolved by its new name
|
file |
diff |
annotate
|
| Mon, 21 Nov 2016 21:27:12 -0500 |
Augie Fackler |
rebase: refer to dirstateguard by its new name
|
file |
diff |
annotate
|
| Thu, 10 Nov 2016 09:21:41 -0800 |
Durham Goode |
rebase: move bookmark update to before rebase clearing
|
file |
diff |
annotate
|
| Mon, 17 Oct 2016 23:16:55 +0200 |
Mads Kiilerich |
spelling: fixes of non-dictionary words
|
file |
diff |
annotate
|