| 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
|
| Wed, 02 Nov 2016 18:59:29 +0000 |
timeless |
rebase: check for conflicts before continuing
|
file |
diff |
annotate
|
| Wed, 02 Nov 2016 18:56:07 +0000 |
timeless |
rebase: rename merge to mergemod
|
file |
diff |
annotate
|
| Sat, 17 Sep 2016 17:02:56 +1000 |
Xidorn Quan |
rebase: rebase changesets in topo order (issue5370) (BC)
|
file |
diff |
annotate
|
| Tue, 20 Sep 2016 23:44:28 +0000 |
timeless |
rebase: use single quotes in use warning
|
file |
diff |
annotate
|
| Tue, 13 Sep 2016 13:49:42 -0700 |
Martin von Zweigbergk |
rebase: make debug logging more consistent
|
file |
diff |
annotate
|
| Fri, 26 Aug 2016 00:16:51 +0000 |
timeless |
rebase: properly calculate total commits to rebase (issue5347)
|
file |
diff |
annotate
|
| Tue, 23 Aug 2016 11:26:08 -0400 |
Augie Fackler |
extensions: change magic "shipped with hg" string
|
file |
diff |
annotate
|
| Tue, 19 Jul 2016 03:29:53 -0700 |
Simon Farnsworth |
rebase: turn rebase revs into set before filtering obsolete
stable
|
file |
diff |
annotate
|
| Thu, 14 Jul 2016 03:12:09 -0700 |
Kostia Balytskyi |
rebase: remove sortedstate-related confusion
|
file |
diff |
annotate
|
| Thu, 14 Jul 2016 02:59:27 -0700 |
Kostia Balytskyi |
rebase: replace extrafn field with _makeextrafn invocations
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move handling of obsolete commits to be a separate RR class method
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move rebase finish logic to be a method of the RR class
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move core rebase logic to be a method of the RR class
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move local variable 'extrafn' to the RR class
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move local variable 'currentbookmarks' to the RR class
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: make collapsing use explicit logic to decide on the rev to reuse
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move new rebase preparation to be a method of the RR class
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 14:09:53 +0200 |
Kostia Balytskyi |
rebase: move abort/continue prep to be a method of the RR class
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 06:29:23 -0700 |
Kostia Balytskyi |
rebase: move local variable 'obsoletenotrebased' to the RR class
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 06:29:23 -0700 |
Kostia Balytskyi |
rebase: move restorestestatus function to be a method of the RR class
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 06:29:23 -0700 |
Kostia Balytskyi |
rebase: move local variables related to keeping things unchanged to the RR
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 06:29:23 -0700 |
Kostia Balytskyi |
rebase: move local variables 'date' and 'extrafns' to the RR class
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 06:29:23 -0700 |
Kostia Balytskyi |
rebase: move collapse-related local variables to the RR class
|
file |
diff |
annotate
|
| Tue, 21 Jun 2016 07:22:49 -0700 |
Kostia Balytskyi |
rebase: pass repo, ui and opts objects to the RR class constructor
|
file |
diff |
annotate
|
| Fri, 17 Jun 2016 16:59:08 +0100 |
Kostia Balytskyi |
rebase: do not abort if all changesets have equivalents in the destination
|
file |
diff |
annotate
|
| Mon, 13 Jun 2016 22:41:45 +0100 |
Kostia Balytskyi |
rebase: move local variable 'targetancestors' to the RR class
|
file |
diff |
annotate
|
| Mon, 13 Jun 2016 22:40:59 +0100 |
Kostia Balytskyi |
rebase: move local variable 'skipped' to the RR class
|
file |
diff |
annotate
|
| Mon, 13 Jun 2016 22:38:54 +0100 |
Kostia Balytskyi |
rebase: move local variable 'target' to the RR class
|
file |
diff |
annotate
|
| Mon, 13 Jun 2016 22:36:13 +0100 |
Kostia Balytskyi |
rebase: introduce a rebaseruntime (RR) class
|
file |
diff |
annotate
|
| Sat, 14 May 2016 14:03:12 +0900 |
Yuya Nishihara |
py3: move up symbol imports to enforce import-checker rules
|
file |
diff |
annotate
|
| Fri, 06 May 2016 22:21:32 +0530 |
Pulkit Goyal |
py3: make hgext/rebase.py use absolute_import
|
file |
diff |
annotate
|
| Mon, 11 Apr 2016 21:33:07 +0000 |
timeless |
rebase: handle successor targets (issue5198)
|
file |
diff |
annotate
|
| Sat, 30 Apr 2016 18:39:39 +0200 |
Pierre-Yves David |
rebase: restrict rebase destination to the pulled set (issue5214)
stable
|
file |
diff |
annotate
|
| Sat, 30 Apr 2016 18:41:08 +0200 |
Pierre-Yves David |
destutil: add the ability to specify a search space for rebase destination
stable
|
file |
diff |
annotate
|
| Tue, 29 Mar 2016 11:50:41 -0700 |
Laurent Charignon |
rebase: fix crash when rebase aborts while rebasing obsolete revisions
|
file |
diff |
annotate
|
| Tue, 29 Mar 2016 11:49:45 -0700 |
Laurent Charignon |
rebase: refactor of error handling code path for rebaseskipobsolete
|
file |
diff |
annotate
|
| Wed, 09 Mar 2016 08:08:27 -0800 |
Kostia Balytskyi |
rebase: turn rebaseskipobsolete on by default
|
file |
diff |
annotate
|
| Tue, 08 Mar 2016 23:04:53 +0900 |
FUJIWARA Katsunori |
revset: replace extpredicate by revsetpredicate of registrar
|
file |
diff |
annotate
|
| Sat, 27 Feb 2016 18:02:12 +0100 |
Pierre-Yves David |
rebase: remove experimental option from 'rebase' config section
|
file |
diff |
annotate
|
| Sun, 14 Feb 2016 13:25:59 +0000 |
Pierre-Yves David |
rebase: choose default destination the same way as 'hg merge' (BC)
|
file |
diff |
annotate
|
| Wed, 17 Feb 2016 20:31:34 +0000 |
Kostia Balytskyi |
rebase: add potential divergent commit hashes to error message (issue5086)
|
file |
diff |
annotate
|
| Wed, 17 Feb 2016 22:45:01 +0100 |
liscju |
rebase: adds storing collapse message (issue4792)
|
file |
diff |
annotate
|
| Tue, 09 Feb 2016 23:49:55 +0000 |
Pierre-Yves David |
rebase: extract rebaseset and destination computation in a function
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 03:46:38 +0000 |
timeless |
rebase: suggest the correct tool to continue (not rebase)
|
file |
diff |
annotate
|
| Sun, 14 Feb 2016 00:45:17 +0000 |
Pierre-Yves David |
rebase: perform update through the 'update' command
|
file |
diff |
annotate
|
| Sat, 13 Feb 2016 16:59:32 +0000 |
Pierre-Yves David |
rebase: 'hg pull --rebase' now update only if there was nothing to rebase
|
file |
diff |
annotate
|
| Sun, 07 Feb 2016 00:49:31 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 01:56:46 +0000 |
timeless |
rebase: update working directory when aborting (issue5084)
stable
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 23:29:32 +0000 |
timeless |
rebase: document that tool does not apply to deleted files
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 22:14:53 +0000 |
timeless |
rebase: mention help merge-tools in help
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:23:31 -0800 |
Siddharth Agarwal |
rebase: don't preserve most extra fields
stable 3.7.1
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:24:47 -0800 |
Siddharth Agarwal |
rebase: backout changeset d755a9531fce
stable
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:23:52 -0800 |
Siddharth Agarwal |
rebase: backout changeset 986d04b9fedd
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 15:41:43 +0000 |
Martijn Pieters |
rebase: better way to detect non-detaching revisions (issue5044)
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 22:14:06 +0900 |
FUJIWARA Katsunori |
doc: use correct indentation for enumeration
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 22:06:35 +0900 |
FUJIWARA Katsunori |
doc: prevent non-literal text block from being treated as literal one
stable
|
file |
diff |
annotate
|
| Fri, 22 Jan 2016 20:32:47 +0000 |
timeless |
rebase: restore help for rebase w/o args (issue5059)
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:14:48 -0800 |
Bryan O'Sullivan |
with: use context manager for transaction in rebase
|
file |
diff |
annotate
|
| Thu, 14 Jan 2016 11:50:28 -0800 |
Laurent Charignon |
rebase: small refactoring to allow better extensibility from extensions
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 13:43:41 -0800 |
Laurent Charignon |
rebase: prevent creating divergence
|
file |
diff |
annotate
|
| Wed, 06 Jan 2016 12:55:56 -0800 |
Laurent Charignon |
rebase: create a new variable to make the next patch more legible
|
file |
diff |
annotate
|
| Wed, 06 Jan 2016 12:55:56 -0800 |
Laurent Charignon |
rebase: minor refactoring of _computeobsoletenotrebased
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
file |
diff |
annotate
|
| Tue, 29 Dec 2015 23:58:30 +0900 |
FUJIWARA Katsunori |
revset: use delayregistrar to register predicate in extension easily
|
file |
diff |
annotate
|
| Tue, 29 Dec 2015 15:32:12 -0800 |
Laurent Charignon |
rebase: better error message when rebased changes are all in destination
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:32:15 +0000 |
timeless |
rebase: mention conflict in documentation instead of merge
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:31:45 +0000 |
timeless |
rebase: simplify documentation about heads
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:22:03 +0000 |
timeless |
rebase: simplify documentation about --keep
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:24:41 +0000 |
timeless |
rebase: simplify documentation about selecting commits to rebase
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:06:43 +0000 |
timeless |
rebase: simplify documentation about public commits
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 18:54:03 -0500 |
Augie Fackler |
merge: have merge.update use a matcher instead of partial fn
|
file |
diff |
annotate
|
| Sat, 05 Dec 2015 23:50:13 +0900 |
Yuya Nishihara |
rebase: remove extra "if" from check of collapsing named branches
|
file |
diff |
annotate
|
| Sat, 05 Dec 2015 23:48:22 +0900 |
Yuya Nishihara |
rebase: drop redundant functions to keep branch and graft source explicitly
|
file |
diff |
annotate
|
| Thu, 03 Dec 2015 08:31:20 -0800 |
Laurent Charignon |
rebase: only clear rebase status after the rebase transaction has completed
|
file |
diff |
annotate
|
| Wed, 11 Nov 2015 20:07:15 -0500 |
Augie Fackler |
commands: inline definition of localrepo.parents() and drop the method (API)
|
file |
diff |
annotate
|
| Sat, 28 Nov 2015 04:11:14 -0500 |
Mike Edgar |
rebase: propagate extra dict from rebase source changeset
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 14:06:31 -0800 |
Laurent Charignon |
rebase: use bookmarks.recordchange instead of bookmarks.write
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 11:36:05 -0800 |
Laurent Charignon |
rebase: indentation change to make the next patch more legible
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:58:06 -0800 |
Laurent Charignon |
rebase: refactoring to avoid repetition of expression
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 16:06:00 -0800 |
Laurent Charignon |
rebase: remove an unused todo
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
file |
diff |
annotate
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
file |
diff |
annotate
|
| Mon, 26 Oct 2015 02:35:48 -0700 |
Stanislau Hlebik |
rebase: pass date parameter to concludenode
|
file |
diff |
annotate
|
| Mon, 26 Oct 2015 02:22:26 -0700 |
Stanislau Hlebik |
rebase: add date parameter to concludenode function
|
file |
diff |
annotate
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 15:20:44 -0700 |
Christian Delahousse |
rebase: reduce scope of try catch in restorestate
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 12:13:46 -0700 |
Christian Delahousse |
rebase: on abort delete rebase state file no matter what
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:56:03 +0100 |
Pierre-Yves David |
rebase: rename and test '_destrebase'
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:51:53 +0100 |
Pierre-Yves David |
rebase: directly use '_destrebase'
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:50:31 +0100 |
Pierre-Yves David |
rebase: extra default destination in its own function
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 00:32:20 +0100 |
Pierre-Yves David |
rebase: properly handle chains of markers with missing nodes
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 23:42:15 +0100 |
Pierre-Yves David |
rebase: use a direct reference to repo.changelog
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 03:20:05 -0700 |
Ryan McElroy |
rebase: factor out nothing to rebase return code
|
file |
diff |
annotate
|