| Thu, 12 Aug 2021 22:00:46 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.7
mercurial-5.7
|
| Sun, 08 Aug 2021 01:00:45 +0300 |
Anton Shestakov |
compat: patch overlayworkingctx._markdirty() for hg 5.0 and earlier
stable
|
| Sun, 08 Aug 2021 00:59:11 +0300 |
Anton Shestakov |
compat: patch overlayworkingctx.markcopied() for hg 4.9 and earlier
stable
|
| Thu, 01 Jul 2021 15:47:45 +0300 |
Anton Shestakov |
stablerange: switch debugstablerange's default --method value to mergepoint
|
| Thu, 01 Jul 2021 14:36:20 +0300 |
Anton Shestakov |
tests: use `| tee` for writing to files at the same time as to stdout
|
| Tue, 29 Jun 2021 12:46:28 +0300 |
Anton Shestakov |
tests: add the other methods for debugstablerange as test cases
|
| Tue, 29 Jun 2021 12:16:17 +0300 |
Anton Shestakov |
evolve: remove experimental.obshashrange.lru-size docs
|
| Thu, 29 Jul 2021 22:45:51 +0300 |
Anton Shestakov |
fold: make sure to save commit messages in last-message.txt on rewrites
stable
|
| Wed, 28 Jul 2021 02:44:12 +0300 |
Anton Shestakov |
evolve: use obsolete.isenabled() instead of ui.configbool() directly
|
| Fri, 06 Aug 2021 00:04:46 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
| Wed, 04 Aug 2021 00:46:06 +0300 |
Anton Shestakov |
compat: use movedirstate() from core if on hg 5.9+
stable
|
| Wed, 04 Aug 2021 00:45:25 +0300 |
Anton Shestakov |
compat: import copies as copiesmod to prepare for the next patch
stable
|
| Wed, 04 Aug 2021 00:44:23 +0300 |
Anton Shestakov |
evolve: move movedirstate() to compat
stable
|
| Tue, 04 May 2021 09:39:45 -0700 |
Martin von Zweigbergk |
compat: make compatible with upstream change to put nullid on repo
stable
|
| Tue, 27 Jul 2021 03:06:25 +0300 |
Anton Shestakov |
topic: correctly update from public commits with a (now hidden) topic
stable
|
| Tue, 27 Jul 2021 03:00:09 +0300 |
Anton Shestakov |
tests: update to the current topic to prepare for the next patch
stable
|
| Mon, 05 Oct 2020 09:21:59 -0700 |
Martin von Zweigbergk |
rewriteutil: remove now-unused `update` argument from `rewite()`
stable
|
| Mon, 05 Oct 2020 08:35:17 -0700 |
Martin von Zweigbergk |
rewriteutil: fix broken touch of merge commits (issue6416)
stable
|
| Mon, 05 Oct 2020 09:02:21 -0700 |
Martin von Zweigbergk |
tests: demonstrate that touch can lose files (issue6416)
stable
|
| Tue, 13 Jul 2021 16:19:29 -0400 |
Matt Harbison |
topic: fix the help text to show how to disable publishing
stable
|
| Mon, 05 Oct 2020 10:29:29 -0700 |
Martin von Zweigbergk |
tests: add test showing that touch preserves copies
stable
|
| Wed, 23 Jun 2021 10:44:37 +0300 |
Anton Shestakov |
tests: consistently glob "1970/01/01 00:00:00" in blackbox output
stable
|
| Wed, 23 Jun 2021 10:24:59 +0300 |
Anton Shestakov |
tests: actually remove evoext cache files
stable
|
| Sat, 19 Jun 2021 22:13:13 +0300 |
Anton Shestakov |
evolve: drop the deprecated --unstable, --divergent and --bumped flags
|
| Wed, 03 Feb 2021 13:23:41 +0530 |
Sushil khanchi |
tests: use common.sh for creating commits
|
| Wed, 03 Feb 2021 10:07:54 +0530 |
Sushil khanchi |
pick: move `continue` and `abort` blocks above for more clarity
|
| Tue, 04 May 2021 09:40:18 -0700 |
Martin von Zweigbergk |
rewriteutil: use precheck from core if recent enough
|
| Sat, 19 Jun 2021 22:33:38 +0300 |
Anton Shestakov |
tests: drop 3.7 compatibility for log -G missing parent edge
|
| Sat, 19 Jun 2021 22:09:08 +0300 |
Anton Shestakov |
evolve: map the deprecated --unstable flag to --orphan correctly
|
| Sat, 19 Jun 2021 09:39:01 +0300 |
Anton Shestakov |
tests: there's no need to have hgext3rd. before extension name either
|
| Sat, 19 Jun 2021 09:41:06 +0300 |
Anton Shestakov |
tests: there's no need to have hgext. before extension name
|
| Sat, 19 Jun 2021 09:34:16 +0300 |
Anton Shestakov |
tests: drop blackbox from one obshashrange test that doesn't use it
|
| Thu, 17 Jun 2021 11:18:30 +0300 |
Anton Shestakov |
tests: spell out hg resolve
|
| Thu, 17 Jun 2021 11:16:53 +0300 |
Anton Shestakov |
tests: spell out hg parents
|
| Thu, 17 Jun 2021 11:08:01 +0300 |
Anton Shestakov |
tests: spell out hg commands for readability
|
| Thu, 17 Jun 2021 10:57:53 +0300 |
Anton Shestakov |
tests: use mkcommit() from common.sh in test-fold.t
|
| Thu, 17 Jun 2021 10:55:51 +0300 |
Anton Shestakov |
tests: evolve should be able to handle split parents by now
|
| Thu, 17 Jun 2021 10:31:17 +0300 |
Anton Shestakov |
tests: remove bits of older setups that no longer are needed
|
| Mon, 21 Jun 2021 07:19:55 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
| Thu, 17 Jun 2021 11:26:49 +0300 |
Anton Shestakov |
evolve: hg commit has --message flag
stable
|
| Wed, 16 Jun 2021 08:29:28 +0300 |
Anton Shestakov |
tests: improve tarball size check in test-check-sdist.t
stable
|
| Mon, 14 Jun 2021 16:41:29 +0200 |
Pierre-Yves David |
readme: move the support channel on libera
stable
|
| Sat, 05 Jun 2021 00:34:53 +0800 |
Anton Shestakov |
evolve: wrap the more modern wireprotov1server._capabilities()
|
| Sat, 29 May 2021 14:32:05 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Sat, 29 May 2021 14:26:04 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Fri, 28 May 2021 22:54:50 +0200 |
Pierre-Yves David |
Added tag 10.3.2 for changeset 30c8d8e6a7f4
stable
|
| Fri, 28 May 2021 16:17:48 +0800 |
Anton Shestakov |
packaging: prepare version 10.3.2
stable 10.3.2
|
| Fri, 28 May 2021 00:28:25 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 28 May 2021 00:23:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 28 May 2021 00:12:32 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Fri, 28 May 2021 00:03:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Thu, 27 May 2021 23:58:50 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Thu, 27 May 2021 23:50:51 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Thu, 27 May 2021 23:45:16 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Thu, 27 May 2021 23:35:37 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Thu, 27 May 2021 23:25:57 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.5 into mercurial-5.4
mercurial-5.4
|
| Thu, 27 May 2021 23:18:19 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.6 into mercurial-5.5
mercurial-5.5
|
| Thu, 27 May 2021 23:09:47 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Thu, 27 May 2021 23:01:35 +0800 |
Anton Shestakov |
test-compat: back out changeset 72c97e825530
mercurial-5.7
|
| Thu, 27 May 2021 22:44:18 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.7
mercurial-5.7
|
| Wed, 26 May 2021 22:37:07 +0800 |
Anton Shestakov |
tests: update tagcache-related output of blackbox
stable
|
| Tue, 25 May 2021 18:46:09 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Mon, 24 May 2021 16:01:07 +0800 |
Anton Shestakov |
changelog: add the recent fixes
stable
|
| Mon, 24 May 2021 15:15:45 +0800 |
Anton Shestakov |
evolve: use "served" repo filter to guess what the server will publish
stable
|
| Mon, 24 May 2021 15:14:30 +0800 |
Anton Shestakov |
topic: use "served" repo filter to guess what the server will publish
stable
|
| Mon, 24 May 2021 14:26:42 +0800 |
Anton Shestakov |
topic: announce ext-topics-publish capability in case of SSH and HTTP too
stable
|
| Wed, 19 May 2021 16:28:47 +0800 |
Anton Shestakov |
topic: add more variables to make a condition fit on one line
stable
|
| Wed, 19 May 2021 10:18:43 +0800 |
Anton Shestakov |
tests: add an alias for log -G with topo sort for convenience
stable
|
| Wed, 19 May 2021 10:05:29 +0800 |
Anton Shestakov |
tests: it's N after M
stable
|
| Wed, 19 May 2021 09:59:53 +0800 |
Anton Shestakov |
tests: add simple auto-publish checks alongside publish-bare-branch checks
stable
|
| Wed, 03 Mar 2021 12:40:59 +0530 |
Sushil khanchi |
divergence-resolution: use last evolution date to choose p1 when merging
|
| Mon, 17 May 2021 19:23:09 +0800 |
Anton Shestakov |
split: adjust "no more change to split" to use plural form
|
| Mon, 17 May 2021 19:22:34 +0800 |
Anton Shestakov |
topic: add a 'topic.active' label to messages with active topic
|
| Mon, 17 May 2021 19:19:32 +0800 |
Anton Shestakov |
evolve: add labels to messages about leaving and deleting bookmarks
|
| Mon, 17 May 2021 19:11:06 +0800 |
Anton Shestakov |
topic: make two almost identical messages actually identical
|
| Mon, 17 May 2021 19:10:22 +0800 |
Anton Shestakov |
evolve: drop quotes around node in a content divergence resolution message
|
| Mon, 17 May 2021 17:45:57 +0800 |
Anton Shestakov |
topic: remove duplicate entry in the colortable
|
| Sun, 09 May 2021 00:10:55 +0800 |
Anton Shestakov |
topic: don't lose any file changes when changing topic of a merge commit
stable
|
| Sun, 09 May 2021 00:09:53 +0800 |
Anton Shestakov |
tests: add test-amend-merge.t with a simple merge amended by various commands
stable
|
| Sat, 15 May 2021 20:40:19 +0800 |
Anton Shestakov |
next: refactor two if blocks into an if-elif block
stable
|
| Sat, 15 May 2021 20:27:53 +0800 |
Anton Shestakov |
tests: demonstrate current behavior of hg next with --merge and --evolve
stable
|
| Sat, 15 May 2021 03:00:00 +0800 |
Anton Shestakov |
changelog: mention hg next --abort
|
| Sat, 15 May 2021 02:59:11 +0800 |
Anton Shestakov |
next: add an --abort flag
|
| Sat, 15 May 2021 02:58:04 +0800 |
Anton Shestakov |
compat: add check_at_most_one_arg() and check_incompatible_arguments()
|
| Sun, 09 May 2021 20:02:01 +0800 |
Anton Shestakov |
tests: remove unnecessary config from test-obsolete.t
|
| Sun, 09 May 2021 19:58:24 +0800 |
Anton Shestakov |
tests: drop debugobsolete alias from common.sh
|
| Tue, 04 May 2021 09:39:45 -0700 |
Martin von Zweigbergk |
compat: make compatible with upstream change to put nullid on repo
|
| Sun, 02 May 2021 22:06:11 +0800 |
Anton Shestakov |
next: remove duplicated targets when updating from an unstable changeset
stable
|
| Sun, 25 Apr 2021 23:52:29 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Sun, 25 Apr 2021 23:50:21 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Sun, 25 Apr 2021 15:32:51 +0200 |
Pierre-Yves David |
Added tag 10.3.1 for changeset 93dc3cb68842
stable
|
| Sun, 25 Apr 2021 14:13:51 +0800 |
Anton Shestakov |
packaging: prepare version 10.3.1
stable 10.3.1
|
| Sun, 25 Apr 2021 14:12:01 +0800 |
Anton Shestakov |
changelog: update for evolve 10.3.1 and topic 0.22.1
stable
|
| Fri, 12 Mar 2021 19:04:11 +0800 |
Anton Shestakov |
changelog: fix a couple of typos that got through
stable
|
| Sun, 25 Apr 2021 13:24:36 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 25 Apr 2021 13:21:56 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Sun, 25 Apr 2021 13:18:03 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Sun, 25 Apr 2021 13:13:02 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Sat, 24 Apr 2021 21:34:57 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Sat, 24 Apr 2021 21:24:54 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Sat, 24 Apr 2021 21:13:21 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Sat, 24 Apr 2021 21:08:47 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sat, 24 Apr 2021 20:34:40 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.5 into mercurial-5.4
mercurial-5.4
|
| Sat, 24 Apr 2021 20:27:44 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.6 into mercurial-5.5
mercurial-5.5
|
| Sat, 24 Apr 2021 20:01:39 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Sat, 24 Apr 2021 19:54:14 +0800 |
Anton Shestakov |
test-compat: back out changeset 5b804fec43be
mercurial-5.7
|
| Sat, 24 Apr 2021 19:53:59 +0800 |
Anton Shestakov |
test-compat: back out changeset 7e2d3952a730
mercurial-5.7
|
| Sat, 24 Apr 2021 19:53:12 +0800 |
Anton Shestakov |
test-compat: back out changeset 1682b388be13
mercurial-5.7
|
| Sat, 24 Apr 2021 19:46:08 +0800 |
Anton Shestakov |
test-compat: create a compatibility branch for Mercurial 5.7
mercurial-5.7
|
| Fri, 23 Apr 2021 13:05:18 +0200 |
Pierre-Yves David |
changelog: adjust the last changelog entry
stable
|
| Fri, 23 Apr 2021 13:05:18 +0200 |
Pierre-Yves David |
changelog: mention the cache fix
stable
|
| Thu, 22 Apr 2021 21:08:50 +0800 |
Anton Shestakov |
changelog: mention the recent hg next fixes
stable
|
| Thu, 22 Apr 2021 17:19:01 +0800 |
Anton Shestakov |
next: treat targets that need evolution the same as regular targets
stable
|
| Thu, 22 Apr 2021 17:18:37 +0800 |
Anton Shestakov |
next: filter unstable targets by topic only when there's no --no-topic
stable
|
| Wed, 21 Apr 2021 20:05:56 +0800 |
Anton Shestakov |
next: drop safety net around getting --no-topic flag value
stable
|
| Wed, 21 Apr 2021 19:51:00 +0800 |
Anton Shestakov |
next: make `filtered` a set of revs, not contexts
stable
|
| Wed, 21 Apr 2021 19:44:26 +0800 |
Anton Shestakov |
next: make aspchildren filtering code work correctly
stable
|
| Wed, 21 Apr 2021 19:41:41 +0800 |
Anton Shestakov |
evolve: rename choosedrev to selectedrev because choosed is not a word
stable
|
| Fri, 23 Apr 2021 11:55:42 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Thu, 22 Apr 2021 20:51:46 +0800 |
Anton Shestakov |
tests: more globbing on the copyright line
stable
|
| Fri, 12 Mar 2021 18:48:49 +0800 |
Anton Shestakov |
tests: drop rev-branch-cache bundle capability, it's no longer advertised
stable
|
| Thu, 04 Feb 2021 19:23:45 +0800 |
Anton Shestakov |
tests: update more exit codes in case conflicting changes
stable
|
| Thu, 04 Feb 2021 19:21:28 +0800 |
Anton Shestakov |
tests: update exit code for failed hooks
stable
|
| Fri, 19 Mar 2021 16:23:24 +0800 |
Anton Shestakov |
topic: compatibility for branchcache having a repo argument in 5.8
stable
|
| Tue, 13 Apr 2021 19:46:03 +0800 |
Anton Shestakov |
evolve: check stablesortcache index size before unpacking (issue6354)
stable
|
| Tue, 13 Apr 2021 18:40:19 +0800 |
Anton Shestakov |
evolve: save cache in debugstablesortcache()
stable
|
| Tue, 13 Apr 2021 18:31:14 +0800 |
Anton Shestakov |
tests: clarify what repack.py is doing in test-cache-corruption.t
stable
|
| Mon, 05 Apr 2021 16:36:35 +0800 |
Anton Shestakov |
tests: now we can drop cache corruption checks from obshashrange tests
stable
|
| Mon, 05 Apr 2021 16:35:47 +0800 |
Anton Shestakov |
tests: add a separate test file to test cache corruption and recovery
stable
|
| Fri, 02 Apr 2021 18:56:43 +0800 |
Anton Shestakov |
compat: remove unused arraytobytes/arrayfrombytes
stable
|
| Wed, 31 Mar 2021 20:39:37 +0800 |
Anton Shestakov |
evolve: make stablesortcache.save/load use struct.unpack/pack (issue6354)
stable
|
| Tue, 30 Mar 2021 19:35:52 +0800 |
Anton Shestakov |
evolve: make firstmergecache.save/load use struct.unpack/pack (issue6354)
stable
|
| Wed, 31 Mar 2021 20:13:31 +0800 |
Anton Shestakov |
evolve: add debugfirstmergecache command to simply dump the contents
stable
|
| Tue, 30 Mar 2021 19:18:08 +0800 |
Anton Shestakov |
evolve: make depthcache.save/load use struct.unpack/pack (issue6354)
stable
|
| Wed, 24 Mar 2021 22:07:07 +0800 |
Anton Shestakov |
evolve: use nullrev for an empty cache key
stable
|
| Wed, 17 Mar 2021 20:19:41 +0800 |
Anton Shestakov |
tests: add some cache sanity checks based on already existing debug commands
stable
|
| Wed, 17 Mar 2021 14:48:13 +0800 |
Anton Shestakov |
tests: add a content check for evoext-* caches
stable
|
| Sun, 28 Mar 2021 10:20:34 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
| Mon, 08 Mar 2021 01:12:02 +0530 |
Sushil khanchi |
evolve: update some conditionals
|
| Mon, 08 Mar 2021 17:45:57 +0530 |
Sushil khanchi |
public-content-divergence: early set the public one to local side
|
| Fri, 19 Mar 2021 15:52:00 +0800 |
Anton Shestakov |
firstmergecache: fix a typo that prevented cache clearing in repo.destroyed()
stable
|
| Wed, 17 Mar 2021 20:13:53 +0800 |
Anton Shestakov |
evolve: use bytes for calling ui.write() in debugstablesortcache command
stable
|
| Tue, 16 Mar 2021 21:35:02 +0800 |
Anton Shestakov |
tests: cleanup in obshashrange tests
stable
|
| Tue, 16 Mar 2021 21:25:11 +0800 |
Anton Shestakov |
evolve: use cl.tiprev() instead of len(cl) - 1
stable
|
| Mon, 15 Mar 2021 19:21:23 +0800 |
Anton Shestakov |
tests: a bunch of typos in test-discovery-obshashrange-cache.t
stable
|
| Mon, 15 Mar 2021 18:45:18 +0800 |
Anton Shestakov |
tests: simplify character sorting script
stable
|
| Sun, 14 Mar 2021 16:56:16 +0800 |
Anton Shestakov |
evolve: remove pointless ternary operator
stable
|
| Sun, 14 Mar 2021 16:50:49 +0800 |
Anton Shestakov |
evolve: import mercurial.i18n._ first
stable
|
| Sun, 14 Mar 2021 16:48:41 +0800 |
Anton Shestakov |
evolve: use correct unit for cache building progress
stable
|
| Fri, 19 Mar 2021 16:23:24 +0800 |
Anton Shestakov |
topic: compatibility for branchcache having a repo argument in 5.8
|
| Fri, 12 Mar 2021 11:05:20 +0100 |
Pierre-Yves David |
make: default to using python3
stable
|
| Fri, 12 Mar 2021 19:04:11 +0800 |
Anton Shestakov |
changelog: fix a couple of typos that got through
|
| Fri, 12 Mar 2021 18:48:49 +0800 |
Anton Shestakov |
tests: drop rev-branch-cache bundle capability, it's no longer advertised
|
| Fri, 12 Mar 2021 11:13:16 +0100 |
Pierre-Yves David |
branching: merge with the wrong head
|
| Fri, 12 Mar 2021 18:07:48 +0800 |
Anton Shestakov |
branching: redo the stable->default merge (preserving test changes on default)
|
| Thu, 11 Mar 2021 19:06:38 +0800 |
Anton Shestakov |
branching: merge stable into default (preserving test changes on default)
|
| Thu, 11 Mar 2021 18:56:59 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Thu, 11 Mar 2021 18:47:55 +0800 |
Anton Shestakov |
Added tag 10.3.0 for changeset c0ed8e574638
stable
|
| Thu, 11 Mar 2021 17:14:09 +0800 |
Anton Shestakov |
ci: build sdist tarball as a post step (only for tagged revisions)
stable 10.3.0
|
| Thu, 11 Mar 2021 18:32:58 +0800 |
Anton Shestakov |
packaging: prepare evolve version 10.3.0
stable
|
| Thu, 11 Mar 2021 18:32:11 +0800 |
Anton Shestakov |
packaging: update the debian changelog
stable
|
| Thu, 11 Mar 2021 18:31:51 +0800 |
Anton Shestakov |
changelog: update for evolve 10.3.0
stable
|
| Thu, 11 Mar 2021 14:49:22 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Thu, 11 Mar 2021 14:48:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Thu, 11 Mar 2021 14:42:51 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Thu, 11 Mar 2021 14:32:26 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Thu, 11 Mar 2021 14:22:45 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Thu, 11 Mar 2021 14:07:39 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Thu, 11 Mar 2021 13:36:30 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Thu, 11 Mar 2021 13:27:18 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Thu, 11 Mar 2021 13:18:30 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.5 into mercurial-5.4
mercurial-5.4
|
| Thu, 11 Mar 2021 12:51:00 +0800 |
Anton Shestakov |
tests: remove in-memory evolve cases (not supported prior to 5.6)
mercurial-5.5
|
| Thu, 11 Mar 2021 12:40:20 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.6 into mercurial-5.5
mercurial-5.5
|
| Thu, 11 Mar 2021 12:29:50 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.6
mercurial-5.6
|
| Thu, 11 Mar 2021 12:06:42 +0800 |
Anton Shestakov |
test-compat: back out changeset ab2c56cdfc19
stable
|
| Thu, 11 Mar 2021 12:06:41 +0800 |
Anton Shestakov |
test-compat: back out changeset ad80552c706c
stable
|
| Thu, 11 Mar 2021 11:49:34 +0800 |
Anton Shestakov |
branching: merge into stable in preparation for release
stable
|
| Tue, 09 Mar 2021 18:50:10 +0800 |
Anton Shestakov |
evolve: check if in-memory is supported on a good enough level for evolve
|
| Tue, 02 Feb 2021 00:05:19 +0530 |
Sushil khanchi |
divergence-resolution: update some comments
|
| Mon, 01 Feb 2021 23:56:34 +0530 |
Sushil khanchi |
evolve: drop unnecessary variables (follow-up of a9ad01ed1539)
|
| Wed, 03 Mar 2021 10:57:09 +0800 |
Anton Shestakov |
tests: remove some unnecessary config
|
| Thu, 04 Mar 2021 09:12:41 +0800 |
Anton Shestakov |
changelog: move a recently added feature to the correct release
|
| Thu, 04 Mar 2021 09:12:04 +0800 |
Anton Shestakov |
changelog: reorder items, spelling
|
| Wed, 03 Mar 2021 11:08:13 +0800 |
Anton Shestakov |
changelog: fix indent
|
| Sat, 05 Sep 2020 09:24:33 +0530 |
Sushil khanchi |
evolve: add CHANGELOG entry
|
| Wed, 26 Aug 2020 23:27:17 +0530 |
Sushil khanchi |
evolve: preserve wdir when using --stop
|
| Mon, 01 Mar 2021 19:22:33 +0800 |
Anton Shestakov |
evolve: update a couple of comments in the recently created revset.py
|
| Mon, 01 Mar 2021 19:21:54 +0800 |
Anton Shestakov |
evolve: add a compat comment to unstable() revset predicate
|
| Sat, 27 Feb 2021 19:13:04 +0800 |
Anton Shestakov |
evolve: document provided revset predicates
|
| Sat, 27 Feb 2021 18:22:12 +0800 |
Anton Shestakov |
evolve: split revsets into its own separate revset.py
|
| Sat, 27 Feb 2021 18:07:27 +0800 |
Anton Shestakov |
evolve: rearrange some imports
|
| Sat, 27 Feb 2021 18:02:03 +0800 |
Anton Shestakov |
evolve: remove hg 3.8 check
|
| Sat, 27 Feb 2021 12:04:24 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 23 Feb 2021 18:34:07 +0800 |
Anton Shestakov |
tests: add underlines to test-rewind.t
|
| Tue, 22 Dec 2020 19:07:46 +0800 |
Anton Shestakov |
rewind: abort if some parts of a fold are unknown locally
|
| Tue, 22 Dec 2020 19:06:36 +0800 |
Anton Shestakov |
rewind: abort when trying to rewind to multiple unrelated predecessors
|
| Tue, 22 Dec 2020 19:03:59 +0800 |
Anton Shestakov |
rewind: walk obsmarkers and add more targets to rewind to
|
| Thu, 18 Feb 2021 07:39:38 +0800 |
Anton Shestakov |
tests: make test-check-sdist.t less flaky by first archiving the repo
|
| Wed, 24 Feb 2021 14:30:21 -0800 |
Chuck Tuffli |
doc: change topic phrase 'disappear' to 'fade out'
stable
|
| Fri, 12 Feb 2021 13:16:01 -0800 |
Chuck Tuffli |
doc: document stack as a substitue for MQ's qseries
stable
|
| Mon, 22 Feb 2021 15:34:15 -0800 |
Martin von Zweigbergk |
evolve: document experimental.evolution.in-memory in extension
|
| Mon, 22 Feb 2021 12:56:39 -0800 |
Martin von Zweigbergk |
changelog: mention new experimental.evolution.in-memory config
|
| Tue, 23 Feb 2021 13:31:24 -0800 |
Kyle Lippincott |
obslog: correct help to state that obslog is the command name
|
| Tue, 23 Feb 2021 06:36:46 +0800 |
Anton Shestakov |
evolve: use nodemod.short() instead of nodemod.hex()[:12]
|
| Tue, 23 Feb 2021 06:31:01 +0800 |
Anton Shestakov |
evolve: rely on ctx.__bytes__() for formatting instead of using ctx.hex()[:12]
|
| Tue, 23 Feb 2021 06:06:06 +0800 |
Anton Shestakov |
pstatus: drop unnecessary CLI options
|
| Wed, 17 Feb 2021 15:37:14 +0530 |
Sushil khanchi |
pdiff: drop unnecessary CLI options
|
| Mon, 22 Feb 2021 17:37:53 +0100 |
Pierre-Yves David |
changelog: add an entry aboutt improved divergence resolution
|
| Sun, 24 Jan 2021 20:09:28 +0530 |
Pierre-Yves David |
divergence-resolution: [patch 3] fix a messed up test case
|
| Sun, 24 Jan 2021 20:09:02 +0530 |
Pierre-Yves David |
divergence-resolution: [patch 2] fix a messed up test case
|
| Sun, 24 Jan 2021 19:47:17 +0530 |
Pierre-Yves David |
divergence-resolution: [patch 1] fix a messed up test case
|
| Wed, 17 Feb 2021 18:11:44 +0530 |
Sushil khanchi |
divergence-resolution: drop a block of code which is unnecessary now
|
| Thu, 18 Feb 2021 23:37:41 +0530 |
Sushil khanchi |
divergence-resolution: add support and doc for a special case in divergence
|
| Mon, 01 Feb 2021 23:54:53 +0530 |
Sushil khanchi |
divergence-resolution: add comments to explain a particular case
|
| Fri, 22 Jan 2021 05:37:43 +0100 |
Sushil khanchi |
divergence-resolution: take parent successors in account
|
| Thu, 28 Jan 2021 13:40:36 +0530 |
Sushil khanchi |
divergence-resolution: add a buggy test case for resolution
|
| Wed, 17 Feb 2021 14:00:43 -0800 |
Kyle Lippincott |
doc: switch rst `=` section underlines to `-`
|
| Wed, 17 Feb 2021 12:00:45 -0800 |
Kyle Lippincott |
doc: remove .strip() for a docstring
|
| Tue, 24 Nov 2020 16:33:24 -0800 |
Martin von Zweigbergk |
evolvecmd: don't update working copy when using in-memory merge
|
| Thu, 15 Oct 2020 15:40:36 -0700 |
Martin von Zweigbergk |
evolve: when relocating, optionally first try to do it using in-memory merge
|
| Thu, 01 Oct 2020 12:34:36 -0700 |
Martin von Zweigbergk |
tests: add test for in-memory evolve, not actually in-memory yet
|
| Thu, 15 Oct 2020 15:16:36 -0700 |
Martin von Zweigbergk |
evolvecmd: extract function for rewriting hashes in commit message
|
| Tue, 09 Feb 2021 19:11:39 +0800 |
Anton Shestakov |
branching: merge stable into default
|
| Wed, 03 Feb 2021 08:07:10 -0800 |
Chuck Tuffli |
tests: fix spelling in test-topic-stack.t
stable
|
| Mon, 08 Feb 2021 16:31:35 +0800 |
Anton Shestakov |
tests: add test-check-sdist.t to check setup.py sdist results
stable
|
| Mon, 01 Feb 2021 19:57:33 +0800 |
Anton Shestakov |
manifest: use a regular relative path for excluding legacy.py
stable
|
| Mon, 01 Feb 2021 19:52:39 +0800 |
Anton Shestakov |
manifest: include all .py files from hgext3rd
stable
|
| Thu, 04 Feb 2021 19:23:45 +0800 |
Anton Shestakov |
tests: update more exit codes in case conflicting changes
|
| Thu, 04 Feb 2021 19:21:28 +0800 |
Anton Shestakov |
tests: update exit code for failed hooks
|
| Sun, 31 Jan 2021 16:46:17 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 31 Jan 2021 16:15:26 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Sun, 31 Jan 2021 16:06:16 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Sun, 31 Jan 2021 15:57:57 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Sun, 31 Jan 2021 15:39:25 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Sat, 30 Jan 2021 20:58:19 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Sat, 30 Jan 2021 20:53:45 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Sat, 30 Jan 2021 20:49:07 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sat, 30 Jan 2021 20:42:49 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.5 into mercurial-5.4
mercurial-5.4
|
| Sat, 30 Jan 2021 20:32:38 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.6 into mercurial-5.5
mercurial-5.5
|
| Fri, 29 Jan 2021 17:23:31 +0800 |
Anton Shestakov |
tests: update branch cache writes in blackbox output (only strips)
mercurial-5.6
|
| Fri, 29 Jan 2021 17:18:32 +0800 |
Anton Shestakov |
tests: back out tests for oneline-summary support from 8c7de8f8bb42
mercurial-5.6
|
| Thu, 28 Jan 2021 18:57:49 +0800 |
Anton Shestakov |
tests: back out changeset d0f73113fcc0
mercurial-5.6
|
| Thu, 28 Jan 2021 18:57:48 +0800 |
Anton Shestakov |
tests: back out changeset 59b2be90e9fd
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:41 +0800 |
Anton Shestakov |
tests: back out changeset ceaa85c47973
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:40 +0800 |
Anton Shestakov |
tests: back out changeset 84393bcf9859
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:39 +0800 |
Anton Shestakov |
tests: back out changeset 77b184ee60b5
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:38 +0800 |
Anton Shestakov |
tests: back out changeset 38ab502ad94e
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:37 +0800 |
Anton Shestakov |
tests: back out changeset a4e50b74747e
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:37 +0800 |
Anton Shestakov |
tests: back out changeset 2238dd83c5b3
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:36 +0800 |
Anton Shestakov |
tests: back out changeset b3d9e6c805d6
mercurial-5.6
|
| Sat, 30 Jan 2021 20:21:19 +0800 |
Anton Shestakov |
test-compat: create a compatibility branch for Mercurial 5.6
mercurial-5.6
|
| Mon, 01 Feb 2021 11:52:04 +0100 |
Pierre-Yves David |
release: merge with stable
stable
|
| Mon, 01 Feb 2021 11:51:00 +0100 |
Pierre-Yves David |
Added tag 10.2.0.post1 for changeset eadc1d09f2f5
stable
|
| Mon, 01 Feb 2021 11:50:43 +0100 |
Pierre-Yves David |
release: prepare a 10.2.0.post1 release
stable 10.2.0.post1
|
| Mon, 01 Feb 2021 14:44:43 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Mon, 01 Feb 2021 14:44:05 +0800 |
Anton Shestakov |
Added tag 10.2.0 for changeset 35b883a4ff5a
stable
|
| 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
|
