| Thu, 28 Nov 2019 19:01:28 +0530 |
Sushil khanchi |
evolve: add logic to cover --stop when "divergent" relocation in play
|
changeset |
files
|
| Thu, 28 Nov 2019 17:58:45 +0530 |
Sushil khanchi |
evolve: test to show that --stop is not working when "divergent" relocated
|
changeset |
files
|
| Wed, 27 Nov 2019 22:52:08 +0530 |
Sushil khanchi |
evolve: add test to show that --abort is working fine
|
changeset |
files
|
| Fri, 20 Dec 2019 17:39:44 +0530 |
Sushil khanchi |
evolve: fix a bug in logic to choose destination when no active topic
stable
|
changeset |
files
|
| Fri, 20 Dec 2019 17:32:07 +0530 |
Sushil khanchi |
evolve: add test to demonstrate a bug when no active topic
stable
|
changeset |
files
|
| Fri, 20 Dec 2019 17:31:57 +0530 |
Sushil khanchi |
evolve: fix a bug in logic of choosing destination for hg update
stable
|
changeset |
files
|
| Fri, 20 Dec 2019 17:17:30 +0530 |
Sushil khanchi |
evolve: add test to demonstrate a bug when active topic is empty
stable
|
changeset |
files
|
| Thu, 19 Dec 2019 21:36:59 -0800 |
Martin von Zweigbergk |
evolvecmd: fix a typo node->None
|
changeset |
files
|
| Thu, 19 Dec 2019 21:15:31 -0800 |
Martin von Zweigbergk |
evolvecmd: avoid a ctx->node->ctx conversion
|
changeset |
files
|
| Thu, 19 Dec 2019 13:06:29 -0800 |
Martin von Zweigbergk |
evolvecmd: mark relocate() private
|
changeset |
files
|
| Thu, 19 Dec 2019 22:31:13 -0800 |
Martin von Zweigbergk |
cleanup: replace .parents()[0] by .p1()
|
changeset |
files
|
| Wed, 27 Nov 2019 20:54:48 +0530 |
Sushil khanchi |
evolve: add more tests for --continue case when relocating "divergent"
|
changeset |
files
|
| Wed, 27 Nov 2019 19:50:33 +0530 |
Sushil khanchi |
evolve: use meaningful variable names for a return value
|
changeset |
files
|
| Wed, 27 Nov 2019 12:34:19 +0530 |
Sushil khanchi |
evolve: add logic to cover --continue case when relocating "divergent"
|
changeset |
files
|
| Mon, 25 Nov 2019 21:28:52 +0530 |
Sushil khanchi |
evolve: add test for `--continue` case when relocating "divergent"
|
changeset |
files
|
| Mon, 25 Nov 2019 19:12:51 +0530 |
Sushil khanchi |
evolve: use more specific key name to store in evolvestate
|
changeset |
files
|
| Fri, 13 Dec 2019 01:29:27 +0530 |
Sushil khanchi |
evolve: move a test where it makes more sense
|
changeset |
files
|
| Thu, 12 Dec 2019 17:22:18 +0530 |
Sushil khanchi |
evolve: remove the unnecessary condition to check empty successors set
|
changeset |
files
|
| Tue, 19 Nov 2019 14:54:13 -0800 |
Martin von Zweigbergk |
evolve: delete redundant and incorrect code for updating dirstate
|
changeset |
files
|
| Tue, 19 Nov 2019 14:24:31 -0800 |
Martin von Zweigbergk |
tests: demonstrate how evolve loses transitive copies when interrupted
|
changeset |
files
|
| Mon, 09 Dec 2019 10:36:11 -0800 |
Martin von Zweigbergk |
evolve: use ui.configoverride() instead of ui.backupconfig()
|
changeset |
files
|
| Mon, 09 Dec 2019 10:31:34 -0800 |
Martin von Zweigbergk |
topic: use ui.configoverride() instead of ui.backupconfig()
|
changeset |
files
|
| Mon, 09 Dec 2019 10:28:58 -0800 |
Martin von Zweigbergk |
topic: use ui.configoverride() instead of ui.backupconfig()
|
changeset |
files
|
| Mon, 09 Dec 2019 10:33:48 -0800 |
Martin von Zweigbergk |
evolve: use ui.configoverride() instead of ui.backupconfig()
|
changeset |
files
|
| Mon, 09 Dec 2019 10:43:04 -0800 |
Martin von Zweigbergk |
evolve: remove obsolete backup of allowemptycommit config
|
changeset |
files
|
| Mon, 09 Dec 2019 10:44:42 -0800 |
Martin von Zweigbergk |
evolve: remove dead initilization of "newnode" variable
|
changeset |
files
|
| Thu, 12 Dec 2019 17:16:02 +0530 |
Sushil khanchi |
evolve: fix a typo
|
changeset |
files
|
| Tue, 10 Dec 2019 21:03:51 +0100 |
Pierre-Yves David |
changelog: mention the python 3 fix
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 21:03:23 +0100 |
Pierre-Yves David |
changelog: mention the date fix for content divergence
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 20:47:13 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 10 Dec 2019 20:35:56 +0100 |
Denis Laxalde |
py3: fix several TypeError formatting bytes with an exception object
stable
|
changeset |
files
|
| Fri, 11 Oct 2019 21:32:27 +0200 |
Manuel Jacob |
evolve: preserve date when resolving content-divergence (issue6202)
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 19:58:51 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 19:55:37 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 19:27:55 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
changeset |
files
|
| Tue, 10 Dec 2019 19:13:06 +0100 |
Pierre-Yves David |
test: highlight data handling when solving divergence
stable
|
changeset |
files
|
| Sat, 07 Dec 2019 03:27:50 +0530 |
Sushil khanchi |
evolve: add tests for the case when resolution parent is ambiguous
stable
|
changeset |
files
|
| Fri, 06 Dec 2019 23:43:00 +0530 |
Sushil khanchi |
evolve: abort if deciding resolution parent is ambiguous
stable
|
changeset |
files
|
| Sat, 23 Nov 2019 16:17:04 +0530 |
Sushil khanchi |
evolve: make sure divergence resolution doesn't undo changes (issue6203)
stable
|
changeset |
files
|
| Sat, 23 Nov 2019 20:25:16 +0530 |
Sushil khanchi |
evolve: add test to demonstrate issue6203
stable
|
changeset |
files
|
| Mon, 09 Dec 2019 16:01:56 +0700 |
Anton Shestakov |
state: there's no _unpack in struct
stable
|
changeset |
files
|
| Sun, 29 Sep 2019 11:47:18 +0530 |
Sushil khanchi |
amend: abort if both --patch and --extract are used
stable
|
changeset |
files
|
| Mon, 09 Dec 2019 23:54:50 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 06 Dec 2019 17:18:49 +0100 |
Boris Feld |
ci: add job to build and archive the documentation
|
changeset |
files
|
| Thu, 05 Dec 2019 10:04:52 -0800 |
Martin von Zweigbergk |
tests: update now that merge.graft() doesn't set two equal parents
|
changeset |
files
|
| Fri, 06 Dec 2019 14:01:29 +0100 |
Manuel Jacob |
evolve: fix content-divergence resolution when p1 is null (issue6201)
stable
|
changeset |
files
|
| Wed, 04 Dec 2019 10:57:29 -0800 |
Martin von Zweigbergk |
obslog: make {node} the full node and leave shortening to template
|
changeset |
files
|
| Wed, 04 Dec 2019 11:00:00 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 03 Dec 2019 09:43:10 -0800 |
Martin von Zweigbergk |
compat: accept "success" argument to lock._afterlock callback
stable
|
changeset |
files
|
| Mon, 02 Dec 2019 20:59:04 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 02 Dec 2019 20:56:47 +0700 |
Anton Shestakov |
test-compat: run tests with -j more than 1
mercurial-4.7
|
changeset |
files
|
| Mon, 02 Dec 2019 14:44:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 02 Dec 2019 14:44:00 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 02 Dec 2019 14:43:25 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Mon, 02 Dec 2019 14:42:32 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 02 Dec 2019 14:41:09 +0100 |
Pierre-Yves David |
test-compat: don't run the py3 test on the older branches
mercurial-5.0
|
changeset |
files
|
| Fri, 22 Nov 2019 17:13:46 +0700 |
Anton Shestakov |
docs: add missing Figure 10 to sharing.rst
stable
|
changeset |
files
|
| Thu, 28 Nov 2019 10:54:04 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 28 Nov 2019 10:53:25 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 28 Nov 2019 10:52:04 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 28 Nov 2019 10:50:55 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Thu, 28 Nov 2019 10:49:29 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Thu, 28 Nov 2019 10:48:44 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.1
mercurial-5.1
|
changeset |
files
|
| Thu, 21 Nov 2019 14:18:35 +0700 |
Anton Shestakov |
heptapod-ci: add a script to map evolve branch to mercurial revision for tests
stable
|
changeset |
files
|
| Mon, 18 Nov 2019 14:33:59 +0700 |
Anton Shestakov |
pytype: ignore abc.ABCMeta metaclasses that don't work on py3
|
changeset |
files
|
| Fri, 15 Nov 2019 16:04:35 -0800 |
Martin von Zweigbergk |
tests: remove extra whitespace before patch in obslog output
|
changeset |
files
|
| Mon, 18 Nov 2019 13:04:56 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 18 Nov 2019 13:01:38 +0100 |
Pierre-Yves David |
changelog: add a couple of missing entry about the next feature release
|
changeset |
files
|
| Mon, 18 Nov 2019 12:58:02 +0100 |
Pierre-Yves David |
changelog: fix entry in the wrong location
|
changeset |
files
|
| Mon, 18 Nov 2019 12:55:44 +0100 |
Pierre-Yves David |
changelog: add a wheelbarrow of missing entries
stable
|
changeset |
files
|
| Mon, 18 Nov 2019 11:46:59 +0100 |
Pierre-Yves David |
heptapod-ci: simpler CI
stable
|
changeset |
files
|
| Sun, 17 Nov 2019 01:23:48 +0100 |
Pierre-Yves David |
heptapod-ci: run the test with color
stable
|
changeset |
files
|
| Wed, 13 Nov 2019 13:47:55 +0700 |
Anton Shestakov |
compat: compatibility for cl.nodemap.get vs cl.index.get_rev
stable
|
changeset |
files
|
| Wed, 13 Nov 2019 13:43:46 +0700 |
Anton Shestakov |
compat: compatibility for pathuril.dirs vs util.dirs
stable
|
changeset |
files
|
| Sat, 16 Nov 2019 01:45:40 +0100 |
Pierre-Yves David |
obslog: phase divergence fix for 5c41bb482867
|
changeset |
files
|
| Sat, 16 Nov 2019 01:44:31 +0100 |
Martin von Zweigbergk |
obslog: phase divergence fix for b135591bec1a
|
changeset |
files
|
| Fri, 15 Nov 2019 10:25:46 -0800 |
Martin von Zweigbergk |
obslog: make {descdiff} not be indented and leave that to the template
|
changeset |
files
|
| Fri, 15 Nov 2019 09:53:42 -0800 |
Martin von Zweigbergk |
obslog: make {patch} not be indented and leave that to the template
|
changeset |
files
|
| Thu, 07 Nov 2019 13:40:53 -0800 |
Martin von Zweigbergk |
obslog: make {succnodes} be full hex nodes
|
changeset |
files
|
| Fri, 08 Nov 2019 07:19:18 -0800 |
Martin von Zweigbergk |
obslog: remove now-unused code for plain styling
|
changeset |
files
|
| Thu, 07 Nov 2019 23:17:34 -0800 |
Martin von Zweigbergk |
obslog: redefine default output as a template, unless -f was given
|
changeset |
files
|
| Thu, 07 Nov 2019 23:15:29 -0800 |
Martin von Zweigbergk |
obslog: add newline after all markers in non-graphlog to match graphlog
|
changeset |
files
|
| Thu, 07 Nov 2019 22:24:50 -0800 |
Martin von Zweigbergk |
obslog: make reason for unavailable patch part of template
|
changeset |
files
|
| Thu, 07 Nov 2019 16:34:01 -0800 |
Martin von Zweigbergk |
obslog: make content and description patches available to templater
|
changeset |
files
|
| Thu, 07 Nov 2019 17:22:44 -0800 |
Martin von Zweigbergk |
obslog: rename {desc-diff} to {descdiff} since the former is invalid
|
changeset |
files
|
| Thu, 07 Nov 2019 17:22:16 -0800 |
Martin von Zweigbergk |
tests: demonstrate broken {patch} and {desc-diff} template keywords
|
changeset |
files
|
| Fri, 15 Nov 2019 11:48:17 +0700 |
Anton Shestakov |
topic: drop compat.successorssets(), it's not used
|
changeset |
files
|
| Fri, 15 Nov 2019 11:37:34 +0700 |
Anton Shestakov |
topic: drop compat.getmarkers() and use obsutil.getmarkers() directly
|
changeset |
files
|
| Fri, 15 Nov 2019 08:14:06 -0800 |
Martin von Zweigbergk |
cmdrewrite: avoid accessing scmutil.status fields by index
|
changeset |
files
|
| Thu, 07 Nov 2019 23:10:26 -0800 |
Martin von Zweigbergk |
obslog: avoid using a formatter after calling end() on it
|
changeset |
files
|
| Thu, 07 Nov 2019 15:00:57 -0800 |
Martin von Zweigbergk |
obslog: use plural name "effects" for list of all effects
|
changeset |
files
|
| Thu, 07 Nov 2019 13:21:20 -0800 |
Martin von Zweigbergk |
obslog: use singular name "succnode" for each element of {succnodes}
|
changeset |
files
|
| Mon, 11 Nov 2019 03:40:20 +0700 |
Anton Shestakov |
docs: add SVG figures for sharing.rst
stable
|
changeset |
files
|
| Mon, 11 Nov 2019 03:22:09 +0700 |
Anton Shestakov |
docs: add some up-to-date output from push/pull commands
stable
|
changeset |
files
|
| Mon, 11 Nov 2019 02:42:37 +0700 |
Anton Shestakov |
docs: add two more amend commits to simulate temporary amend commits
stable
|
changeset |
files
|
| Mon, 11 Nov 2019 02:33:54 +0700 |
Anton Shestakov |
docs: revision numbers are technically stable
stable
|
changeset |
files
|
| Sun, 10 Nov 2019 05:14:53 +0700 |
Anton Shestakov |
tests: remove a repeated statement
stable
|
changeset |
files
|
| Sat, 26 Oct 2019 13:33:05 +0700 |
Anton Shestakov |
docs: correct node hashes in sharing.rst based on test-sharing.t
stable
|
changeset |
files
|
| Sat, 26 Oct 2019 13:30:21 +0700 |
Anton Shestakov |
tests: add shortlog of other repos to test-sharing.t
stable
|
changeset |
files
|
| Sat, 26 Oct 2019 13:06:49 +0700 |
Anton Shestakov |
tests: use |shortest in test-sharing.t because sharing.rst uses it
stable
|
changeset |
files
|
| Wed, 13 Nov 2019 13:47:55 +0700 |
Anton Shestakov |
compat: compatibility for cl.nodemap.get vs cl.index.get_rev
|
changeset |
files
|
| Wed, 13 Nov 2019 13:43:46 +0700 |
Anton Shestakov |
compat: compatibility for pathuril.dirs vs util.dirs
|
changeset |
files
|
| Fri, 15 Nov 2019 10:59:47 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 15 Nov 2019 10:08:36 +0100 |
Pierre-Yves David |
heptapod-ci: test with python3 too
stable
|
changeset |
files
|
| Thu, 14 Nov 2019 18:44:15 +0100 |
Pierre-Yves David |
heptapod-ci: add a --pure variant for the CI
stable
|
changeset |
files
|
| Thu, 14 Nov 2019 12:03:52 +0100 |
Pierre-Yves David |
heptapod-ci: let the number of CPU to be picked automatically
stable
|
changeset |
files
|
| Thu, 14 Nov 2019 11:59:10 +0100 |
Pierre-Yves David |
heptapod-ci: point to our own docker images
stable
|
changeset |
files
|
| Thu, 07 Nov 2019 19:46:05 +0100 |
Pierre-Yves David |
readme: update contribution guide
stable
|
changeset |
files
|
| Thu, 07 Nov 2019 10:29:03 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 26 Oct 2019 22:44:06 +0700 |
Anton Shestakov |
docs: remove --all from hg evolve, since it's been the default for some time
stable
|
changeset |
files
|
| Sat, 26 Oct 2019 22:43:06 +0700 |
Anton Shestakov |
docs: typo in user-guide.rst
stable
|
changeset |
files
|
| Mon, 04 Nov 2019 14:58:58 -0800 |
Martin von Zweigbergk |
obslog: don't overwrite {rev} keyword from changeset context
|
changeset |
files
|
| Mon, 04 Nov 2019 14:31:08 -0800 |
Martin von Zweigbergk |
obslog: make changeset available to templater
|
changeset |
files
|
| Wed, 16 Oct 2019 11:10:04 -0700 |
Martin von Zweigbergk |
tests: simplify by pruning unwanted changesets a little earlier
|
changeset |
files
|
| Fri, 01 Nov 2019 17:54:09 +0700 |
Anton Shestakov |
evolve: use more often seen metavariables in command synopsis strings
stable
|
changeset |
files
|
| Fri, 01 Nov 2019 17:52:43 +0700 |
Anton Shestakov |
topic: add more options to command synopsis string
stable
|
changeset |
files
|
| Fri, 11 Oct 2019 16:53:52 +0200 |
Denis Laxalde |
debian: also build with python3
stable
|
changeset |
files
|
| Fri, 18 Oct 2019 10:17:53 +0200 |
Denis Laxalde |
debian: update debhelper compat
stable
|
changeset |
files
|
| Thu, 17 Oct 2019 20:33:02 +0200 |
Denis Laxalde |
debian: make it possible to by-pass doc build
stable
|
changeset |
files
|
| Tue, 15 Oct 2019 11:39:58 +0200 |
Denis Laxalde |
debian: define extend-diff-ignore for dpkg-source
stable
|
changeset |
files
|