| Sun, 04 Feb 2018 20:58:03 +0530 |
Pulkit Goyal |
tests: add more tests to test-evolve-continue.t
|
changeset |
files
|
| Mon, 22 Jan 2018 18:52:27 +0530 |
Pulkit Goyal |
evolve: handle case when newnode can be None while continuing evolve
|
changeset |
files
|
| Sun, 28 Jan 2018 19:28:08 +0530 |
Pulkit Goyal |
tests: add tests for `hg evolve --continue`
|
changeset |
files
|
| Tue, 06 Feb 2018 13:00:28 +0100 |
Pierre-Yves David |
merge with stable
|
changeset |
files
|
| Sun, 04 Feb 2018 21:05:03 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about resolve showing how to continue evolve
|
changeset |
files
|
| Sun, 21 Jan 2018 16:55:02 -0500 |
Matt Harbison |
test: explicitly run HGEDITOR shell command with `sh`
stable
|
changeset |
files
|
| Sun, 21 Jan 2018 16:46:31 -0500 |
Matt Harbison |
test: conditionalize blackbox output for Windows
stable
|
changeset |
files
|
| Mon, 05 Feb 2018 14:36:34 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 05 Feb 2018 20:58:46 +0900 |
Yuya Nishihara |
compat: add wrapper for logcmdutil functions
stable
|
changeset |
files
|
| Mon, 22 Jan 2018 18:35:50 +0530 |
Pulkit Goyal |
evolve: store the revs to be processed in the evolvestate
|
changeset |
files
|
| Mon, 22 Jan 2018 18:18:11 +0530 |
Pulkit Goyal |
evolve: store the replacements in the evolvestate
|
changeset |
files
|
| Mon, 22 Jan 2018 18:13:52 +0530 |
Pulkit Goyal |
evolve: store the target category in evolvestate
|
changeset |
files
|
| Mon, 22 Jan 2018 17:54:27 +0530 |
Pulkit Goyal |
evolvecmd: use the evolvestate object passed as argument in _solveunstable
|
changeset |
files
|
| Mon, 22 Jan 2018 17:44:57 +0530 |
Pulkit Goyal |
evolvecmd: pass evolvestate object to _solve* functions
|
changeset |
files
|
| Mon, 22 Jan 2018 17:29:56 +0530 |
Pulkit Goyal |
evolve: create a state object in all case
|
changeset |
files
|
| Sun, 04 Feb 2018 14:29:18 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 02 Feb 2018 13:59:33 +0530 |
Pulkit Goyal |
grab: preserve phase of the grabbed changeset
|
changeset |
files
|
| Fri, 02 Feb 2018 13:45:47 +0530 |
Pulkit Goyal |
tests: add a test showing grabbing of secret changeset turn it into draft
|
changeset |
files
|
| Fri, 02 Feb 2018 15:37:00 +0530 |
Pulkit Goyal |
grab: add grab info to cmdutil.afterresolvedstates
|
changeset |
files
|
| Sat, 27 Jan 2018 21:15:27 +0530 |
Pulkit Goyal |
evolve: add evolve info to cmdutil.afterresolvedstates
|
changeset |
files
|
| Mon, 29 Jan 2018 17:32:08 +0100 |
Boris Feld |
doc: add link to roadmap
stable
|
changeset |
files
|
| Fri, 19 Jan 2018 19:32:34 +0530 |
Pulkit Goyal |
evolve: move the evolve command to evolvecmd.py
|
changeset |
files
|
| Sun, 21 Jan 2018 20:33:39 +0530 |
Pulkit Goyal |
evolve: move _orderrevs() function evolvecmd.py
|
changeset |
files
|
| Sun, 21 Jan 2018 20:28:06 +0530 |
Pulkit Goyal |
evolve: move builddependencies() and _singlesuccessor() to utility module
|
changeset |
files
|
| Fri, 19 Jan 2018 17:29:48 +0530 |
Pulkit Goyal |
utility: move MultipleSuccessorsError from __init__.py
|
changeset |
files
|
| Fri, 19 Jan 2018 16:44:00 +0530 |
Pulkit Goyal |
evolvecmd: move more core from __init__.py to evolvecmd.py
|
changeset |
files
|
| Fri, 19 Jan 2018 16:00:21 +0530 |
Pulkit Goyal |
evolvecmd: move code from __init__.py to evolvecmd.py
|
changeset |
files
|
| Fri, 19 Jan 2018 15:55:38 +0530 |
Pulkit Goyal |
evolvecmd: move more code from __init__.py to evolvecmd.py
|
changeset |
files
|
| Fri, 19 Jan 2018 15:22:28 +0530 |
Pulkit Goyal |
evolvecmd: move more chunks of code from __init__.py to evolvecmd.py
|
changeset |
files
|
| Fri, 19 Jan 2018 15:04:12 +0530 |
Pulkit Goyal |
evolvecmd: move more functions from __init__.py to evolvecmd.py
|
changeset |
files
|
| Fri, 19 Jan 2018 14:42:46 +0530 |
Pulkit Goyal |
evolvecmd: introduce a new module to handle `hg evolve` related code
|
changeset |
files
|
| Thu, 18 Jan 2018 16:57:19 +0530 |
Pulkit Goyal |
evolve: remove not required calls to phases.retractboundary()
|
changeset |
files
|
| Tue, 16 Jan 2018 17:14:32 +0530 |
Pulkit Goyal |
evolve: store the replacements occurred during `hg evolve` at top level
|
changeset |
files
|
| Sat, 27 Jan 2018 16:13:19 +0530 |
Pulkit Goyal |
evolve: make the _solve* functions return a tuple
|
changeset |
files
|
| Wed, 17 Jan 2018 19:12:32 +0530 |
Pulkit Goyal |
evolvestate: rename the file to state.py and class name to cmdstate
|
changeset |
files
|
| Fri, 26 Jan 2018 17:55:16 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 24 Jan 2018 09:55:12 -0800 |
Martin von Zweigbergk |
update: show "use 'hg evolve' to..." hint iff evolve command enabled
stable
|
changeset |
files
|
| Thu, 25 Jan 2018 17:29:21 -0800 |
Martin von Zweigbergk |
obslog: drop period from summary line in accordance with convention
|
changeset |
files
|
| Thu, 11 Jan 2018 20:03:20 +0530 |
Pulkit Goyal |
grab: add a command to grab a commit and update to it
|
changeset |
files
|
| Mon, 22 Jan 2018 14:10:59 +0530 |
Pulkit Goyal |
amend: query the wdir parent after taking lock (issue5266)
stable
|
changeset |
files
|
| Mon, 22 Jan 2018 13:44:32 +0530 |
Pulkit Goyal |
fold: make sure we move bookmarks after folding (issue5772)
stable
|
changeset |
files
|
| Mon, 22 Jan 2018 13:33:58 +0530 |
Pulkit Goyal |
tests: add a test showing bookmark not moving in-case of `hg fold`
stable
|
changeset |
files
|
| Wed, 24 Jan 2018 15:20:29 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Wed, 24 Jan 2018 15:19:17 +0100 |
Pierre-Yves David |
test: update test output ot reply caps size change
stable
|
changeset |
files
|
| Wed, 24 Jan 2018 15:11:20 +0100 |
Pierre-Yves David |
branching: merge default test output into stable
stable
|
changeset |
files
|
| Wed, 24 Jan 2018 15:08:09 +0100 |
Pierre-Yves David |
branching: open Mercurial 4.4 compatibility branch
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Jan 2018 12:55:23 +0100 |
Pierre-Yves David |
branching: merge release 7.2.1 into default
|
changeset |
files
|
| Sat, 20 Jan 2018 12:48:26 +0100 |
Pierre-Yves David |
packaging: mark source as development version
stable
|
changeset |
files
|
| Sat, 20 Jan 2018 12:53:25 +0100 |
Pierre-Yves David |
Added tag 7.2.1 for changeset 6c772398eb4e
stable
|
changeset |
files
|
| Sat, 20 Jan 2018 12:38:11 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
changeset |
files
|
| Sat, 20 Jan 2018 12:38:10 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
changeset |
files
|
| Sat, 20 Jan 2018 12:38:09 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Sat, 20 Jan 2018 12:28:32 +0100 |
Pierre-Yves David |
packaging: prepare version 7.2.1
stable 7.2.1
|
changeset |
files
|
| Sat, 20 Jan 2018 12:44:02 +0100 |
Pierre-Yves David |
branching: merge with tutorial output update
|
changeset |
files
|
| Sat, 20 Jan 2018 12:28:53 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
changeset |
files
|
| Sat, 20 Jan 2018 12:28:52 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
changeset |
files
|
| Sat, 20 Jan 2018 12:28:40 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Sat, 20 Jan 2018 12:26:39 +0100 |
Boris Feld |
tutorial: docgraph output seems to have been dedented
stable
|
changeset |
files
|
| Sat, 20 Jan 2018 12:17:06 +0100 |
Pierre-Yves David |
test: update output for more verbose blackbox
|
changeset |
files
|
| Sat, 20 Jan 2018 11:59:36 +0100 |
Pierre-Yves David |
test: update with new 'update' hint about obsfate
|
changeset |
files
|
| Sat, 13 Jan 2018 14:35:49 -0800 |
Martin von Zweigbergk |
evolve: update output for wider reporting of troubled changesets
|
changeset |
files
|
| Fri, 19 Jan 2018 19:18:05 +0100 |
Boris Feld |
test: update output for new `merge --abort` message
|
changeset |
files
|
| Sat, 20 Jan 2018 11:13:21 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 20 Jan 2018 11:11:48 +0100 |
Pierre-Yves David |
changelog: mention 4.5 compatibility
stable
|
changeset |
files
|
| Sat, 20 Jan 2018 11:07:18 +0100 |
Martin von Zweigbergk |
trouble-reports: yield to in code reporting of new troubles
stable
|
changeset |
files
|
| Fri, 19 Jan 2018 20:41:58 +0100 |
Pierre-Yves David |
caches: fix automatic warming trigger
stable
|
changeset |
files
|
| Sat, 20 Jan 2018 11:02:44 +0100 |
Pierre-Yves David |
changelog: mention the packaging bugfix
stable
|
changeset |
files
|
| Wed, 17 Jan 2018 20:16:26 +0100 |
Pierre-Yves David |
packaging: properly install the evolve.thirdparty module
stable
|
changeset |
files
|
| Tue, 16 Jan 2018 04:53:09 +0100 |
Pierre-Yves David |
branching: merge release tags into default
|
changeset |
files
|
| Tue, 16 Jan 2018 04:50:38 +0100 |
Pierre-Yves David |
packaging: mark source as development version
stable
|
changeset |
files
|
| Tue, 16 Jan 2018 04:48:57 +0100 |
Pierre-Yves David |
Added tag 7.2.0 for changeset bf6b859807ba
stable
|
changeset |
files
|
| Tue, 16 Jan 2018 04:41:48 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
changeset |
files
|
| Tue, 16 Jan 2018 04:38:04 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
changeset |
files
|
| Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Tue, 16 Jan 2018 03:35:24 +0100 |
Pierre-Yves David |
branching: merge further compat change into stable
stable 7.2.0
|
changeset |
files
|
| Tue, 16 Jan 2018 02:23:35 +0100 |
Pierre-Yves David |
branching: merge further compat change into stable
stable
|
changeset |
files
|
| Tue, 16 Jan 2018 01:18:05 +0100 |
Pierre-Yves David |
branching: merge more compatibility fix into stable
stable
|
changeset |
files
|
| Mon, 15 Jan 2018 21:47:40 +0100 |
Pierre-Yves David |
packaging: merge 7.2.0 into stable
stable
|
changeset |
files
|
| Mon, 15 Jan 2018 20:45:13 +0100 |
Pierre-Yves David |
tests: update test output to match 4.4
stable
|
changeset |
files
|
| Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
changeset |
files
|
| Mon, 15 Jan 2018 19:42:44 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-02fdb8c018aa
stable
|
changeset |
files
|
| Tue, 16 Jan 2018 03:34:31 +0100 |
Pierre-Yves David |
compat: fix argument check for marker reading
|
changeset |
files
|
| Tue, 16 Jan 2018 02:21:44 +0100 |
Pierre-Yves David |
cachevfs: use a compatibility later for all access
|
changeset |
files
|
| Tue, 16 Jan 2018 01:11:47 +0100 |
Pierre-Yves David |
diff: drop default argument value
|
changeset |
files
|
| Tue, 16 Jan 2018 00:58:02 +0100 |
Pierre-Yves David |
test: use hash in test-evolve-topic.t
|
changeset |
files
|
| Mon, 15 Jan 2018 21:45:46 +0100 |
Pierre-Yves David |
packaging: prepare version 7.2.0
|
changeset |
files
|
| Mon, 15 Jan 2018 21:44:22 +0100 |
Pierre-Yves David |
changelog: prepare for coming release
|
changeset |
files
|
| Mon, 15 Jan 2018 20:51:22 +0100 |
Pierre-Yves David |
stablerange: add missing licence and copyright header
|
changeset |
files
|
| Thu, 11 Jan 2018 18:07:09 +0530 |
Pulkit Goyal |
obshistory: pass the csets description in getmarkerdescriptionpatch
|
changeset |
files
|
| Thu, 11 Jan 2018 17:54:34 +0530 |
Pulkit Goyal |
obshistory: remove the unused function
|
changeset |
files
|
| Thu, 11 Jan 2018 17:11:10 +0530 |
Pulkit Goyal |
obslog: add header to the changeset description diff
|
changeset |
files
|
| Thu, 11 Jan 2018 16:30:46 +0530 |
Pulkit Goyal |
obslog: colorize the description diff shown in obslog -p
|
changeset |
files
|
| Wed, 10 Jan 2018 19:47:43 +0530 |
Pulkit Goyal |
obslog: colorize the patch shown using `hg obslog -p`
|
changeset |
files
|
| Wed, 27 Dec 2017 04:09:50 +0530 |
Pulkit Goyal |
topic: suggest using topic when user creates a new head on branch
|
changeset |
files
|
| Mon, 15 Jan 2018 18:41:29 +0100 |
Pierre-Yves David |
changelog: update changelog with some of the benefit from the new format
|
changeset |
files
|
| Thu, 11 Jan 2018 18:36:05 +0530 |
Pulkit Goyal |
evolve: use better words in conflict markers of `hg evolve`
|
changeset |
files
|
| Thu, 11 Jan 2018 18:38:09 +0530 |
Pulkit Goyal |
tests: add a test demonstrating we still use graft in conflict markers
|
changeset |
files
|
| Wed, 10 Jan 2018 15:59:35 +0530 |
Pulkit Goyal |
evolve: remove the old functions for writing evolvestate
|
changeset |
files
|
| Wed, 10 Jan 2018 15:57:43 +0530 |
Pulkit Goyal |
evolve: use the new evolvestate class in place of old methods
|
changeset |
files
|
| Wed, 10 Jan 2018 14:53:01 +0530 |
Pulkit Goyal |
evolvestate: add a class to wrap the state of `hg evolve` command
|
changeset |
files
|
| Fri, 12 Jan 2018 19:23:29 +0530 |
Pulkit Goyal |
evolve: start vendoring third party package cbor
|
changeset |
files
|
| Tue, 09 Jan 2018 20:01:50 +0530 |
Pulkit Goyal |
uncommit: add a new flag `--revert` to discard wdir changes after uncommit
|
changeset |
files
|
| Tue, 09 Jan 2018 15:39:47 +0530 |
Pulkit Goyal |
evolve: use phases.new-commit config to retain phase information (issue5720)
|
changeset |
files
|
| Tue, 09 Jan 2018 15:33:57 +0530 |
Pulkit Goyal |
tests: add a test demonstarting lose of phase in `hg evolve`
|
changeset |
files
|
| Sat, 06 Jan 2018 19:07:43 +0530 |
Pulkit Goyal |
evolve: add a utility fn to check validity of opts passed to `hg evolve`
|
changeset |
files
|
| Sat, 06 Jan 2018 18:48:15 +0530 |
Pulkit Goyal |
evolve: don't use graftstate for continuing `hg evolve`
|
changeset |
files
|
| Tue, 09 Jan 2018 23:42:57 +0530 |
Pulkit Goyal |
topics: add a new templatekeyword `topic`
|
changeset |
files
|
| Wed, 10 Jan 2018 10:54:02 +0000 |
Boris Feld |
packaging: update MANIFEST.in to include new tutorial files
|
changeset |
files
|
| Sat, 16 Dec 2017 23:40:42 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
changeset |
files
|
| Sat, 16 Dec 2017 23:40:40 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
changeset |
files
|
| Sat, 16 Dec 2017 23:40:39 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Wed, 25 Oct 2017 11:27:04 +0200 |
Boris Feld |
test: add a test to reproduce issue 5720
|
changeset |
files
|
| Tue, 04 Jul 2017 14:55:50 +0200 |
Boris Feld |
test: add missing cycle test
|
changeset |
files
|
| Mon, 08 Jan 2018 17:38:58 +0100 |
Boris Feld |
Small typos fixing in the topic tutorial
|
changeset |
files
|
| Mon, 08 Jan 2018 11:46:53 +0100 |
Boris Feld |
doc: import the training support
|
changeset |
files
|
| Fri, 05 Jan 2018 23:20:30 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 05 Jan 2018 17:15:43 +0530 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
changeset |
files
|
| Sat, 09 Dec 2017 08:19:07 +0530 |
Pulkit Goyal |
evolve: use compat.TROUBLES to show troubles in user interface
|
changeset |
files
|
| Thu, 28 Dec 2017 04:09:02 +0530 |
Pulkit Goyal |
topics: list only topic names in quiet mode
|
changeset |
files
|