| Sun, 31 Jan 2021 17:08:40 +0800 |
Anton Shestakov |
packaging: update the debian changelog
stable 10.2.0
|
| Sun, 31 Jan 2021 17:05:48 +0800 |
Anton Shestakov |
changelog: update for evolve 10.2.0
stable
|
| Sun, 31 Jan 2021 17:11:03 +0800 |
Anton Shestakov |
packaging: prepare evolve version 10.2.0
stable
|
| Sat, 30 Jan 2021 20:20:23 +0800 |
Anton Shestakov |
branching: merge into stable in preparation for release
stable
|
| Sat, 30 Jan 2021 20:20:21 +0800 |
Anton Shestakov |
branching: merge stable into default
|
| Fri, 29 Jan 2021 19:23:47 +0800 |
Anton Shestakov |
compat: make enforcesinglehead() compatible with hg <= 5.1 again
stable
|
| Thu, 28 Jan 2021 18:29:53 +0800 |
Anton Shestakov |
compat: fix format_changeset_summary_fn() for hg <= 5.6
|
| Wed, 27 Jan 2021 18:10:27 +0800 |
Anton Shestakov |
changelog: update for 10.1.1
stable
|
| Wed, 27 Jan 2021 18:03:44 +0800 |
Anton Shestakov |
changelog: update for 10.2.0
|
| Tue, 26 Jan 2021 17:14:29 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Fri, 22 Jan 2021 05:37:43 +0100 |
Sushil khanchi |
divergence-resolution: deal with simple "just one moved case" earlier
|
| Fri, 22 Jan 2021 04:54:51 +0100 |
Pierre-Yves David |
divergence-resolution: remove explicite hash in some command
|
| Fri, 22 Jan 2021 04:24:05 +0100 |
Pierre-Yves David |
divergence-resolution: clarify some test case
|
| Fri, 22 Jan 2021 04:10:44 +0100 |
Pierre-Yves David |
divergence-resolution: pass the base changeset to _pickresolutionparent
|
| Fri, 22 Jan 2021 03:59:49 +0100 |
Pierre-Yves David |
divergence-resolution: pre-indent some code
|
| Thu, 22 Oct 2020 21:12:50 +0530 |
Sushil khanchi |
divergence-resolution: return rev from _pickresolutionparent()
|
| Wed, 30 Dec 2020 11:01:37 -0800 |
Chuck Tuffli |
doc: update MQ To Evolve refugee book
stable
|
| Wed, 30 Dec 2020 11:15:01 -0800 |
Chuck Tuffli |
doc: fix build warning for index.rst
stable
|
| Fri, 22 Jan 2021 11:04:55 +0100 |
Pierre-Yves David |
branching: merge stable into default
|
| Thu, 21 Jan 2021 15:01:19 -0500 |
Matt Harbison |
cleanup: ensure log and output messages have a '\n' terminator
stable
|
| Wed, 20 Jan 2021 14:47:22 +0800 |
Anton Shestakov |
tests: update exit code for command errors
stable
|
| Wed, 20 Jan 2021 14:45:30 +0800 |
Anton Shestakov |
tests: update exit code when non-existent help section requested
stable
|
| Wed, 23 Dec 2020 21:34:22 +0800 |
Anton Shestakov |
tests: update exit code in case of push failing because it'd create new heads
stable
|
| Wed, 02 Dec 2020 10:06:22 +0800 |
Anton Shestakov |
tests: update exit code in case of revset parse errors
stable
|
| Wed, 02 Dec 2020 09:55:33 +0800 |
Anton Shestakov |
tests: update exit code in case of unresolved merge conflicts
stable
|
| Thu, 26 Nov 2020 14:26:40 +0800 |
Anton Shestakov |
tests: update with more detailed exit codes
stable
|
| Thu, 19 Nov 2020 08:28:45 -0800 |
Martin von Zweigbergk |
tests: update with more detailed exit codes
stable
|
| Thu, 21 Jan 2021 19:05:17 +0800 |
Anton Shestakov |
tests: remove branch cache entries from test-discovery-obshashrange.t
stable
|
| Thu, 21 Jan 2021 11:21:04 +0800 |
Anton Shestakov |
tests: update branch cache writes in blackbox output
stable
|
| Sun, 13 Dec 2020 09:46:16 -0800 |
Martin von Zweigbergk |
compat: handle change to enforcesinglehead() signature
stable
|
| Tue, 08 Dec 2020 11:58:34 +0800 |
Anton Shestakov |
tests: make sure test-prev-next.t hits lock warning timeout every time
stable
|
| Wed, 02 Dec 2020 09:40:33 +0800 |
Anton Shestakov |
tests: remove trailing "!" from abort messages
stable
|
| Wed, 25 Nov 2020 13:50:37 +0100 |
Anton Shestakov |
compat: wrap debugstrip from core hg if it exists
stable
|
| Mon, 16 Nov 2020 13:08:08 -0800 |
Martin von Zweigbergk |
compat: make topics compatible across change to cmdutil.commitstatus()
stable
|
| Thu, 29 Oct 2020 09:19:37 -0700 |
Martin von Zweigbergk |
tests: rebase now produces different "one-line summary" output
stable
|
| Thu, 21 Jan 2021 19:05:17 +0800 |
Anton Shestakov |
tests: remove branch cache entries from test-discovery-obshashrange.t
|
| Thu, 21 Jan 2021 11:21:04 +0800 |
Anton Shestakov |
tests: update branch cache writes in blackbox output
|
| Wed, 20 Jan 2021 14:47:22 +0800 |
Anton Shestakov |
tests: update exit code for command errors
|
| Wed, 20 Jan 2021 14:45:30 +0800 |
Anton Shestakov |
tests: update exit code when non-existent help section requested
|
| Wed, 23 Dec 2020 23:54:25 +0100 |
Pierre-Yves David |
topic: fix the newly added cache for repository without topic
|
| Tue, 12 Jan 2021 02:03:43 +0800 |
Anton Shestakov |
evolve: typo in pstatus and pdiff docstring
|
| Mon, 11 Jan 2021 00:23:40 +0800 |
Anton Shestakov |
evolve: import mercurial.node as nodemod
|
| Mon, 11 Jan 2021 00:20:27 +0800 |
Anton Shestakov |
topic: remove unused _orderrevs()
|
| Fri, 30 Oct 2020 13:42:33 -0700 |
Martin von Zweigbergk |
prevnext: respect command-templates.oneline-summary if configured
|
| Fri, 30 Oct 2020 13:43:02 -0700 |
Martin von Zweigbergk |
touch: respect command-templates.oneline-summary if configured
|
| Fri, 30 Oct 2020 13:42:51 -0700 |
Martin von Zweigbergk |
evolve: respect command-templates.oneline-summary if configured
|
| Thu, 29 Oct 2020 15:11:20 -0700 |
Martin von Zweigbergk |
evolve: make the `displayer` we pass around just a function
|
| Thu, 29 Oct 2020 14:14:00 -0700 |
Martin von Zweigbergk |
evolvecmd: delete dead assignment to `displayer`
|
| Thu, 15 Oct 2020 15:28:23 -0700 |
Martin von Zweigbergk |
evolvecmd: remove unnecessary default value for commitmsg when relocating
|
| Tue, 24 Nov 2020 18:04:40 -0800 |
Martin von Zweigbergk |
evolve: remove spurious "working directory is now at ..." messages
stable
|
| Thu, 24 Dec 2020 00:52:06 +0100 |
Pierre-Yves David |
changelog: document the workaround committed in b1e057fb7837
stable
|
| Thu, 24 Dec 2020 00:50:19 +0100 |
Pierre-Yves David |
formatting: fix the number of black line
stable
|
| Tue, 22 Dec 2020 20:22:41 -0500 |
Matt Harbison |
topic: disable inmemory rebase to avoid losing the topic
stable
|
| Tue, 01 Dec 2020 00:56:39 +0530 |
Sushil khanchi |
topic: look for topic heads only when necessary
|
| Tue, 01 Dec 2020 00:30:45 +0530 |
Sushil khanchi |
topic: a test to demonstrate a bug in branchheads()
|
| Wed, 23 Dec 2020 13:50:23 +0100 |
Pierre-Yves David |
topic: wrap branch call during summary
|
| Wed, 23 Dec 2020 13:49:45 +0100 |
Pierre-Yves David |
topic: also wrap the `ctx.branch` of parents
|
| Wed, 23 Dec 2020 13:36:02 +0100 |
Pierre-Yves David |
topic: extract awful `ctx.branch` hijacking used in discovery
|
| Wed, 23 Dec 2020 21:34:22 +0800 |
Anton Shestakov |
tests: update exit code in case of push failing because it'd create new heads
|
| Wed, 16 Dec 2020 16:23:52 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Sun, 13 Dec 2020 14:48:28 +0100 |
Pierre-Yves David |
topic: add a basic in-memory cache for topic information
|
| Tue, 01 Dec 2020 21:05:53 +0100 |
Georges Racinet |
head-checking: micro-optimize _filter_obsolete_heads
|
| Fri, 20 Nov 2020 21:38:48 +0100 |
Georges Racinet |
heptapod-ci: new address for the evolve-doc base image
stable
|
| Fri, 20 Nov 2020 21:32:38 +0100 |
Georges Racinet |
heptapod-ci: new address for base Docker images
stable
|
| Sun, 13 Dec 2020 09:46:16 -0800 |
Martin von Zweigbergk |
compat: handle change to enforcesinglehead() signature
|
| Tue, 08 Dec 2020 11:58:34 +0800 |
Anton Shestakov |
tests: make sure test-prev-next.t hits lock warning timeout every time
|
| Wed, 02 Dec 2020 10:06:22 +0800 |
Anton Shestakov |
tests: update exit code in case of revset parse errors
|
| Wed, 02 Dec 2020 09:55:33 +0800 |
Anton Shestakov |
tests: update exit code in case of unresolved merge conflicts
|
| Wed, 02 Dec 2020 09:40:33 +0800 |
Anton Shestakov |
tests: remove trailing "!" from abort messages
|
| Fri, 27 Nov 2020 09:47:01 +0800 |
Anton Shestakov |
strip: remove experimental.prunestrip option
|
| Thu, 26 Nov 2020 07:40:10 +0100 |
Pierre-Yves David |
branching: merge with stable into default
|
| Thu, 26 Nov 2020 14:26:40 +0800 |
Anton Shestakov |
tests: update with more detailed exit codes
|
| Thu, 26 Nov 2020 09:56:26 +0800 |
Anton Shestakov |
tests: use debugstrip core command for testing prunestrip
|
| Wed, 25 Nov 2020 13:50:37 +0100 |
Anton Shestakov |
compat: wrap debugstrip from core hg if it exists
|
| Thu, 19 Nov 2020 08:28:45 -0800 |
Martin von Zweigbergk |
tests: update with more detailed exit codes
|
| Mon, 16 Nov 2020 13:08:08 -0800 |
Martin von Zweigbergk |
compat: make topics compatible across change to cmdutil.commitstatus()
|
| Mon, 23 Nov 2020 13:43:29 +0800 |
Anton Shestakov |
test2rst: minor improvements
stable
|
| Wed, 11 Nov 2020 18:34:15 +0800 |
Anton Shestakov |
packaging: run sphinx on py3 by default
stable
|
| Sun, 23 Aug 2020 10:09:44 +0800 |
Anton Shestakov |
docs: build using py3 image
stable
|
| Mon, 06 Jul 2020 00:17:44 +0800 |
Anton Shestakov |
docs: make docs/conf.py compatible with Python 3
stable
|
| Mon, 09 Nov 2020 23:10:06 +0800 |
Anton Shestakov |
test2rst: use python3
stable
|
| Mon, 09 Nov 2020 23:08:15 +0800 |
Anton Shestakov |
test2rst: now that we don't use directory mode, remove it too
stable
|
| Mon, 09 Nov 2020 22:37:05 +0800 |
Anton Shestakov |
packaging: use automatic variables for running test2rst.py
stable
|
| Mon, 09 Nov 2020 23:03:31 +0800 |
Anton Shestakov |
test2rst: remove the abandoned index building part
stable
|
| Mon, 09 Nov 2020 22:58:37 +0800 |
Anton Shestakov |
test2rst: make one_file() useful
stable
|
| Sun, 23 Aug 2020 09:36:36 +0800 |
Anton Shestakov |
docs: properly capitalize LANG value
stable
|
| Mon, 06 Jul 2020 00:17:16 +0800 |
Anton Shestakov |
docs: refactor docs/conf.py a bit
stable
|
| Thu, 12 Nov 2020 13:37:35 +0800 |
Anton Shestakov |
tests: add a new test-check-tag.t to test releases
stable
|
| Wed, 11 Nov 2020 19:03:34 +0800 |
Anton Shestakov |
tests: update the experimental.evolution=all comment
stable
|
| Wed, 11 Nov 2020 19:01:35 +0800 |
Anton Shestakov |
tests: move experimental.evolution=all config option closer to the comment
stable
|
| Wed, 11 Nov 2020 18:56:37 +0800 |
Anton Shestakov |
tests: require repo in test-check-debian.t
stable
|
| Wed, 11 Nov 2020 18:50:40 +0800 |
Anton Shestakov |
tests: update comment in test-check-flake8.t
stable
|
| Wed, 11 Nov 2020 18:48:56 +0800 |
Anton Shestakov |
tests: update comment in test-check-pyflakes.t
stable
|
| Thu, 29 Oct 2020 09:19:37 -0700 |
Martin von Zweigbergk |
tests: rebase now produces different "one-line summary" output
|
| Sat, 31 Oct 2020 18:51:09 +0100 |
Pierre-Yves David |
branching: merge stable into default
|
| Sat, 31 Oct 2020 18:42:25 +0100 |
Pierre-Yves David |
packaging: update the debian changelog
stable
|
| Sat, 31 Oct 2020 20:28:42 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Sat, 31 Oct 2020 20:27:10 +0800 |
Anton Shestakov |
Added tag 10.1.0 for changeset 782cbadb123f
stable
|
| Sat, 31 Oct 2020 20:21:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sat, 31 Oct 2020 20:13:46 +0800 |
Anton Shestakov |
tests: back out changeset ba8bc1b0acd2
mercurial-4.7
|
| Sat, 31 Oct 2020 20:02:03 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Sat, 31 Oct 2020 19:43:46 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Sat, 31 Oct 2020 19:38:46 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Sat, 31 Oct 2020 19:33:42 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Sat, 31 Oct 2020 19:10:55 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Sat, 31 Oct 2020 19:05:48 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Sat, 31 Oct 2020 18:55:21 +0800 |
Anton Shestakov |
tests: adjust test output after b2de5825e5ca for older Mercurial
mercurial-5.3
|
| Sat, 31 Oct 2020 18:48:57 +0800 |
Anton Shestakov |
tests: back out changeset 028e4ea75456
mercurial-5.3
|
| Sat, 31 Oct 2020 18:37:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sat, 31 Oct 2020 18:31:11 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.5 into mercurial-5.4
mercurial-5.4
|
| Sat, 31 Oct 2020 18:11:27 +0800 |
Anton Shestakov |
tests: back out changeset 0d5c344c0ba4
mercurial-5.5
|
| Sat, 31 Oct 2020 18:11:13 +0800 |
Anton Shestakov |
tests: back out changeset f3870eecf859
mercurial-5.5
|
| Sat, 31 Oct 2020 18:07:23 +0800 |
Anton Shestakov |
tests: back out changeset 87c4b86081c1
mercurial-5.5
|
| Sat, 31 Oct 2020 18:06:07 +0800 |
Anton Shestakov |
tests: back out changeset 3b7df91c2ba7
mercurial-5.5
|
| Sat, 31 Oct 2020 17:47:08 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.5
mercurial-5.5
|
| Sat, 31 Oct 2020 17:42:01 +0800 |
Anton Shestakov |
packaging: prepare evolve version 10.1.0
stable 10.1.0
|
| Sat, 31 Oct 2020 17:38:11 +0800 |
Anton Shestakov |
changelog: update for evolve 10.1.0
stable
|
| Sat, 31 Oct 2020 17:25:32 +0800 |
Anton Shestakov |
branching: merge into stable in preparation for release
stable
|
| Sat, 31 Oct 2020 02:36:21 +0800 |
Anton Shestakov |
changelog: update for 10.0.3
stable
|
| Sat, 31 Oct 2020 02:34:31 +0800 |
Anton Shestakov |
changelog: update for 10.1.0
|
| Wed, 28 Oct 2020 20:24:26 +0100 |
Pierre-Yves David |
branching: merge stable into default
|
| Sat, 19 Sep 2020 17:49:31 +0200 |
Anton Shestakov |
evolve: clean merge state when content divergence resolution has no changes
stable
|
| Fri, 08 May 2020 19:49:07 +0800 |
Anton Shestakov |
test-compat: back out changeset 591a0afd2ef3
stable
|
| Fri, 08 May 2020 19:22:36 +0800 |
Anton Shestakov |
test-compat: back out changeset 4da1d21231ae
stable
|
| Fri, 09 Oct 2020 08:39:15 -0700 |
Martin von Zweigbergk |
tests: {successorssets} now always return a list, affecting json output
stable
|
| Fri, 02 Oct 2020 10:09:14 -0700 |
Martin von Zweigbergk |
compat: add implementations of new merge.update() and merge.clean_update()
stable
|
| Fri, 02 Oct 2020 09:51:45 -0700 |
Martin von Zweigbergk |
compat: rename update() to _update() to make room for a new update()
stable
|
| Sun, 25 Oct 2020 21:38:37 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for json.tool
|
| Sat, 24 Oct 2020 23:55:15 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for random-revs.py
|
| Sat, 24 Oct 2020 23:47:01 +0800 |
Anton Shestakov |
tests: move ad-hoc random_rev.py to testlib/random-revs.py
|
| Sat, 24 Oct 2020 23:26:41 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for md5sum.py
|
| Mon, 26 Oct 2020 18:32:22 +0100 |
Pierre-Yves David |
test-compat: create a new compatibility branch mercurial-5.5
mercurial-5.5
|
| Fri, 25 Sep 2020 09:13:57 -0700 |
Martin von Zweigbergk |
compat: add support for upstream rename of merge.update() to _update()
stable
|
| Wed, 14 Oct 2020 12:10:05 +0200 |
Sushil khanchi |
unstable-list: add an item about author divergence resolution
|
| Wed, 14 Oct 2020 12:09:41 +0200 |
Sushil khanchi |
unstable-list: add an item about divergence on changeset description
|
| Wed, 14 Oct 2020 12:09:15 +0200 |
Sushil khanchi |
unstable-list: add an item for solving named branch divergence
|
| Tue, 20 Oct 2020 10:33:46 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Mon, 12 Oct 2020 12:33:18 +0200 |
Sietse Brouwer |
ngtip: make revset help text slightly more descriptive
stable
|
| Wed, 07 Oct 2020 09:34:59 +0200 |
Sietse Brouwer |
ngtip: fix TypeError: make revset from revs, not nodes (issue6405)
stable
|
| Wed, 14 Oct 2020 15:48:37 +0200 |
Pierre-Yves David |
topic: add a `exp….topic.linear-merge` option to allow some oedipus
|
| Thu, 15 Oct 2020 19:46:38 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Sun, 11 Oct 2020 20:50:02 +0800 |
Anton Shestakov |
rewind: actually track folds using fold-* metadata in obsmarkers
|
| Mon, 12 Oct 2020 12:09:39 +0200 |
Sietse Brouwer |
readme: fix syntax of format-source link
stable
|
| Fri, 25 Sep 2020 21:47:30 -0700 |
Martin von Zweigbergk |
evolvecmd: move bookmark-deactivation out of _relocatecommit()
|
| Fri, 25 Sep 2020 15:28:17 -0700 |
Martin von Zweigbergk |
evolve: deactivate bookmark before updating to destination
|
| Fri, 25 Sep 2020 13:31:41 -0700 |
Martin von Zweigbergk |
evolvecmd: inline _evolvemerge() into _relocatecommit()
|
| Fri, 25 Sep 2020 13:12:57 -0700 |
Martin von Zweigbergk |
evolvecmd: reorder some functions to match order they're called
|
| Thu, 24 Sep 2020 16:54:13 -0700 |
Martin von Zweigbergk |
evolvecmd: rename `r` to usual `stats`
|
| Thu, 24 Sep 2020 16:34:04 -0700 |
Martin von Zweigbergk |
evolvecmd: simplify code for moving bookmarks when relocating node
|
| Thu, 24 Sep 2020 16:15:58 -0700 |
Martin von Zweigbergk |
evolvecmd: delete bookmark-handling code obsolete since move away from rebase
|
| Thu, 24 Sep 2020 15:33:01 -0700 |
Martin von Zweigbergk |
evolvecmd: rename _solveunstable() to _solveorphan()
|
| Wed, 14 Oct 2020 12:08:23 +0200 |
Sushil khanchi |
unstable-list: add "merging metadata" section for content-divergence
|
| Sat, 10 Oct 2020 22:44:24 +0530 |
Sushil khanchi |
unstable-list: add split and fold in content-divergence resolution
|
| Tue, 22 Sep 2020 13:50:45 +0530 |
Sushil khanchi |
unstable-list: add "merging files" section for content-divergence
|
| Tue, 22 Sep 2020 13:50:06 +0530 |
Sushil khanchi |
unstable-list: add "finding the resolution parent" section
|
| Tue, 22 Sep 2020 13:49:10 +0530 |
Sushil khanchi |
unstable-list: add a "details of resolution" section for content-divergence
|
| Sat, 10 Oct 2020 14:04:11 +0530 |
Sushil khanchi |
unstable-list: add new subsections for orphan when parent is pruned
|
| Sat, 10 Oct 2020 14:04:02 +0530 |
Sushil khanchi |
unstable-list: some minor updates
|
| Fri, 09 Oct 2020 08:39:15 -0700 |
Martin von Zweigbergk |
tests: {successorssets} now always return a list, affecting json output
|
| Thu, 17 Sep 2020 14:11:38 -0400 |
Matt Harbison |
discovery: list the new heads like core does when failing a multi-head push
|
| Fri, 21 Aug 2020 18:05:37 +0530 |
Sushil khanchi |
evolve: remove trailing white spaces
|
| Fri, 21 Aug 2020 18:04:48 +0530 |
Sushil khanchi |
evolve: refactor some error raising logic in content-divergence
|
| Fri, 21 Aug 2020 16:22:24 +0530 |
Sushil khanchi |
evolve: update public content divergence acc. to new behavior
|
| Fri, 21 Aug 2020 01:28:33 +0530 |
Sushil khanchi |
evolve: move a line a code block above
|
| Fri, 21 Aug 2020 01:27:58 +0530 |
Sushil khanchi |
evolve: rename a func and some updates around it
|
| Thu, 20 Aug 2020 23:54:27 +0530 |
Sushil khanchi |
evolve: update some comments
|
| Fri, 21 Aug 2020 01:04:08 +0530 |
Sushil khanchi |
evolve: no need to return divergent and other
|
| Fri, 21 Aug 2020 00:56:24 +0530 |
Sushil khanchi |
evolve: remove an evolvestate which is no more required
|
| Sun, 20 Sep 2020 09:22:04 +0530 |
Sushil khanchi |
evolve: remove swapping nodes logic while resolving divergence
|
| Fri, 25 Sep 2020 11:06:46 -0700 |
Martin von Zweigbergk |
evolve: don't set evolved node as dirstate p2
|
| Thu, 17 Sep 2020 21:19:13 +0200 |
Pierre-Yves David |
changelog: mention `hg rewind --dry-run`
|
| Tue, 22 Sep 2020 13:43:41 +0530 |
Sushil khanchi |
evolve: update docstring for mergeusers()
|
| Fri, 02 Oct 2020 10:09:14 -0700 |
Martin von Zweigbergk |
compat: add implementations of new merge.update() and merge.clean_update()
|
| Fri, 02 Oct 2020 09:51:45 -0700 |
Martin von Zweigbergk |
compat: rename update() to _update() to make room for a new update()
|
| Fri, 25 Sep 2020 09:13:57 -0700 |
Martin von Zweigbergk |
compat: add support for upstream rename of merge.update() to _update()
|
| Thu, 17 Sep 2020 23:41:14 -0400 |
Matt Harbison |
tests: conditonalize a Windows only output in test-evolve-progress.t
stable
|
| Sat, 19 Sep 2020 17:56:01 +0200 |
Pierre-Yves David |
ci: drop extraneous space
|
| Thu, 20 Aug 2020 17:32:22 +0530 |
Sushil khanchi |
evolve: resolutionparent should be succs of otherp1
|
| Thu, 13 Aug 2020 18:10:51 +0530 |
Sushil khanchi |
evolve: handle preparation logic for public divergence in one block
|
| Thu, 13 Aug 2020 17:22:19 +0530 |
Sushil khanchi |
evolve: add logic to decide local and other side before merge
|
| Wed, 05 Aug 2020 14:25:29 +0530 |
Sushil khanchi |
evolve: add some initial values in evolvestate
|
| Wed, 05 Aug 2020 14:19:29 +0530 |
Sushil khanchi |
evolve: move initial evolvestate values to main function
|
| Mon, 31 Aug 2020 15:35:31 +0530 |
Sushil khanchi |
evolve: set other side of public content div using mutability
|
| Mon, 31 Aug 2020 15:34:12 +0530 |
Sushil khanchi |
evolve: update some comments
|
| Thu, 13 Aug 2020 13:30:25 +0530 |
Sushil khanchi |
evolve: move a comment where it's going to belong
|
| Thu, 13 Aug 2020 13:28:09 +0530 |
Sushil khanchi |
evolve: update some comments acc. to upcoming behavior
|
| Wed, 12 Aug 2020 17:30:18 +0530 |
Sushil khanchi |
evolve: move a block of code up for early return
|
| Wed, 12 Aug 2020 17:21:05 +0530 |
Sushil khanchi |
evolve: rename haspubdiv to haspublicdiv for more clarity
|
| Fri, 07 Aug 2020 00:25:13 +0530 |
Sushil khanchi |
evolve: add some assertions
|
| Thu, 06 Aug 2020 18:24:32 +0530 |
Sushil khanchi |
evolve: rename param `divergent` to `local` in a function
|
| Wed, 05 Aug 2020 15:04:48 +0530 |
Sushil khanchi |
evolve: rely on resolutionparent when relocating divergent csets
|
| Wed, 26 Aug 2020 09:07:52 -0700 |
Martin von Zweigbergk |
compat: let cleanupnodes() handle compat across hg commit b99903534e06
stable
|
| Wed, 26 Aug 2020 08:18:59 -0700 |
Martin von Zweigbergk |
compat: add a cleanupnodes() function
stable
|
| Tue, 25 Aug 2020 22:34:33 -0700 |
Martin von Zweigbergk |
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
stable
|
| Tue, 25 Aug 2020 22:50:28 -0700 |
Martin von Zweigbergk |
tests: show how metaedit doesn't update bookmarks
stable
|
| Tue, 21 Jul 2020 11:23:41 +0800 |
Anton Shestakov |
rewind: always compute successorsmap
|
| Tue, 21 Jul 2020 01:04:43 +0800 |
Anton Shestakov |
rewind: add a --dry-run flag
|
| Tue, 21 Jul 2020 01:03:18 +0800 |
Anton Shestakov |
rewind: avoid yoda condition
|
| Thu, 17 Sep 2020 19:51:08 +0800 |
Anton Shestakov |
tests: graphlog now only shows '%' if there are unresolved conflicts
|
| Thu, 17 Sep 2020 20:26:55 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Thu, 17 Sep 2020 20:05:39 +0200 |
Pierre-Yves David |
test: adjust output to current stable
stable
|
| Thu, 17 Sep 2020 14:51:45 +0530 |
Pulkit Goyal |
evolvecmd: don't set `branchmerge=True` while resolving phase divergence
stable
|
| Thu, 17 Sep 2020 18:58:47 +0200 |
Pierre-Yves David |
gitlab-ci: display the Mercurial revision used to run the test
stable
|
| Tue, 21 Jul 2020 01:02:46 +0800 |
Anton Shestakov |
rewind: sort imports
|
| Wed, 15 Jul 2020 10:10:55 +0800 |
Anton Shestakov |
tests: less words and less markup to maintain in test-rewind.t
|
| Thu, 10 Sep 2020 03:11:41 +0200 |
Pierre-Yves David |
changelog: mention the config source fix from Matt Harbisson
stable
|
| Sat, 05 Sep 2020 14:46:36 -0400 |
Matt Harbison |
config: specify the extension when forcing a config option
stable
|
| Sat, 05 Sep 2020 00:07:01 -0400 |
Matt Harbison |
tests: use the modern config setting to enable evolution in topic tests
stable
|
| Tue, 08 Sep 2020 11:56:17 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Tue, 08 Sep 2020 11:24:38 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Tue, 08 Sep 2020 11:23:45 +0800 |
Anton Shestakov |
Added tag 10.0.2 for changeset 1cce884c9448
stable
|
| Tue, 08 Sep 2020 11:21:49 +0800 |
Anton Shestakov |
packaging: prepare version 10.0.2
stable 10.0.2
|
| Sun, 06 Sep 2020 06:02:34 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 06 Sep 2020 06:02:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Sun, 06 Sep 2020 06:02:24 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Sun, 06 Sep 2020 05:47:32 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Sun, 06 Sep 2020 05:45:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Sun, 06 Sep 2020 05:42:26 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Sun, 06 Sep 2020 05:40:19 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Sun, 06 Sep 2020 05:38:24 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sun, 06 Sep 2020 05:36:04 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.4
mercurial-5.4
|
| Sun, 06 Sep 2020 05:32:36 +0800 |
Anton Shestakov |
changelog: update for 10.0.2
stable
|
| Fri, 04 Sep 2020 21:33:11 +0200 |
Pierre-Yves David |
changelog: mention the various fix to content-divergence solving
|
| Tue, 01 Sep 2020 10:41:42 +0530 |
Sushil khanchi |
evolve: refactor few lines for clear understanding
|
| Mon, 31 Aug 2020 01:19:12 +0530 |
Sushil khanchi |
evolve: update "old-other" in evolvestate for --stop functionality
|
| Tue, 04 Aug 2020 23:44:08 +0530 |
Sushil khanchi |
evolve: make consistent usage of variable throughout the func
|
| Mon, 31 Aug 2020 01:10:58 +0530 |
Sushil khanchi |
evolve: make sure we don't miss merging content of divergent changesets
|
| Wed, 05 Aug 2020 00:16:26 +0530 |
Sushil khanchi |
evolve: add test to show broken --continue case of content divergence
|
| Wed, 26 Aug 2020 00:05:52 -0700 |
Martin von Zweigbergk |
dirstate: replace _uncommitdirstate() by core's movedirstate()
stable
|
| Thu, 03 Sep 2020 09:21:58 -0700 |
Martin von Zweigbergk |
tests: add test showing that `hg uncommit --rev` can fail to mark file added
stable
|
| Wed, 26 Aug 2020 17:25:02 +0530 |
Sushil khanchi |
evolve: use evolvestate instead of populating a variable in functions
|
| Tue, 25 Aug 2020 22:34:33 -0700 |
Martin von Zweigbergk |
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
|
| Tue, 25 Aug 2020 22:50:28 -0700 |
Martin von Zweigbergk |
tests: show how metaedit doesn't update bookmarks
|
| Tue, 01 Sep 2020 23:35:43 -0400 |
Matt Harbison |
topic: fix the `topic(...)` revset to not select commits without a topic
stable
|
| Wed, 26 Aug 2020 14:09:09 +0200 |
Pierre-Yves David |
unstable-list: fix title level
|
| Wed, 26 Aug 2020 13:07:57 +0200 |
Pierre-Yves David |
unstable-list: add local table of content of each details section
|
| Wed, 26 Aug 2020 13:07:35 +0200 |
Pierre-Yves David |
unstable-list: add a general table of content
|
| Wed, 26 Aug 2020 16:10:29 +0200 |
Pierre-Yves David |
unstable-list: move copytright after the title
|
| Sat, 22 Aug 2020 07:24:46 +0800 |
Anton Shestakov |
split: use the last created commit as target for discard action
stable
|
| Sat, 22 Aug 2020 07:18:55 +0800 |
Anton Shestakov |
split: demonstrate that discard after more than one commit is misbehaving
stable
|
| Tue, 18 Aug 2020 12:35:24 +0530 |
Sushil khanchi |
unstable-list: add cause-of-trouble for content-divergence
|
| Tue, 18 Aug 2020 19:32:13 +0530 |
Sushil khanchi |
unstable-list: mark the subsection as yet to document
|
| Wed, 26 Aug 2020 12:03:32 +0200 |
Pierre-Yves David |
unstable-list: expand and clarify the source of complexity for phase-div
|
| Tue, 18 Aug 2020 08:47:15 +0530 |
Sushil khanchi |
unstable-list: add source-of-complexity for phase-divergence
|
| Wed, 26 Aug 2020 11:55:19 +0200 |
Pierre-Yves David |
unstable-list: expand a bit the "cause of trouble" for phase divergence
|
| Mon, 17 Aug 2020 16:52:26 +0530 |
Sushil khanchi |
unstable-list: add cause-of-trouble section for phase-divergence
|
| Wed, 26 Aug 2020 11:51:14 +0200 |
Pierre-Yves David |
unstable-list: simplify the basic
|
| Mon, 17 Aug 2020 16:44:13 +0530 |
Sushil khanchi |
unstable-list: add basic section for phase-divergence
|
| Mon, 17 Aug 2020 13:47:52 +0530 |
Sushil khanchi |
unstable-list: some cleanup
|
| Wed, 26 Aug 2020 12:39:47 +0200 |
Pierre-Yves David |
unstable-list: some details about phase divergence
|
| Fri, 14 Aug 2020 18:05:33 +0200 |
Pierre-Yves David |
unstable-list: add basic description of content divergence
|
| Fri, 14 Aug 2020 18:04:22 +0200 |
Pierre-Yves David |
unstable-list: more entry for orphan SPLIT ME
|
| Fri, 14 Aug 2020 18:03:13 +0200 |
Pierre-Yves David |
unstable-list: add a entry about pruned parent
|
| Fri, 14 Aug 2020 18:01:53 +0200 |
Pierre-Yves David |
unstable-list: add a simple entry for the simplest orphan case
|
| Fri, 14 Aug 2020 18:10:10 +0200 |
Pierre-Yves David |
unstable-list: add list the source of complexity during resolution
|
| Fri, 14 Aug 2020 18:09:42 +0200 |
Pierre-Yves David |
unstable-list: add information about when/why orphan appears
|
| Fri, 14 Aug 2020 18:08:48 +0200 |
Pierre-Yves David |
unstable-list: add the basic about orphan changesets
|
| Fri, 14 Aug 2020 17:59:51 +0200 |
Pierre-Yves David |
unstable-list: add an introduction text
|
| Fri, 14 Aug 2020 17:58:21 +0200 |
Pierre-Yves David |
doc: add the bases of a developer doc for instability
|
| Tue, 25 Aug 2020 10:12:29 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Fri, 21 Aug 2020 23:04:03 +0800 |
Anton Shestakov |
split: compatibility with cmdutil.revert() without parents argument
stable
|
| Fri, 21 Aug 2020 21:37:37 +0800 |
Anton Shestakov |
rewind: compatibility with cmdutil.revert() without parents argument
stable
|
| Fri, 24 Jul 2020 00:18:12 +0530 |
Sushil khanchi |
evolve: test that new suggestions works
|
| Wed, 22 Jul 2020 23:40:24 +0530 |
Sushil khanchi |
evolve: improve warning msg when skipping orphan resolution
|
| Wed, 22 Jul 2020 23:37:59 +0530 |
Sushil khanchi |
orphan: fix buggy case of try resolving orphan merge two times
|
| Tue, 28 Jul 2020 14:26:44 +0530 |
Sushil khanchi |
evolve: add more testing for parent-child form content-div
|
| Sun, 26 Jul 2020 01:02:22 +0530 |
Sushil khanchi |
evolve: fix content-div resolution when in parent-child form
|
| Sun, 26 Jul 2020 00:35:52 +0530 |
Sushil khanchi |
tests: add a log -G to demonstrate a fix in next patch
|
| Mon, 30 Dec 2019 00:43:17 +0530 |
Sushil khanchi |
test: no need to look at full log
|
| Fri, 07 Aug 2020 12:46:17 +0800 |
Anton Shestakov |
tests: update output to match c515c54f6530 in core
|
| Sun, 02 Aug 2020 12:02:09 +0800 |
Anton Shestakov |
py3: use '%d' for formatting revision numbers in stable range cache warning
stable
|
| Fri, 31 Jul 2020 22:07:49 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Fri, 31 Jul 2020 19:19:13 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 31 Jul 2020 19:14:30 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 31 Jul 2020 19:12:44 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Fri, 31 Jul 2020 19:02:33 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Fri, 31 Jul 2020 18:54:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Fri, 31 Jul 2020 18:40:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Fri, 31 Jul 2020 18:25:50 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Fri, 31 Jul 2020 18:16:04 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Fri, 31 Jul 2020 18:09:18 +0800 |
Anton Shestakov |
test-compat: back out changeset 0d65a5e96691
mercurial-5.4
|
| Fri, 31 Jul 2020 18:03:43 +0800 |
Anton Shestakov |
test-compat: back out changeset 58b0dfc6dd52
mercurial-5.4
|
| Fri, 31 Jul 2020 17:39:00 +0800 |
Anton Shestakov |
test-compat: create a new compatibility branch mercurial-5.4
mercurial-5.4
|
| Fri, 31 Jul 2020 20:00:57 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Fri, 31 Jul 2020 19:58:41 +0800 |
Anton Shestakov |
Added tag 10.0.1 for changeset fb543438704b
stable
|
| Fri, 31 Jul 2020 19:56:37 +0800 |
Anton Shestakov |
packaging: prepare version 10.0.1
stable 10.0.1
|
| Fri, 12 Jun 2020 15:42:43 +0800 |
Anton Shestakov |
topic: substitute current topic when `--topic .` is used for outgoing/push
stable
|
| Thu, 11 Jun 2020 18:50:29 +0800 |
Anton Shestakov |
topic: treat argument to --topic as a literal topic name explicitly
stable
|
| Mon, 27 Jul 2020 13:11:55 +0800 |
Anton Shestakov |
changelog: update for evolve 10.1.0
|
| Mon, 27 Jul 2020 12:53:53 +0800 |
Anton Shestakov |
changelog: update for evolve 10.0.1
stable
|
| Wed, 03 Jun 2020 18:47:23 +0800 |
Anton Shestakov |
tests: remove unnecessary command flags from test-rewind.t
|
| Wed, 03 Jun 2020 16:56:06 +0800 |
Anton Shestakov |
tests: shorten and simplify global setup section in test-rewind.t
|
| Wed, 03 Jun 2020 16:28:33 +0800 |
Anton Shestakov |
tests: move hg clone above case description in test-rewind.t
|
| Thu, 28 May 2020 12:08:59 +0800 |
Anton Shestakov |
tests: actually test what the header promises to test
|
| Thu, 28 May 2020 12:07:59 +0800 |
Anton Shestakov |
tests: move default-date manipulation closer to the commands that need it
|
| Mon, 25 May 2020 19:58:33 +0800 |
Anton Shestakov |
rewind: past tense of rewind is rewound
|
| Mon, 25 May 2020 19:58:11 +0800 |
Anton Shestakov |
rewind: use ui directly
|
| Mon, 25 May 2020 19:57:34 +0800 |
Anton Shestakov |
rewind: rename _select_rewinded() to _select_rewind_targets()
|
| Fri, 24 Jul 2020 10:50:53 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Fri, 24 Jul 2020 11:04:07 +0530 |
Sushil khanchi |
evolve: minor fixes in stablesort documentation
|
| Wed, 22 Jul 2020 12:25:41 +0200 |
Pierre-Yves David |
test-obsolete: remove divergence casually introduced by rebase
stable
|
| Wed, 22 Jul 2020 14:23:58 +0200 |
Sushil khanchi |
test-obsolete: move a divergence related test from the main test
stable
|
| Wed, 22 Jul 2020 14:48:09 +0200 |
Pierre-Yves David |
test-obsolete: remove an explicit node usage
stable
|
| Wed, 22 Jul 2020 12:28:32 +0200 |
Pierre-Yves David |
test-obsolete: remove revnum usage for a good share of the test
stable
|
| Wed, 22 Jul 2020 12:24:58 +0200 |
Pierre-Yves David |
test-obsolete: drop outdated comment in test
stable
|
| Wed, 22 Jul 2020 12:26:52 +0200 |
Pierre-Yves David |
test-obsolete: remove outdated comment about rebase output
stable
|
| Wed, 22 Jul 2020 08:41:09 +0200 |
Pierre-Yves David |
compat: byteify the message about discovery "overflow"
stable
|
| Wed, 22 Jul 2020 07:41:21 +0800 |
Anton Shestakov |
tests: new error message format for rebase
stable
|
| Sat, 04 Jul 2020 21:02:37 +0800 |
Anton Shestakov |
tests: the list of extensions in `hg version -v` is now sorted
stable
|
| Fri, 29 May 2020 14:29:03 +0800 |
Anton Shestakov |
compat: compatibility for mergestate being a separate module in 5.5
stable
|
| Tue, 21 Jul 2020 12:52:52 +0800 |
Anton Shestakov |
pullbundle: compatibility with discovery.outgoing and ancestorsof in 5.5
stable
|
| Tue, 21 Jul 2020 11:59:28 +0800 |
Joerg Sonnenberger |
topic: compatibility with sparse phaseroots and phasesets in 5.5
stable
|
| Tue, 21 Jul 2020 11:59:10 +0800 |
Joerg Sonnenberger |
serverminitopic: compatibility with sparse phaseroots and phasesets in 5.5
stable
|
| Tue, 21 Jul 2020 12:52:52 +0800 |
Anton Shestakov |
pullbundle: compatibility with discovery.outgoing and ancestorsof in 5.5
|
| Tue, 21 Jul 2020 11:59:28 +0800 |
Joerg Sonnenberger |
topic: compatibility with sparse phaseroots and phasesets in 5.5
|
| Tue, 21 Jul 2020 11:59:10 +0800 |
Joerg Sonnenberger |
serverminitopic: compatibility with sparse phaseroots and phasesets in 5.5
|
| Fri, 17 Jul 2020 10:00:43 +0800 |
Anton Shestakov |
release: update line link to the release checklist
|
| Fri, 17 Jul 2020 09:56:22 +0800 |
Anton Shestakov |
readme: improve the extension purpose section
|
| Fri, 17 Jul 2020 09:52:37 +0800 |
Anton Shestakov |
readme: shorter path to byteify-strings.py and not editing per-user config
|
| Fri, 17 Jul 2020 09:50:27 +0800 |
Anton Shestakov |
readme: improve wording in the contributing section
|
| Fri, 17 Jul 2020 09:43:37 +0800 |
Anton Shestakov |
readme: update py3 support section
|
| Fri, 17 Jul 2020 09:42:16 +0800 |
Anton Shestakov |
readme: split server-only section and reduce word count
|
| Fri, 17 Jul 2020 09:41:52 +0800 |
Anton Shestakov |
readme: it's possible to use evolve without installing
|
| Fri, 17 Jul 2020 09:40:56 +0800 |
Anton Shestakov |
readme: mention docs/ in the documentation section
|
| Fri, 17 Jul 2020 09:39:10 +0800 |
Anton Shestakov |
readme: link to ChangesetEvolution, reword a couple of list items
|
| Fri, 17 Jul 2020 09:36:14 +0800 |
Anton Shestakov |
readme: various small fixes to formatting and spelling
|
| Fri, 17 Jul 2020 09:34:28 +0800 |
Anton Shestakov |
readme: update link to format-source
|
| Sun, 12 Jul 2020 19:59:16 +0800 |
Anton Shestakov |
packaging: add graphviz into Build-Depends for docs (hg docgraph output)
|
| Thu, 09 Jul 2020 20:18:53 +0800 |
Anton Shestakov |
packaging: clean up sphinx in Build-Depends
|
| Tue, 14 Jul 2020 19:55:57 +0800 |
Anton Shestakov |
packaging: drop X-Python-Version, it's satisfied even in oldoldstable
|
| Tue, 14 Jul 2020 13:09:16 +0800 |
Anton Shestakov |
packaging: bump Standards-Version to 4.3.0
|
| Tue, 14 Jul 2020 13:08:58 +0800 |
Anton Shestakov |
packaging: add Vcs-* fields to debian/control
|
| Tue, 14 Jul 2020 13:01:22 +0800 |
Anton Shestakov |
packaging: remove trailing spaces and newlines in debian/
|
| Sun, 05 Jul 2020 16:32:08 +0800 |
Anton Shestakov |
packaging: update extend-diff-ignore regex
|
| Sun, 12 Jul 2020 20:31:02 +0800 |
Anton Shestakov |
packaging: move docs cleanup target from debian/rules to docs/makefile
|
| Sat, 04 Jul 2020 18:19:47 +0800 |
Anton Shestakov |
tests: add a test that makes sure version metadata stays in sync
|
| Sun, 12 Jul 2020 19:40:58 +0800 |
Anton Shestakov |
evolve: the rest of b3e178f3e31f
|
| Sat, 11 Jul 2020 10:24:01 +0800 |
Anton Shestakov |
packaging: remove curl from Build-Depends
|
| Sat, 11 Jul 2020 10:01:54 +0800 |
Anton Shestakov |
tests: use hg debugcapabilities instead of curl
|
| Fri, 10 Jul 2020 12:05:25 +0800 |
Anton Shestakov |
tests: replace curl with hg debugdownload command
|
| Fri, 10 Jul 2020 11:53:00 +0800 |
Anton Shestakov |
tests: use debugpushkey instead of curl with listkeys query
|
| Mon, 22 Jun 2020 09:39:39 +0530 |
Sushil khanchi |
evolve: remove unnecessary code
|
| Wed, 08 Jul 2020 22:41:20 +0530 |
Sushil khanchi |
evolve: move README to rst
|
| Wed, 08 Jul 2020 22:38:30 +0530 |
Sushil khanchi |
evolve: refactor some code changes
|
| Thu, 09 Jul 2020 20:47:11 +0800 |
Anton Shestakov |
tests: add blank lines to test-topic-tutorial.t to fix .rst syntax
|
| Sun, 05 Jul 2020 16:14:09 +0800 |
Anton Shestakov |
packaging: replace wget with curl in Build-Depends
|
| Fri, 10 Jul 2020 10:12:39 +0800 |
Anton Shestakov |
packaging: simple4server was renamed to evolve.serveronly, and we ship it
|
| Fri, 10 Jul 2020 09:51:25 +0800 |
Anton Shestakov |
packaging: we no longer have inhibit
|
| Sat, 20 Jun 2020 11:24:14 +0530 |
Sushil khanchi |
evolve: add test for content-div case A4
|
| Tue, 09 Jun 2020 12:05:40 +0530 |
Sushil khanchi |
evolve: add test for content-div case A3
|
| Tue, 09 Jun 2020 12:00:26 +0530 |
Sushil khanchi |
evolve: add test coverage for content-div case A2
|
| Tue, 02 Jun 2020 06:56:36 +0530 |
Sushil khanchi |
evolve: add content-div test for case when no changes
|
| Tue, 02 Jun 2020 06:54:50 +0530 |
Sushil khanchi |
evolve: add setup utility for testing content-divergence resolution
|
| Tue, 07 Jul 2020 20:39:28 +0800 |
Anton Shestakov |
makefile: use fancy automatic variables
|
| Tue, 07 Jul 2020 20:37:07 +0800 |
Anton Shestakov |
makefile: make all non-file targets phony
|
| Tue, 07 Jul 2020 20:10:00 +0800 |
Anton Shestakov |
makefile: remove different version tests, currently it's done via CI
|
| Tue, 07 Jul 2020 19:36:27 +0800 |
Anton Shestakov |
makefile: add doc target, since it's easy enough
|
| Tue, 07 Jul 2020 19:16:12 +0800 |
Anton Shestakov |
makefile: mention install-home in the help output
|
| Tue, 07 Jul 2020 19:13:35 +0800 |
Anton Shestakov |
makefile: move help target to be the first target (i.e. default goal)
|
| Tue, 07 Jul 2020 19:11:53 +0800 |
Anton Shestakov |
makefile: move all definitions to the top
|
| Fri, 12 Jun 2020 15:42:43 +0800 |
Anton Shestakov |
topic: substitute current topic when `--topic .` is used for outgoing/push
|
| Thu, 11 Jun 2020 23:38:55 +0800 |
Anton Shestakov |
tests: adjust spelling and spacing
|
| Thu, 11 Jun 2020 23:36:58 +0800 |
Anton Shestakov |
tests: simplify re-enabling topic extension since we use topic_setup.sh
|
| Thu, 11 Jun 2020 23:28:10 +0800 |
Anton Shestakov |
topic: copy an abort message (new branch) from upstream exactly
|
| Thu, 11 Jun 2020 19:10:56 +0800 |
Anton Shestakov |
topic: copy an abort message (new head) from upstream exactly
|
| Thu, 11 Jun 2020 18:50:29 +0800 |
Anton Shestakov |
topic: treat argument to --topic as a literal topic name explicitly
|
| Thu, 11 Jun 2020 17:58:04 +0800 |
Anton Shestakov |
tests: add the concurrent test case to test-topic-push.t
|
| Mon, 22 Jun 2020 01:03:22 +0200 |
Manuel Jacob |
tests: add a test determining the branch and topic like the Zsh prompt does it
|
| Sat, 27 Jun 2020 22:46:08 +0800 |
Aay Jay Chan |
evolve: fix a typo in help text
stable
|
| Sat, 27 Jun 2020 01:33:31 +0800 |
Anton Shestakov |
ci: use a script template to pull and update /ci/repos/mercurial/
|
| Sun, 14 Jun 2020 00:36:37 +0800 |
Anton Shestakov |
ci: print the exact version of pytype
|
| Sun, 07 Jun 2020 18:38:22 +0800 |
Anton Shestakov |
ci: replace flake8 job by checks-py{2,3} (with more than flake8)
|
| Wed, 08 Jul 2020 18:07:53 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Sat, 04 Jul 2020 21:02:37 +0800 |
Anton Shestakov |
tests: the list of extensions in `hg version -v` is now sorted
|
| Sat, 06 Jun 2020 20:37:10 +0800 |
Anton Shestakov |
obsdiscovery: use plural forms of nodes and markers for variables
stable
|
| Sat, 06 Jun 2020 20:32:38 +0800 |
Anton Shestakov |
obsdiscovery: assign successors and predecessors to variables
stable
|
| Sat, 06 Jun 2020 19:43:58 +0800 |
Anton Shestakov |
obsdiscovery: make some variables' names longer
stable
|
| Sat, 06 Jun 2020 19:32:15 +0800 |
Anton Shestakov |
obsdiscovery: import node as nodemod to free up the name
stable
|
| Sun, 24 May 2020 13:20:45 +0800 |
Anton Shestakov |
tests: use hghaveaddon.py to check for flake8
stable
|
| Sun, 24 May 2020 13:07:44 +0800 |
Anton Shestakov |
tests: actually use the correct python version for flake8/pyflakes
stable
|
| Sun, 24 May 2020 13:02:48 +0800 |
Anton Shestakov |
tests: modernize test-check-pyflakes.t
stable
|
| Sat, 06 Jun 2020 21:19:33 +0800 |
Anton Shestakov |
ci: add /ci/repos/mercurial to $PYTHONPATH for docs
stable
|
| Sun, 07 Jun 2020 18:17:08 +0800 |
Anton Shestakov |
ci: print exact version of used Python
|
| Sun, 07 Jun 2020 18:08:14 +0800 |
Anton Shestakov |
tests: replace ls -A with hg status -A
|
| Sun, 07 Jun 2020 18:02:15 +0800 |
Anton Shestakov |
tests: update logmarkers template to use {dates} and {users}
|
| Sun, 07 Jun 2020 17:56:03 +0800 |
Anton Shestakov |
tests: put a common template snippet into [templates]
|
| Sun, 07 Jun 2020 17:48:16 +0800 |
Anton Shestakov |
tests: remove "unused" second argument to join() template function
|
| Sun, 07 Jun 2020 17:45:13 +0800 |
Anton Shestakov |
tests: drop label from log template in test-evolve-obshistory-amend.t
|
| Sat, 06 Jun 2020 21:19:33 +0800 |
Anton Shestakov |
ci: add /ci/repos/mercurial to $PYTHONPATH for docs
|
| Fri, 29 May 2020 13:50:41 +0800 |
Anton Shestakov |
ci: add --no-rust to -cext variants
|
| Fri, 29 May 2020 13:23:45 +0800 |
Anton Shestakov |
tests: replace check-compat-strings.sh with a Python script
|
| Sat, 06 Jun 2020 20:37:10 +0800 |
Anton Shestakov |
obsdiscovery: use plural forms of nodes and markers for variables
|
| Sat, 06 Jun 2020 20:32:38 +0800 |
Anton Shestakov |
obsdiscovery: assign successors and predecessors to variables
|
| Sat, 06 Jun 2020 19:43:58 +0800 |
Anton Shestakov |
obsdiscovery: make some variables' names longer
|
| Sat, 06 Jun 2020 19:32:15 +0800 |
Anton Shestakov |
obsdiscovery: import node as nodemod to free up the name
|
| Sun, 31 May 2020 14:09:17 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Fri, 29 May 2020 14:29:03 +0800 |
Anton Shestakov |
compat: compatibility for mergestate being a separate module in 5.5
|
| Sun, 24 May 2020 16:44:24 +0800 |
Anton Shestakov |
ci: use set -x to echo the whole run-tests.py command string
|
| Sun, 24 May 2020 16:29:20 +0800 |
Anton Shestakov |
ci: set HGMODULEPOLICY when running specific variants
|
| Fri, 22 May 2020 08:39:51 +0800 |
Anton Shestakov |
ci: use a template + variables for defining tests
|
| Sun, 24 May 2020 13:43:53 +0800 |
Anton Shestakov |
tests: drop hg 3.0 check
|
| Sun, 24 May 2020 13:42:09 +0800 |
Anton Shestakov |
tests: use hghaveaddon.py to check for check-manifest
|
| Sun, 24 May 2020 13:20:45 +0800 |
Anton Shestakov |
tests: use hghaveaddon.py to check for flake8
|
| Sun, 24 May 2020 13:07:44 +0800 |
Anton Shestakov |
tests: actually use the correct python version for flake8/pyflakes
|
| Sun, 24 May 2020 13:02:48 +0800 |
Anton Shestakov |
tests: modernize test-check-pyflakes.t
|
| Sat, 23 May 2020 11:43:26 +0800 |
Anton Shestakov |
topic: document the other safehasattr() compatibility check
|
| Tue, 19 May 2020 12:49:12 +0800 |
Anton Shestakov |
topic: rename topicrel() to topicsubrel() while at it
|
| Tue, 19 May 2020 12:25:14 +0800 |
Anton Shestakov |
topic: support foo#stack syntax
|
| Tue, 19 May 2020 12:23:29 +0800 |
Anton Shestakov |
topic: rename stackrel() to stacksubrel()
|
| Thu, 21 May 2020 09:51:24 +0800 |
Anton Shestakov |
packaging: move check-compat-strings.sh to tests/testlib/
stable
|
| Sat, 16 May 2020 16:44:29 +0800 |
Anton Shestakov |
evolve: rewrite template keywords section and mention obsorigin
stable
|
| Sat, 16 May 2020 16:42:48 +0800 |
Anton Shestakov |
evolve: don't describe {obsfate}, but mention that it was upstreamed
stable
|
| Sat, 16 May 2020 16:38:58 +0800 |
Anton Shestakov |
evolve: precursors, successors and troubles are just aliases now
stable
|
| Sat, 16 May 2020 16:07:34 +0800 |
Anton Shestakov |
templatekw: drop {instabilities} keyword, it's in hg 4.6+
|
| Sat, 16 May 2020 16:02:12 +0800 |
Anton Shestakov |
templatekw: remove unused _getusername()
|
| Sat, 16 May 2020 15:48:52 +0800 |
Anton Shestakov |
templatekw: remove unused closestsuccessors() and directsuccessorssets()
|
| Sat, 16 May 2020 16:48:35 +0800 |
Anton Shestakov |
tests: update one more test-evolve-obshistory*.t header
stable
|
| Thu, 14 May 2020 22:19:58 +0800 |
Anton Shestakov |
obslog: make obslog --no-origin -f work with multiple successor sets
stable
|
| Mon, 30 Dec 2019 00:11:00 +0530 |
Sushil khanchi |
evolve: remove duplicated code
|
| Sat, 09 May 2020 22:20:30 +0800 |
Anton Shestakov |
branching: merge stable back into default
|
| Sat, 09 May 2020 22:19:09 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Sat, 09 May 2020 17:47:56 +0200 |
Pierre-Yves David |
Added tag 10.0.0 for changeset 27d57ca86865
stable
|
| Fri, 08 May 2020 22:50:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 08 May 2020 22:18:15 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 08 May 2020 20:36:32 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Fri, 08 May 2020 20:36:31 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Fri, 08 May 2020 20:36:29 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Fri, 08 May 2020 20:36:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Fri, 08 May 2020 20:24:22 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Fri, 08 May 2020 19:49:07 +0800 |
Anton Shestakov |
test-compat: back out changeset 591a0afd2ef3
mercurial-5.3
|
| Fri, 08 May 2020 19:44:48 +0800 |
Anton Shestakov |
test-compat: back out changeset 51e38bf936cf
mercurial-5.3
|
| Fri, 08 May 2020 19:22:36 +0800 |
Anton Shestakov |
test-compat: back out changeset 4da1d21231ae
mercurial-5.3
|
| Fri, 08 May 2020 19:19:26 +0800 |
Anton Shestakov |
test-compat: back out changeset 7d0d066329f4
mercurial-5.3
|
| Fri, 08 May 2020 19:10:14 +0800 |
Anton Shestakov |
test-compat: create a compatibility branch for Mercurial 5.3
mercurial-5.3
|
| Fri, 08 May 2020 18:45:49 +0800 |
Anton Shestakov |
packaging: prepare evolve version 10.0.0
stable 10.0.0
|
| Fri, 08 May 2020 18:45:17 +0800 |
Anton Shestakov |
changelog: update for evolve 10.0.0
stable
|
| Fri, 08 May 2020 18:22:26 +0800 |
Anton Shestakov |
branching: merge into stable in preparation for release
stable
|
| Sun, 03 May 2020 15:39:56 +0800 |
Anton Shestakov |
changelog: summarize the last couple of features
|
| Wed, 29 Apr 2020 21:57:59 +0800 |
Anton Shestakov |
obshistory: create _fatemarkers() similar to _originmarkers()
|
| Thu, 07 May 2020 01:29:48 +0200 |
Anton Shestakov |
obslog: makes --origin flag the default
|
| Thu, 07 May 2020 01:29:24 +0200 |
Anton Shestakov |
obslog: add a --origin flag to show predecessors instead of successors
|
| Tue, 21 Apr 2020 23:45:11 +0800 |
Anton Shestakov |
obslog: add preliminary support for showing predecessors
|
| Fri, 24 Apr 2020 01:15:38 +0800 |
Anton Shestakov |
obshistory: add _originmarkers() function to be used for obslog --origin
|
| Fri, 08 May 2020 04:02:22 +0200 |
Pierre-Yves David |
evolve: rename `evolve_source_*` to `divergence_source_*`
|
| Thu, 07 May 2020 07:57:14 -0700 |
Martin von Zweigbergk |
evolve: mark new hash-salting extras keys as uninteresting for effect flag
|
| Mon, 09 Dec 2019 11:09:11 -0800 |
Martin von Zweigbergk |
evolve: handle relocation during divergence resolution producing no changes
|
| Mon, 09 Dec 2019 10:05:24 -0800 |
Martin von Zweigbergk |
tests: show crash from divergence resolution resulting in empty commit
|
| Thu, 30 Apr 2020 10:05:14 -0700 |
Martin von Zweigbergk |
evolve: always create commit when resolving divergence
|
| Tue, 05 May 2020 16:29:52 +0800 |
Anton Shestakov |
tests: replace an X+X revset with something meaningful
|
| Tue, 05 May 2020 16:54:24 +0800 |
Anton Shestakov |
tests: update section headers and comments in obslog-related tests
|
| Tue, 05 May 2020 16:52:59 +0800 |
Anton Shestakov |
tests: use common obshistory_setup.sh script instead of manual setup
|
| Tue, 05 May 2020 16:27:02 +0800 |
Anton Shestakov |
tests: remove "second diverged revision" from a phase divergence test
|
| Tue, 05 May 2020 15:43:43 +0800 |
Anton Shestakov |
obshistory: omit duplicate notes of obsolescence operations
|
| Tue, 05 May 2020 20:25:33 +0200 |
Joerg Sonnenberger |
changelog: adjust
|
| Sun, 03 May 2020 20:59:34 +0200 |
Pierre-Yves David |
changelog: mention the sqlite fix
|
| Wed, 01 Apr 2020 09:21:29 -0700 |
Martin von Zweigbergk |
evolve: extract function for relocating divergent commit
|
| Sun, 03 May 2020 01:01:19 +0200 |
Joerg Sonnenberger |
caches: preserve permissions of top-level .hg
|
| Sat, 02 May 2020 23:31:31 +0800 |
Anton Shestakov |
changelog: mention obsorigin template keyword
|
| Tue, 10 Mar 2020 17:18:09 +0700 |
Anton Shestakov |
templatekw: add obsorigin keyword
|
| Fri, 24 Apr 2020 01:14:34 +0800 |
Anton Shestakov |
obshistory: add predecessorsandmarkers()
|
| Fri, 24 Apr 2020 01:09:30 +0800 |
Anton Shestakov |
obshistory: add a function to group predsets by fold-id
|
| Tue, 21 Apr 2020 23:40:44 +0800 |
Anton Shestakov |
obshistory: add _predecessorsverb() similar to _successorsetverb()
|
| Sat, 25 Apr 2020 18:51:23 +0800 |
Anton Shestakov |
obshistory: add a docstring to patchavailable()
|
| Fri, 01 May 2020 07:44:01 -0700 |
Martin von Zweigbergk |
tests: avoid referring to commits by hash in a few places
|
| Fri, 01 May 2020 07:43:15 -0700 |
Martin von Zweigbergk |
tests: add more verification of output to divergence tests
|
| Mon, 16 Dec 2019 11:14:39 -0800 |
Martin von Zweigbergk |
tests: add debugobsolete calls before many obslog calls
|
| Sun, 03 May 2020 01:45:04 +0200 |
Joerg Sonnenberger |
stablerangecache: sanity check subranges
|
| Sun, 03 May 2020 20:11:37 +0800 |
Anton Shestakov |
obslog: use unfiltered repo for --no-graph implementation too
|
| Thu, 09 Apr 2020 20:02:32 +0200 |
Joerg Sonnenberger |
tests: don't assume that echo will unescape \\
|
| Thu, 09 Apr 2020 19:52:30 +0200 |
Joerg Sonnenberger |
tests: avoid non-portable sed command
|
| Thu, 09 Apr 2020 19:51:03 +0200 |
Joerg Sonnenberger |
tests: check for file existance in a portable way
|
| Thu, 09 Apr 2020 19:50:03 +0200 |
Joerg Sonnenberger |
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
|
| Thu, 09 Apr 2020 14:49:31 +0200 |
Joerg Sonnenberger |
tests: silence potential warnings about uname -o
|
| Fri, 01 May 2020 21:05:37 +0200 |
Joerg Sonnenberger |
py3: fix debugstablerangecache
|
| Wed, 29 Apr 2020 00:44:14 +0800 |
Anton Shestakov |
topic: provide cache to successorssets() in _singlesuccessor()
|
| Wed, 29 Apr 2020 00:43:13 +0800 |
Anton Shestakov |
evolve: provide cache to successorssets() in _singlesuccessor()
|
| Wed, 29 Apr 2020 00:28:15 +0800 |
Anton Shestakov |
evolve: provide cache to successorssets() in _possibledestination()
|
| Sun, 29 Mar 2020 17:41:48 +0700 |
Anton Shestakov |
obslog: support --all with --no-graph
|
| Sun, 29 Mar 2020 17:21:56 +0700 |
Anton Shestakov |
obslog: support --filternonlocal with --no-graph
|
| Wed, 18 Mar 2020 19:20:17 +0700 |
Anton Shestakov |
obshistory: restructure templates a bit, drop default verb ("pruned")
|
