| Thu, 30 Jan 2020 14:32:09 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 30 Jan 2020 14:32:08 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 30 Jan 2020 14:32:06 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Thu, 30 Jan 2020 14:32:05 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Thu, 30 Jan 2020 14:32:04 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
changeset |
files
|
| Thu, 30 Jan 2020 14:32:03 +0700 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.2
mercurial-5.2
|
changeset |
files
|
| Mon, 27 Jan 2020 14:55:35 +0700 |
Anton Shestakov |
tests: allow an empty merge commit to have tests pass without too many changes
stable
|
changeset |
files
|
| Tue, 28 Jan 2020 20:12:04 +0700 |
Anton Shestakov |
compat: add a context manager that calls _quick_access_changeid_invalidate()
stable
|
changeset |
files
|
| Fri, 17 Jan 2020 20:40:24 +0700 |
Anton Shestakov |
evolve: provide branch argument to overlayworkingctx.tomemctx()
stable
|
changeset |
files
|
| Thu, 23 Jan 2020 19:33:40 +0700 |
Anton Shestakov |
evolve: compatibility with copies.graftcopies() from hg 5.3
stable
|
changeset |
files
|
| Fri, 15 Nov 2019 08:14:06 -0800 |
Martin von Zweigbergk |
cmdrewrite: avoid accessing scmutil.status fields by index
stable
|
changeset |
files
|
| Thu, 23 Jan 2020 17:41:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:59 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:57 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:56 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:54 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:52 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Thu, 23 Jan 2020 17:40:51 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
changeset |
files
|
| Thu, 23 Jan 2020 18:22:47 +0700 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.2
mercurial-5.2
|
changeset |
files
|
| Thu, 23 Jan 2020 18:19:36 +0700 |
Anton Shestakov |
tests: use --tool flag instead of --config ui.merge
stable
|
changeset |
files
|
| Mon, 04 Nov 2019 00:18:55 +0530 |
Sushil khanchi |
evolve: remove a check which is already done by rewriteutil.precheck()
|
changeset |
files
|
| Thu, 23 Jan 2020 11:05:38 +0100 |
Pierre-Yves David |
test-compat: create a compatibility branch for Mercurial 5.2
mercurial-5.2
|
changeset |
files
|
| Thu, 23 Jan 2020 11:01:46 +0100 |
Anton Shestakov |
contrib: make merge-test-compat.sh more topic-friendly
stable
|
changeset |
files
|
| Mon, 20 Jan 2020 22:43:11 +0700 |
Anton Shestakov |
contrib: shellcheck merge-test-compat.sh
stable
|
changeset |
files
|
| Mon, 04 Nov 2019 01:30:50 +0530 |
Sushil khanchi |
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
|
changeset |
files
|
| Wed, 01 Jan 2020 21:36:21 +0530 |
Sushil khanchi |
evolve: rename a function to make it explicit
|
changeset |
files
|
| Tue, 21 Jan 2020 23:48:41 +0700 |
Anton Shestakov |
obsdiscovery: compatibility when importing forcebytestr()
stable
|
changeset |
files
|
| Tue, 03 Dec 2019 14:56:25 +0700 |
Anton Shestakov |
heptapod-ci: add pytype job, allow it to fail for now
|
changeset |
files
|
| Sun, 08 Dec 2019 02:17:11 +0530 |
Sushil khanchi |
evolve: add a new method picksplitsuccessor() in utility.py
|
changeset |
files
|
| Mon, 20 Jan 2020 22:52:05 +0700 |
Anton Shestakov |
changelog: add missing entries
stable
|
changeset |
files
|
| Wed, 15 Jan 2020 15:28:44 +0700 |
Anton Shestakov |
compat: also import datestr from dateutil
|
changeset |
files
|
| Mon, 13 Jan 2020 15:36:24 +0700 |
Anton Shestakov |
obshistory: remove unused ismetablacklisted()
|
changeset |
files
|
| Mon, 13 Jan 2020 15:05:34 +0700 |
Anton Shestakov |
obshistory: remove unused successorsetallmarkers()
|
changeset |
files
|
| Mon, 13 Jan 2020 15:04:02 +0700 |
Anton Shestakov |
obshistory: remove unused _successorsetdates() and _successorsetusers()
|
changeset |
files
|
| Mon, 13 Jan 2020 14:59:08 +0700 |
Anton Shestakov |
obshistory: remove unused preparesuccessorset()
|
changeset |
files
|
| Sat, 11 Jan 2020 20:10:06 +0700 |
Anton Shestakov |
obshistory: use effect flags from obsutil
|
changeset |
files
|
| Sat, 11 Jan 2020 20:06:26 +0700 |
Anton Shestakov |
obshistory: make a {flag value: description} dict for _markerseffects()
|
changeset |
files
|
| Sat, 11 Jan 2020 19:49:45 +0700 |
Anton Shestakov |
obshistory: factor out _markerseffects()
|
changeset |
files
|
| Sat, 11 Jan 2020 19:24:21 +0700 |
Anton Shestakov |
obshistory: factor out _markerspreciseverb()
|
changeset |
files
|
| Fri, 17 Jan 2020 20:40:24 +0700 |
Anton Shestakov |
evolve: provide branch argument to overlayworkingctx.tomemctx()
|
changeset |
files
|
| Wed, 08 Jan 2020 18:44:18 +0700 |
Anton Shestakov |
changelog: mention all the cleanups as one item
|
changeset |
files
|
| Wed, 08 Jan 2020 15:34:34 +0700 |
Anton Shestakov |
templatekw: drop obsfatedata and related code
|
changeset |
files
|
| Tue, 07 Jan 2020 16:33:37 +0700 |
Anton Shestakov |
templatekw: drop obsfateprinter() and obsfatelineprinter()
|
changeset |
files
|
| Tue, 07 Jan 2020 16:30:18 +0700 |
Anton Shestakov |
compat: drop isobsnotesupported() that checks if storing notes is supported
|
changeset |
files
|
| Tue, 07 Jan 2020 16:05:44 +0700 |
Anton Shestakov |
templatekw: use literal set syntax
|
changeset |
files
|
| Sat, 04 Jan 2020 21:07:38 +0700 |
Anton Shestakov |
obshistory: remove obsfateverb/obsfateprinter patching compatibility
|
changeset |
files
|
| Fri, 03 Jan 2020 23:32:48 +0700 |
Anton Shestakov |
obshistory: drop unused keyword argument to _getobsfateandsuccs()
|
changeset |
files
|
| Thu, 02 Jan 2020 01:16:18 +0700 |
Anton Shestakov |
obshistory: use successorsandmarkers() from obsutil, drop local variant
|
changeset |
files
|
| Tue, 31 Dec 2019 21:41:22 +0700 |
Anton Shestakov |
compat: drop code from 35b2d201eb71 (compatibility with hg 4.3)
|
changeset |
files
|
| Thu, 26 Dec 2019 22:32:44 +0700 |
Anton Shestakov |
tests: rename precursors to predecessors in test-evolve-templates.t
|
changeset |
files
|
| Thu, 28 Nov 2019 11:41:17 +0700 |
Anton Shestakov |
evolve: correct spelling of superseded everywhere else
|
changeset |
files
|
| Thu, 28 Nov 2019 11:37:56 +0700 |
Anton Shestakov |
evolve: use obsutil._getobsfate() directly
|
changeset |
files
|
| Sat, 28 Dec 2019 23:20:05 +0530 |
Sushil khanchi |
evolve: remove dead code
|
changeset |
files
|
| Sat, 07 Dec 2019 23:13:40 +0530 |
Sushil khanchi |
evolve: use utility._singlesuccessor() in _solveunstable()
|
changeset |
files
|
| Wed, 18 Dec 2019 16:21:37 +0100 |
Pierre-Yves David |
evolve: preliminary indentation
|
changeset |
files
|
| Fri, 03 Jan 2020 23:12:19 +0700 |
Anton Shestakov |
evolve: provide cache argument to obsutil.successorssets() correctly
stable
|
changeset |
files
|
| Fri, 20 Dec 2019 14:08:37 +0700 |
Anton Shestakov |
pullbundle: random.sample() chokes on a spanset, turn it into a list instead
|
changeset |
files
|
| Fri, 20 Dec 2019 13:50:31 +0700 |
Anton Shestakov |
pullbundle: use % instead of .format() because % exists for bytes
|
changeset |
files
|
| Thu, 19 Dec 2019 18:16:18 +0700 |
Anton Shestakov |
tests: test that debugpullbundlecacheoverlap command works
|
changeset |
files
|
| Thu, 19 Dec 2019 18:02:31 +0700 |
Anton Shestakov |
pullbundle: compatibility for progress in hg <= 4.6
|
changeset |
files
|
| Thu, 19 Dec 2019 18:01:15 +0700 |
Anton Shestakov |
compat: add hg version to progress compatibility code
|
changeset |
files
|
| Mon, 09 Dec 2019 19:59:51 +0700 |
Anton Shestakov |
serverminitopic: ask pytype to disable import-error on a block handling hg 4.5
|
changeset |
files
|
| Mon, 09 Dec 2019 19:58:58 +0700 |
Anton Shestakov |
topic: ask pytype to disable import-error on a block handling hg 4.5
|
changeset |
files
|
| Mon, 09 Dec 2019 16:40:53 +0700 |
Anton Shestakov |
evolve: remove unused struct import
|
changeset |
files
|
| Mon, 09 Dec 2019 19:44:10 +0700 |
Anton Shestakov |
compat: ask pytype to ignore some warnings
|
changeset |
files
|
| Wed, 06 Nov 2019 18:15:00 +0530 |
Sushil khanchi |
evolve: extract logic of pre-checking divergence risk to its own function
|
changeset |
files
|
| Tue, 24 Dec 2019 23:31:42 +0700 |
Anton Shestakov |
heptapod-ci: skip test-evolve.t in tests-py2-pure job
mercurial-4.5
|
changeset |
files
|
| Tue, 10 Dec 2019 00:05:23 +0100 |
Pierre-Yves David |
heptapod-ci: test python 4.5 with the pure version of Mercurial
mercurial-4.5
|
changeset |
files
|
| Thu, 26 Dec 2019 21:23:30 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 26 Dec 2019 12:22:49 +0700 |
Anton Shestakov |
pullbundle: kwarg to changegroup.makestream() is called matcher
stable
|
changeset |
files
|
| Sun, 01 Dec 2019 12:41:20 +0530 |
Sushil khanchi |
evolve: extract pre merging content-div csets logic to its own function
|
changeset |
files
|
| Thu, 26 Dec 2019 20:28:21 +0100 |
Pierre-Yves David |
evolve: further simplify a conditional
|
changeset |
files
|
| Thu, 26 Dec 2019 20:23:27 +0100 |
Pierre-Yves David |
evolve: simplify some conditional
|
changeset |
files
|
| Thu, 26 Dec 2019 20:17:01 +0100 |
Pierre-Yves David |
evolve: rename some variable ahead of time
|
changeset |
files
|
| 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
|