| Wed, 28 Mar 2018 17:37:10 +0530 |
Pulkit Goyal |
evolve: add evolvestate as an argument to _finalizerelocate()
|
changeset |
files
|
| Wed, 28 Mar 2018 17:33:54 +0530 |
Pulkit Goyal |
evolve: add evolvestate as an argument to evolvecmd.relocate()
|
changeset |
files
|
| Wed, 28 Mar 2018 17:13:08 +0530 |
Pulkit Goyal |
tests: add test about handling phase-divergent merges
|
changeset |
files
|
| Wed, 28 Mar 2018 14:11:13 +0530 |
Pulkit Goyal |
evolve: show a message when evolution leads to no changes to commit
|
changeset |
files
|
| Wed, 28 Mar 2018 13:48:34 +0530 |
Pulkit Goyal |
evolve: pass the instability category to relocate() and _finalizerelocate()
|
changeset |
files
|
| Wed, 28 Mar 2018 12:56:35 +0530 |
Pulkit Goyal |
tests: add more tests for solving phase-divergence using `hg evolve`
|
changeset |
files
|
| Sat, 24 Mar 2018 17:21:42 +0530 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
changeset |
files
|
| Sat, 24 Mar 2018 16:41:14 +0530 |
Pulkit Goyal |
evolve: move logic to resolve phase-divergence in a new function
|
changeset |
files
|
| Sat, 24 Mar 2018 16:38:03 +0530 |
Pulkit Goyal |
evolve: store the precursor of phase-divergent in evolvestate
|
changeset |
files
|
| Sat, 24 Mar 2018 13:17:05 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted relocation to new fn
|
changeset |
files
|
| Sat, 24 Mar 2018 12:58:12 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted orphan resolution to new fn
|
changeset |
files
|
| Fri, 23 Mar 2018 19:36:08 +0530 |
Pulkit Goyal |
evolve: write data to evolvestate in case on conflicts in phase-divergence
|
changeset |
files
|
| Fri, 23 Mar 2018 19:16:25 +0530 |
Pulkit Goyal |
evolve: explicitly turn revs to list before storing into evolvestate
|
changeset |
files
|
| Fri, 23 Mar 2018 18:58:19 +0530 |
Pulkit Goyal |
tests: add tests of content+parent change creating phase-divergence
|
changeset |
files
|
| Fri, 23 Mar 2018 18:28:37 +0530 |
Pulkit Goyal |
tests: show first line of commit message in test-evolve-phase-divergence.t
|
changeset |
files
|
| Fri, 23 Mar 2018 17:49:26 +0530 |
Pulkit Goyal |
evolve: make sure bookmarks are moved after phase-divergence resolution
|
changeset |
files
|
| Fri, 23 Mar 2018 17:46:46 +0530 |
Pulkit Goyal |
evolve: use the new rebased changeset to resolve phase-divergence
|
changeset |
files
|
| Fri, 23 Mar 2018 17:21:09 +0530 |
Pulkit Goyal |
evolvecmd: add a detailed comment and some newlines
|
changeset |
files
|
| Fri, 23 Mar 2018 17:20:20 +0530 |
Pulkit Goyal |
tests: add one more test case about handling of phase-divergence by evolve
|
changeset |
files
|
| Fri, 23 Mar 2018 15:27:26 +0530 |
Pulkit Goyal |
tests: add more tests for handling of phase divergence by `hg evolve`
|
changeset |
files
|
| Fri, 23 Mar 2018 13:16:42 +0530 |
Pulkit Goyal |
tests: temporary delete the merge test of handling phase divergence
|
changeset |
files
|
| Fri, 30 Mar 2018 19:38:55 +0200 |
Pulkit Goyal |
tests: various comment on test-evolve-phase-divergence
|
changeset |
files
|
| Fri, 30 Mar 2018 19:37:06 +0200 |
Pulkit Goyal |
tests: make test-evolve-phase-divergence more descriptive
|
changeset |
files
|
| Fri, 30 Mar 2018 20:26:54 +0200 |
Pierre-Yves David |
compat: use updateresult API if available
|
changeset |
files
|
| Fri, 30 Mar 2018 20:13:06 +0200 |
Pierre-Yves David |
compat: provide an explicit default value to the 'odiff' config
|
changeset |
files
|
| Thu, 29 Mar 2018 19:47:48 +0200 |
Pierre-Yves David |
compat: keep passing arguments as keyword argument
|
changeset |
files
|
| Thu, 29 Mar 2018 18:34:32 +0200 |
Pierre-Yves David |
compat: search for stringmatcher in the new location
|
changeset |
files
|
| Thu, 29 Mar 2018 14:13:13 +0200 |
Boris Feld |
rebase: update the rebase wrapping to works with hg 4.6
|
changeset |
files
|
| Fri, 23 Mar 2018 09:08:21 -0700 |
Martin von Zweigbergk |
compat: call current obsolete.createmarkers(), not one from load time
stable
|
changeset |
files
|
| Fri, 23 Mar 2018 12:44:06 +0530 |
Pulkit Goyal |
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
|
changeset |
files
|
| Fri, 23 Mar 2018 12:39:00 +0530 |
Pulkit Goyal |
evolve: replace bumped in function name to phasedivergence
|
changeset |
files
|
| Fri, 23 Mar 2018 12:35:37 +0530 |
Pulkit Goyal |
evolve: drop duplicate import of rewriteutil._bookmarksupdater
|
changeset |
files
|
| Thu, 22 Mar 2018 10:39:18 +0100 |
Pierre-Yves David |
obslog: more 4.1 code compatibility drop
|
changeset |
files
|
| Thu, 22 Mar 2018 10:38:01 +0100 |
Pierre-Yves David |
template: drop some 4.1 compatibility code
|
changeset |
files
|
| Thu, 22 Mar 2018 10:35:27 +0100 |
Pierre-Yves David |
checkheads: drop upstreamed code
|
changeset |
files
|
| Thu, 22 Mar 2018 10:34:44 +0100 |
Pierre-Yves David |
obslog: cleanup patch handling after 4.1 compat drop
|
changeset |
files
|
| Thu, 22 Mar 2018 10:25:01 +0100 |
Pierre-Yves David |
packaging: further mark 4.1 support as dropped
|
changeset |
files
|
| Thu, 22 Mar 2018 10:05:50 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 22 Mar 2018 09:53:42 +0100 |
Pierre-Yves David |
tests: extend the globing to the user name
stable
|
changeset |
files
|
| Thu, 22 Mar 2018 01:20:03 +0100 |
Pierre-Yves David |
branching: close mercurial-4.1 test branch
mercurial-4.1
|
changeset |
files
|
| Thu, 15 Mar 2018 00:09:24 +0530 |
Pulkit Goyal |
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
|
changeset |
files
|
| Thu, 22 Mar 2018 00:56:48 +0100 |
Pierre-Yves David |
compat: drop support for Mercurial 4.1
|
changeset |
files
|
| Thu, 22 Mar 2018 00:50:11 +0100 |
Pierre-Yves David |
packaging: mark versiond as devel versions
|
changeset |
files
|
| Thu, 22 Mar 2018 00:49:04 +0100 |
Pierre-Yves David |
packaging: merge stable back into default
|
changeset |
files
|
| Thu, 22 Mar 2018 00:47:09 +0100 |
Pierre-Yves David |
packaging: mark version as devel version
stable
|
changeset |
files
|
| Thu, 22 Mar 2018 00:45:47 +0100 |
Pierre-Yves David |
Added tag 7.3.0 for changeset e4ac2e2c2086
stable
|
changeset |
files
|
| Wed, 21 Mar 2018 16:35:18 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
changeset |
files
|
| Wed, 21 Mar 2018 16:32:54 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
changeset |
files
|
| Wed, 21 Mar 2018 16:18:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Wed, 21 Mar 2018 16:06:17 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Wed, 21 Mar 2018 16:03:46 +0100 |
Pierre-Yves David |
branching: merge future 7.3.0 into stable
stable 7.3.0
|
changeset |
files
|
| Wed, 21 Mar 2018 15:57:53 +0100 |
Pierre-Yves David |
tests: update test output for the stable branch
stable
|
changeset |
files
|
| Wed, 21 Mar 2018 15:34:29 +0100 |
Pierre-Yves David |
debian: add version 7.3.0 to changelog
|
changeset |
files
|
| Wed, 21 Mar 2018 15:32:59 +0100 |
Pierre-Yves David |
packaging: update version numbers
|
changeset |
files
|
| Wed, 21 Mar 2018 15:30:06 +0100 |
Pierre-Yves David |
changelog: prepare release 7.3.0
|
changeset |
files
|
| Wed, 21 Mar 2018 15:36:10 +0100 |
Pierre-Yves David |
tests: updated tested with version
|
changeset |
files
|
| Wed, 21 Mar 2018 17:03:55 +0530 |
Pulkit Goyal |
__init__: show some internationalization love
|
changeset |
files
|
| Wed, 21 Mar 2018 17:04:41 +0530 |
Pulkit Goyal |
evolvecmd: show some internationalization love
|
changeset |
files
|
| Wed, 21 Mar 2018 16:52:46 +0530 |
Pulkit Goyal |
utility: make sure prompt text is internationalized
|
changeset |
files
|
| Wed, 21 Mar 2018 17:59:15 +0100 |
Pierre-Yves David |
test: do not use revision number
|
changeset |
files
|
| Wed, 21 Mar 2018 19:30:51 +0100 |
Pierre-Yves David |
compat: use mergetoolopts from commands.py
|
changeset |
files
|
| Wed, 21 Mar 2018 15:24:51 +0100 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Tue, 20 Mar 2018 18:41:31 +0530 |
Pulkit Goyal |
evolve: add a `--stop` flag for `hg evolve` command
|
changeset |
files
|
| Mon, 19 Mar 2018 15:20:40 -0700 |
Martin von Zweigbergk |
obsexchange: make compatible with some unreleased 4.5 versions
|
changeset |
files
|
| Mon, 19 Mar 2018 15:46:17 -0700 |
Martin von Zweigbergk |
compat: make override of createmarkers work on wrapped function
|
changeset |
files
|
| Mon, 19 Mar 2018 11:18:47 -0700 |
Martin von Zweigbergk |
previous/next: add -m short form for --merge
|
changeset |
files
|
| Sun, 18 Mar 2018 17:29:32 +0530 |
Pulkit Goyal |
evolve: handle stabilization of merge changeset with both parents obsoleted
|
changeset |
files
|
| Mon, 19 Mar 2018 13:11:55 +0530 |
Pulkit Goyal |
state: add __setitem__() for cmdstate class
|
changeset |
files
|
| Mon, 19 Mar 2018 12:58:31 +0530 |
Pulkit Goyal |
evolve: preserve the order of merge parents in `hg evolve --continue`
|
changeset |
files
|
| Mon, 12 Mar 2018 15:41:51 -0700 |
Martin von Zweigbergk |
topics: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:51:43 -0700 |
Martin von Zweigbergk |
grab: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:51:34 -0700 |
Martin von Zweigbergk |
touch: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:51:26 -0700 |
Martin von Zweigbergk |
split: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:51:17 -0700 |
Martin von Zweigbergk |
prune: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:51:07 -0700 |
Martin von Zweigbergk |
metaedit: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:50:59 -0700 |
Martin von Zweigbergk |
fold: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:50:45 -0700 |
Martin von Zweigbergk |
uncommit: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:40:28 -0700 |
Martin von Zweigbergk |
evolve: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Mon, 12 Mar 2018 15:50:25 -0700 |
Martin von Zweigbergk |
amend: include "operation" metadata in obsmarkers
|
changeset |
files
|
| Fri, 16 Mar 2018 10:22:27 -0700 |
Martin von Zweigbergk |
compat: add wrapper for obsolete.createmarkers() that accepts "operation" arg
|
changeset |
files
|
| Mon, 12 Mar 2018 23:26:25 -0700 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
changeset |
files
|
| Fri, 16 Mar 2018 17:00:01 +0530 |
Pulkit Goyal |
evolve: de-duplicate some function calls
|
changeset |
files
|
| Fri, 16 Mar 2018 16:11:22 +0530 |
Pulkit Goyal |
evolve: move deletion of evolvestate out of continueevolve() function
|
changeset |
files
|
| Fri, 16 Mar 2018 16:04:28 +0530 |
Pulkit Goyal |
evolve: load evolvestate before passing to continueevolve()
|
changeset |
files
|
| Fri, 16 Mar 2018 15:56:05 +0530 |
Pulkit Goyal |
evolve: move the handling for non-continue part in else conditional
|
changeset |
files
|
| Wed, 14 Mar 2018 21:21:10 +0530 |
Pulkit Goyal |
evolve: move the logic of continuation handling of `hg evolve` in own fn
|
changeset |
files
|
| Fri, 16 Mar 2018 15:24:56 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about next and prev being interactive
|
changeset |
files
|
| Fri, 16 Mar 2018 13:24:57 +0530 |
Pulkit Goyal |
prev: show changeset hash in --dry-run instead of rev numbers
|
changeset |
files
|
| Fri, 16 Mar 2018 13:13:21 +0530 |
Pulkit Goyal |
prev: prompt user to choose parent in case of multiple parents
|
changeset |
files
|
| Fri, 16 Mar 2018 12:48:03 +0530 |
Pulkit Goyal |
next: cleanup logic around return by returning early
|
changeset |
files
|
| Fri, 16 Mar 2018 12:14:39 +0530 |
Pulkit Goyal |
next: prompt user to choose child in ambiguity in `hg next --evolve`
|
changeset |
files
|
| Fri, 16 Mar 2018 11:56:50 +0530 |
Pulkit Goyal |
next: move logic to evolve the children to it's own function
|
changeset |
files
|
| Fri, 16 Mar 2018 11:46:47 +0530 |
Pulkit Goyal |
next: prompt user to choose a children in case of ambiguity
|
changeset |
files
|
| Fri, 16 Mar 2018 11:31:13 +0530 |
Pulkit Goyal |
next: show changeset hash in `--dry-run` instead of rev numbers
|
changeset |
files
|
| Sun, 18 Mar 2018 01:27:02 +0530 |
Pulkit Goyal |
evolve: make sure we consider all cases in if-else
|
changeset |
files
|
| Mon, 19 Mar 2018 14:03:41 +0100 |
Pulkit Goyal |
tests: add more cases about stabilization of an orphaned merge commit
|
changeset |
files
|
| Mon, 19 Mar 2018 13:47:07 +0100 |
Pierre-Yves David |
evolve: fix missing negation
|
changeset |
files
|
| Mon, 19 Mar 2018 12:01:07 +0100 |
Pierre-Yves David |
evolve: clarify message for ambiguous destination from split
|
changeset |
files
|
| Wed, 14 Mar 2018 18:24:22 +0530 |
Pulkit Goyal |
evolve: prompt user to select destination for stabilization in case of split
|
changeset |
files
|
| Wed, 14 Mar 2018 18:36:35 +0530 |
Pulkit Goyal |
tests: remove some tests which are moved to dedicated files
|
changeset |
files
|
| Fri, 16 Mar 2018 11:24:35 +0530 |
Pulkit Goyal |
next: factor out the logic to update to changeset in another function
|
changeset |
files
|
| Wed, 14 Mar 2018 17:59:53 +0530 |
Pulkit Goyal |
utility: add a function to prompt user to choose a revision
|
changeset |
files
|
| Wed, 14 Mar 2018 17:20:20 +0530 |
Pulkit Goyal |
tests: add a test about evolve stabilizing orphan caused by splits
|
changeset |
files
|
| Mon, 19 Mar 2018 11:36:55 +0100 |
Boris Feld |
test: fix output after rev-branch-cache has been merged
|
changeset |
files
|
| Fri, 16 Mar 2018 09:13:33 -0700 |
Martin von Zweigbergk |
cleanup: remove duplicate import of "obsolete"
|
changeset |
files
|
| Fri, 16 Mar 2018 15:21:05 +0530 |
Pulkit Goyal |
previous: fix behavior on obsolete cset when topic is involved (issue5708)
stable
|
changeset |
files
|
| Fri, 16 Mar 2018 15:15:17 +0530 |
Pulkit Goyal |
previous: add test case when it's broken on obsolete cset
stable
|
changeset |
files
|
| Fri, 16 Mar 2018 15:01:44 +0530 |
Pulkit Goyal |
prev: fix the breakage of `hg previous` from obsolete cset
stable
|
changeset |
files
|
| Fri, 16 Mar 2018 14:59:10 +0530 |
Pulkit Goyal |
prev: add a test case which shows traceback when doing prev on obsolete cset
stable
|
changeset |
files
|
| Tue, 13 Mar 2018 19:06:14 +0530 |
Pulkit Goyal |
tests: add more tests related to stabilization of orphaned merge commit
|
changeset |
files
|
| Tue, 13 Mar 2018 18:17:50 +0530 |
Pulkit Goyal |
evolve: fix stabilization of orphan merge changesets in case of conflicts
|
changeset |
files
|
| Tue, 13 Mar 2018 15:29:35 +0530 |
Pulkit Goyal |
tests: add a test file of resolving orphaness of merge changesets
|
changeset |
files
|