| 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
|
| Fri, 11 Oct 2019 17:05:37 +0200 |
Denis Laxalde |
debian: use pybuild and dh_sphinxdoc
stable
|
changeset |
files
|
| Tue, 15 Oct 2019 11:41:22 +0200 |
Denis Laxalde |
debian: mark 9.2.1-1 as released
stable
|
changeset |
files
|
| Sat, 19 Oct 2019 10:42:09 -0700 |
Martin von Zweigbergk |
obsexchange: delete dead code for old exchange protocol
|
changeset |
files
|
| Wed, 23 Oct 2019 01:14:42 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 23 Oct 2019 01:11:13 +0200 |
Pierre-Yves David |
branching: merge the stable branch with the mercurial-5.1 branch
mercurial-5.1
|
changeset |
files
|
| Thu, 10 Oct 2019 08:22:41 +0700 |
Anton Shestakov |
tests: add the new "-r" bit to the usual merge hint
stable
|
changeset |
files
|
| Wed, 23 Oct 2019 01:07:58 +0200 |
Pierre-Yves David |
test-output: reinstalled test change for 5.2
stable
|
changeset |
files
|
| Wed, 23 Oct 2019 00:58:56 +0200 |
Pierre-Yves David |
test-compat: opening test compatibility branch for mercurial 5.1
mercurial-5.1
|
changeset |
files
|
| Thu, 17 Oct 2019 21:03:19 +0200 |
Denis Laxalde |
py3: encode/decode with going through ui in rst directive
stable
|
changeset |
files
|
| Fri, 11 Oct 2019 16:51:13 +0200 |
Denis Laxalde |
py3: fix setup.py --version
stable
|
changeset |
files
|
| Wed, 16 Oct 2019 18:12:53 +0200 |
Manuel Jacob |
rewind: preserve date
stable
|
changeset |
files
|
| Wed, 09 Oct 2019 21:22:03 +0700 |
Anton Shestakov |
metaedit: don't change commit date by default (issue5994)
stable
|
changeset |
files
|
| Wed, 09 Oct 2019 20:16:38 +0700 |
Anton Shestakov |
tests: simply use testlib/common.sh in test-metaedit.t
stable
|
changeset |
files
|
| Wed, 09 Oct 2019 20:12:54 +0700 |
Anton Shestakov |
tests: turn glog shell function into an alias in test-metaedit.t
stable
|
changeset |
files
|
| Wed, 09 Oct 2019 20:07:42 +0700 |
Anton Shestakov |
tests: clean up test-metaedit.t
stable
|
changeset |
files
|
| Sun, 06 Oct 2019 02:30:12 -0400 |
Rodrigo Damazio |
help: categorizing evolve and topic commands
|
changeset |
files
|
| Thu, 10 Oct 2019 08:22:41 +0700 |
Anton Shestakov |
tests: add the new "-r" bit to the usual merge hint
|
changeset |
files
|
| Sat, 05 Oct 2019 14:31:19 -0400 |
Pierre-Yves David |
branching: merge back into default
|
changeset |
files
|
| Mon, 07 Oct 2019 14:38:56 +0700 |
Anton Shestakov |
pick: don't create any successors when there were no changes (issue6093)
stable
|
changeset |
files
|
| Sat, 05 Oct 2019 14:26:19 -0400 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Sat, 05 Oct 2019 14:22:21 -0400 |
Pierre-Yves David |
Added tag 9.2.1 for changeset d989bab720e5
stable
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:13 -0400 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:11 -0400 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:09 -0400 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:07 -0400 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:05 -0400 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Sat, 05 Oct 2019 13:50:03 -0400 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Sat, 05 Oct 2019 13:48:25 -0400 |
Pierre-Yves David |
packaging: prepare version 9.2.1
stable 9.2.1
|
changeset |
files
|
| Sat, 05 Oct 2019 13:46:13 -0400 |
Pierre-Yves David |
packaging: update changelog
stable
|
changeset |
files
|
| Sat, 05 Oct 2019 13:56:37 -0400 |
Pierre-Yves David |
manifest: exclude the gitlab file
stable
|
changeset |
files
|
| Fri, 04 Oct 2019 14:16:52 -0400 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 03 Oct 2019 23:48:50 +0100 |
Ian Moody |
py3: return unicode from setup.py's get_version
stable
|
changeset |
files
|
| Thu, 03 Oct 2019 23:39:37 +0100 |
Ian Moody |
py3: remove smartquotes from README
stable
|
changeset |
files
|
| Thu, 03 Oct 2019 23:20:47 +0100 |
Ian Moody |
setup: make runnable from other dirs
stable
|
changeset |
files
|
| Thu, 03 Oct 2019 23:17:13 +0100 |
Ian Moody |
setup: add a test for running setup.py
stable
|
changeset |
files
|
| Fri, 04 Oct 2019 00:15:53 -0400 |
Pierre-Yves David |
gitlab-ci: be bold and try to run the full test in them
stable
|
changeset |
files
|
| Thu, 03 Oct 2019 22:46:21 -0400 |
Pierre-Yves David |
gitlab-ci: basic test with flake8
stable
|
changeset |
files
|
| Sat, 28 Sep 2019 13:15:02 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Fri, 27 Sep 2019 12:50:19 +0200 |
Pierre-Yves David |
branching: preserve test change on stable
|
changeset |
files
|
| Sat, 28 Sep 2019 13:14:07 +0200 |
Pierre-Yves David |
packing: mark as development version
stable
|
changeset |
files
|
| Sat, 28 Sep 2019 13:00:20 +0200 |
Pierre-Yves David |
Added tag 9.2.0 for changeset 40795751be1c
stable
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:22 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:16 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 27 Sep 2019 13:03:12 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Sat, 28 Sep 2019 12:51:03 +0200 |
Pierre-Yves David |
changelog: update for coming 9.2.0
stable 9.2.0
|
changeset |
files
|
| Fri, 27 Sep 2019 12:49:36 +0200 |
Pierre-Yves David |
test: backed out test change applied in 2d85de79ead8
stable
|
changeset |
files
|
| Fri, 27 Sep 2019 12:49:15 +0200 |
Pierre-Yves David |
test: backed out test change applied in 62b60fc1983d
stable
|
changeset |
files
|
| Fri, 27 Sep 2019 12:48:44 +0200 |
Pierre-Yves David |
test: backed out test change applied in e804d5a7c193
stable
|
changeset |
files
|
| Fri, 27 Sep 2019 12:48:28 +0200 |
Pierre-Yves David |
test: backed out test change applied in 8345b852cd4f
stable
|
changeset |
files
|
| Fri, 27 Sep 2019 06:55:05 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 25 Sep 2019 19:43:19 +0200 |
Pierre-Yves David |
stable-doc: note about not storing smaller range
|
changeset |
files
|
| Wed, 25 Sep 2019 19:43:02 +0200 |
Pierre-Yves David |
stable-doc: small typo
|
changeset |
files
|
| Wed, 25 Sep 2019 19:31:44 +0200 |
Pierre-Yves David |
stable-doc: add more advanced examples
|
changeset |
files
|
| Wed, 25 Sep 2019 18:23:37 +0200 |
Pierre-Yves David |
stable-doc: add multiples example for the simple cases
|
changeset |
files
|
| Thu, 26 Sep 2019 10:00:51 +0200 |
Pierre-Yves David |
test-output: oops
|
changeset |
files
|
| Wed, 25 Sep 2019 03:17:46 +0200 |
Pierre-Yves David |
test: update part count in tests
|
changeset |
files
|
| Mon, 09 Sep 2019 09:28:47 +0700 |
Anton Shestakov |
evolve: check that relocating makes sense in _solvedivergent() (issue5958)
stable
|
changeset |
files
|
| Wed, 24 Oct 2018 19:32:04 +0200 |
Pierre-Yves David |
tests: demonstrate content divergence causing "relocate node on top of itself"
stable
|
changeset |
files
|
| Mon, 16 Sep 2019 12:44:38 -0700 |
Kyle Lippincott |
cmdstate: introduce a "saver" contextmanager and use it in place of save()
|
changeset |
files
|
| Mon, 16 Sep 2019 12:42:50 -0700 |
Kyle Lippincott |
cmdstate: avoid setting a default argument to a mutable object (`{}`)
|
changeset |
files
|
| Mon, 16 Sep 2019 12:42:11 -0700 |
Kyle Lippincott |
cmdstate: switch to new-style classes
|
changeset |
files
|
| Tue, 24 Sep 2019 12:42:27 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 19 Jul 2019 16:26:48 +0200 |
Raphaël Gomès |
docs: add example for the `prune` command
stable
|
changeset |
files
|
| Thu, 19 Sep 2019 11:46:16 +0700 |
Anton Shestakov |
tests: add some more actions to test-issue-6028, describe what's being done
stable
|
changeset |
files
|
| Fri, 13 Sep 2019 16:04:32 +0200 |
Valentin Gatien-Baron |
topic: fix some API to make it more robust
stable
|
changeset |
files
|
| Tue, 10 Sep 2019 15:43:20 +0700 |
Anton Shestakov |
rewriteutil: move allowdivergence check to foldcheck()
stable
|
changeset |
files
|
| Thu, 12 Sep 2019 12:35:42 +0200 |
Pierre-Yves David |
test: change to output around transaction timing
|
changeset |
files
|
| Tue, 10 Sep 2019 07:38:46 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sun, 08 Sep 2019 21:24:45 +0200 |
Pierre-Yves David |
stablerange: add some data from field testing
|
changeset |
files
|
| Sun, 08 Sep 2019 17:50:48 +0200 |
Pierre-Yves David |
stablerange: add a debugstablerangecache command
|
changeset |
files
|
| Sun, 08 Sep 2019 17:49:26 +0200 |
Pierre-Yves David |
stablerange: add some documentation about the general concept
|
changeset |
files
|
| Sun, 08 Sep 2019 17:47:37 +0200 |
Pierre-Yves David |
stablesort: add some field data about stable sort cache
|
changeset |
files
|
| Sun, 08 Sep 2019 13:31:28 +0200 |
Pierre-Yves David |
stablesort: introduce a small debugstablesortcache command
|
changeset |
files
|
| Sun, 08 Sep 2019 11:56:11 +0200 |
Pierre-Yves David |
stablesort: add some documentation for stablesort
|
changeset |
files
|
| Sat, 07 Sep 2019 13:03:29 +0700 |
Anton Shestakov |
fold: check allowdivergence before folding obsolete changesets (issue5817)
stable
|
changeset |
files
|
| Wed, 28 Aug 2019 18:30:58 +0700 |
Anton Shestakov |
tests: demonstrate that fold doesn't care about allowdivergence config option
stable
|
changeset |
files
|
| Fri, 06 Sep 2019 13:23:25 +0700 |
Anton Shestakov |
stack: remove unnecessary copying of rdependencies
stable
|
changeset |
files
|
| Fri, 06 Sep 2019 12:53:46 +0700 |
Anton Shestakov |
stack: make a deep copy of `dependencies` before modifying its items
stable
|
changeset |
files
|
| Fri, 06 Sep 2019 12:16:34 +0700 |
Anton Shestakov |
stack: demonstrate that not reusing cached property gives different results
stable
|
changeset |
files
|
| Tue, 03 Sep 2019 12:48:47 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 03 Sep 2019 13:02:20 +0700 |
Anton Shestakov |
changelog: add missing entry for 9af212b8565a
stable
|
changeset |
files
|
| Tue, 03 Sep 2019 13:02:20 +0700 |
Anton Shestakov |
evolve: test that target is not orig in _solveunstable() (issue6097)
stable
|
changeset |
files
|
| Mon, 02 Sep 2019 11:17:23 +0700 |
Anton Shestakov |
tests: demonstrate an orphan changeset cause "relocate node on top of itself"
stable
|
changeset |
files
|
| Fri, 30 Aug 2019 11:31:19 +0700 |
Anton Shestakov |
obslog: only indent the first chunk and chunks just after newlines (issue6175)
stable
|
changeset |
files
|
| Fri, 30 Aug 2019 11:28:02 +0700 |
Anton Shestakov |
tests: demonstrate too many spaces in olog -p output with word-diff
stable
|
changeset |
files
|
| Thu, 25 Jul 2019 18:37:16 +0800 |
Anton Shestakov |
rewind: add --keep flag that "doesn't modify working directory"
|
changeset |
files
|
| Tue, 23 Jul 2019 18:05:40 +0800 |
Anton Shestakov |
tests: separate rewinding of merge commits, temporarily drop an error case
|
changeset |
files
|
| Wed, 07 Aug 2019 15:22:16 +0200 |
Raphaël Gomès |
python3: add python3 beta support to the CHANGELOG
|
changeset |
files
|
| Wed, 07 Aug 2019 15:21:56 +0200 |
Raphaël Gomès |
python3: mention beta Python 3 support in README
|
changeset |
files
|
| Wed, 07 Aug 2019 15:21:17 +0200 |
Raphaël Gomès |
python3: add supported python versions to setup.py
|
changeset |
files
|
| Fri, 09 Aug 2019 12:48:58 +0200 |
Pierre-Yves David |
test: update output for wider cache warming
|
changeset |
files
|
| Tue, 06 Aug 2019 19:28:51 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 06 Aug 2019 15:06:38 +0200 |
Raphaël Gomès |
python3: use format-source to run byteify-strings in .py files
|
changeset |
files
|
| Tue, 06 Aug 2019 19:27:54 +0200 |
Pierre-Yves David |
topic: add a new random attribute
stable
|
changeset |
files
|
| Tue, 06 Aug 2019 15:06:27 +0200 |
Raphaël Gomès |
python3: enforce byte prefix for vfs.open()
|
changeset |
files
|
| Tue, 06 Aug 2019 11:35:09 +0200 |
Raphaël Gomès |
python3: add raw prefix to sqlite isolation level
|
changeset |
files
|
| Tue, 06 Aug 2019 11:34:31 +0200 |
Raphaël Gomès |
python3: add ignore block around python 2 compatibility if branch
|
changeset |
files
|
| Tue, 06 Aug 2019 16:23:57 +0200 |
Raphaël Gomès |
flake8: silence F633 error
stable
|
changeset |
files
|
| Tue, 06 Aug 2019 11:33:53 +0200 |
Raphaël Gomès |
python3: add raw prefix to edge-cases kwargs-like objects
|
changeset |
files
|
| Tue, 06 Aug 2019 11:32:01 +0200 |
Raphaël Gomès |
python3: add raw prefix to open()-like functions
|
changeset |
files
|
| Tue, 06 Aug 2019 11:30:45 +0200 |
Raphaël Gomès |
python3: add raw prefix to all array.array() calls
|
changeset |
files
|
| Tue, 06 Aug 2019 11:29:35 +0200 |
Raphaël Gomès |
python3: add raw prefix to "troubles"-related dicts
|
changeset |
files
|
| Tue, 06 Aug 2019 11:26:29 +0200 |
Raphaël Gomès |
python3: add raw prefix in cases harder to analyze at the token level
|
changeset |
files
|
| Tue, 06 Aug 2019 11:17:38 +0200 |
Raphaël Gomès |
python3: add byte prefix for objects that look like kwargs but aren't
|
changeset |
files
|
| Tue, 06 Aug 2019 11:10:36 +0200 |
Raphaël Gomès |
python3: mark all SQL queries as raw strings
|
changeset |
files
|
| Tue, 06 Aug 2019 11:07:16 +0200 |
Raphaël Gomès |
python3: prefix all regex to work with python 2 and 3
|
changeset |
files
|
| Tue, 06 Aug 2019 00:16:05 +0200 |
Taapas Agrawal |
pick: added support for hg abort
|
changeset |
files
|
| Tue, 06 Aug 2019 00:16:01 +0200 |
Taapas Agrawal |
pick: factor our the abort function
|
changeset |
files
|
| Thu, 11 Jul 2019 22:56:46 +0530 |
Taapas Agrawal |
abort: added support for evolve to hg abort
|
changeset |
files
|
| Fri, 12 Jul 2019 23:43:25 +0530 |
Taapas Agrawal |
evolve: fixed lock acquire before checking state
|
changeset |
files
|
| Wed, 31 Jul 2019 10:52:14 -0700 |
Martin von Zweigbergk |
py3: add back a progress(0) call lost in 8664231b47ac
|
changeset |
files
|
| Fri, 02 Aug 2019 13:00:11 -0700 |
Kyle Lippincott |
prune: adjust 'nothing to prune' to imply user needs to specify revs to prune
|
changeset |
files
|
| Sat, 20 Jul 2019 17:33:00 +0800 |
Anton Shestakov |
rewind: working directory is the preferred term
|
changeset |
files
|
| Sat, 20 Jul 2019 16:51:44 +0800 |
Anton Shestakov |
rewind: add command synopsis
|
changeset |
files
|
| Fri, 28 Jun 2019 21:07:20 +0000 |
Ludovic Chabant |
py3: make setup.py py3 compatible
|
changeset |
files
|
| Tue, 30 Jul 2019 02:55:22 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Tue, 30 Jul 2019 02:55:01 +0200 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Tue, 30 Jul 2019 02:50:14 +0200 |
Pierre-Yves David |
Added tag 9.1.0 for changeset 6f37fdad7ac1
stable
|
changeset |
files
|
| Mon, 29 Jul 2019 16:47:17 +0200 |
Pierre-Yves David |
packaging: update version number for 9.1.0 release
stable 9.1.0
|
changeset |
files
|
| Tue, 30 Jul 2019 02:44:08 +0200 |
Pierre-Yves David |
changelog: add missing entry for dfd88e3fa90a
stable
|
changeset |
files
|
| Mon, 29 Jul 2019 16:41:19 +0200 |
Pierre-Yves David |
packaging: groom changelog prior to release
stable
|
changeset |
files
|
| Mon, 29 Jul 2019 14:43:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Mon, 29 Jul 2019 14:43:17 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 29 Jul 2019 14:43:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 29 Jul 2019 14:43:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Mon, 29 Jul 2019 14:43:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 29 Jul 2019 14:42:57 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 14:42:49 +0200 |
Pierre-Yves David |
branching: merge the two mercurial-5.0 heads
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 13:19:54 +0200 |
Pierre-Yves David |
test-compat: reverte output change from 4764e8436b2a (hg-5.1)
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 13:19:48 +0200 |
Pierre-Yves David |
test-compat: reverte output change from f802a75da585 (hg-5.1)
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 13:17:56 +0200 |
Pierre-Yves David |
test-compat: reverte output change from c7d236b55a3e (hg-5.1)
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 14:38:31 +0200 |
Pierre-Yves David |
branching: merge default into stable to prepare 9.1.0
stable
|
changeset |
files
|
| Mon, 29 Jul 2019 13:54:57 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:24 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:22 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:16 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:14 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Thu, 25 Jul 2019 18:29:59 +0200 |
Pierre-Yves David |
test-compat: opening test compatibility branch for mercurial 5.0
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 12:45:29 +0200 |
Pierre-Yves David |
test-compat: close branch for mercurial-4.0
mercurial-4.4
|
changeset |
files
|
| Thu, 25 Jul 2019 09:59:41 -0700 |
Kyle Lippincott |
prune: fix small grammatical issues in help text
stable
|
changeset |
files
|
| Fri, 19 Jul 2019 17:40:45 +0800 |
Anton Shestakov |
docs: update evolve-faq.rst with new prune flag and proper vocabulary
stable
|
changeset |
files
|
| Fri, 19 Jul 2019 17:25:29 +0800 |
Anton Shestakov |
prune: spell --successor flag without any unnecessary shortcuts
stable
|
changeset |
files
|
| Wed, 17 Jul 2019 12:47:37 -0700 |
Martin von Zweigbergk |
py3: redefine "troublecategories" in evolve as a dict
|
changeset |
files
|
| Fri, 12 Jul 2019 08:11:39 -0700 |
Martin von Zweigbergk |
py3: store to __doc__ as str (unicode on py3)
|
changeset |
files
|
| Wed, 17 Jul 2019 12:47:20 -0700 |
Martin von Zweigbergk |
py3: also catch ImportError when relative import fails
|
changeset |
files
|
| Fri, 12 Jul 2019 10:26:41 -0700 |
Martin von Zweigbergk |
py3: convert exceptions to bytes using pycompat.bytestr()
|
changeset |
files
|
| Thu, 11 Jul 2019 16:00:25 -0700 |
Martin von Zweigbergk |
py3: use "%d" for formatting integers
|
changeset |
files
|
| Fri, 12 Jul 2019 08:17:25 -0700 |
Martin von Zweigbergk |
py3: avoid "%s" for formatting None
|
changeset |
files
|
| Fri, 12 Jul 2019 08:16:30 -0700 |
Martin von Zweigbergk |
py3: use "%f" for formatting floating point number
|
changeset |
files
|
| Thu, 11 Jul 2019 15:30:43 -0700 |
Martin von Zweigbergk |
py3: fix progress() functions to not use "%s" with int
|
changeset |
files
|
| Wed, 17 Jul 2019 11:45:37 -0700 |
Martin von Zweigbergk |
py3: make random topic name generation consistent across py2/py3
|
changeset |
files
|
| Fri, 12 Jul 2019 17:02:35 -0700 |
Martin von Zweigbergk |
py3: convert str to bytes before passing to core exception
|
changeset |
files
|
| Wed, 17 Jul 2019 11:03:09 -0700 |
Martin von Zweigbergk |
py3: convert opts keys to bytes before passing to core APIs
|
changeset |
files
|
| Fri, 14 Jun 2019 18:44:43 -0700 |
kevpeng |
evolve: further clarify when update is performed
stable
|
changeset |
files
|
| Thu, 11 Jul 2019 15:30:40 -0700 |
Martin von Zweigbergk |
py3: avoid comparing int and None
|
changeset |
files
|
| Thu, 11 Jul 2019 21:48:37 -0700 |
Martin von Zweigbergk |
py3: avoid "%r" for list of byte strings, which produces b'' on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 21:48:02 -0700 |
Martin von Zweigbergk |
py3: avoid "%r" for byte string, which produces b'' on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 14:46:17 -0700 |
Martin von Zweigbergk |
py3: replace str(ctx) by bytes(ctx)
|
changeset |
files
|
| Thu, 11 Jul 2019 16:04:17 -0700 |
Martin von Zweigbergk |
py3: use inspect.signature() instead of inspect.getargspec() on py3
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use array.array.{to,from}bytes() on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 14:31:32 -0700 |
Martin von Zweigbergk |
py3: config values can be bytes, but never unicode
|
changeset |
files
|
| Sat, 13 Jul 2019 00:17:03 -0700 |
Martin von Zweigbergk |
py3: call branchmap.items() on py3 and continue to call iteritems() on py2
|
changeset |
files
|
| Fri, 12 Jul 2019 23:24:04 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items() in the topics extension
|
changeset |
files
|
| Sun, 14 Jul 2019 22:34:36 -0700 |
Martin von Zweigbergk |
py3: filter() now returns a generator, so wrap when we need a list
|
changeset |
files
|
| Fri, 12 Jul 2019 23:19:50 -0700 |
Martin von Zweigbergk |
py3: don't depend on map() iterating over its input
|
changeset |
files
|
| Thu, 11 Jul 2019 16:49:01 -0700 |
Martin von Zweigbergk |
py3: implement __bool__ in addition to __nonzero__
|
changeset |
files
|
| Thu, 11 Jul 2019 14:21:23 -0700 |
Martin von Zweigbergk |
py3: replace iter.next() by next(iter)
|
changeset |
files
|
| Thu, 11 Jul 2019 14:16:48 -0700 |
Martin von Zweigbergk |
py3: replace xrange() by range()
|
changeset |
files
|
| Thu, 11 Jul 2019 12:19:49 -0700 |
Martin von Zweigbergk |
py3: read sqlite3 data as bytes
|
changeset |
files
|
| Thu, 11 Jul 2019 12:11:43 -0700 |
Martin von Zweigbergk |
py3: sqlite3.connect() expects str arguments
|
changeset |
files
|
| Fri, 12 Jul 2019 23:00:11 -0700 |
Martin von Zweigbergk |
cleanup: remove check only needed for hg versions before 4.4
|
changeset |
files
|
| Fri, 12 Jul 2019 08:20:24 -0700 |
Martin von Zweigbergk |
split: remove an unnecessary (and confusingly typed) fallback revision
|
changeset |
files
|
| Thu, 11 Jul 2019 22:23:32 -0700 |
Martin von Zweigbergk |
evolve: rename variable "children" to "child" where it's clearly singular
|
changeset |
files
|
| Thu, 11 Jul 2019 16:24:13 -0700 |
Martin von Zweigbergk |
evolve: remove some unused variables
|
changeset |
files
|
| Thu, 11 Jul 2019 09:38:42 -0700 |
Martin von Zweigbergk |
py3: back out 23323092f0a7
|
changeset |
files
|
| Wed, 17 Jul 2019 18:06:14 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 17 Jul 2019 17:58:44 +0200 |
Sushil khanchi |
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
stable
|
changeset |
files
|
| Sat, 29 Jun 2019 14:28:35 +0530 |
Sushil khanchi |
touch: add test which shows touch can fail to warn about divergence
stable
|
changeset |
files
|
| Wed, 17 Jul 2019 17:58:40 +0200 |
Sushil khanchi |
touch: clarify some inline documentation
stable
|
changeset |
files
|
| Mon, 15 Jul 2019 16:53:07 -0700 |
Martin von Zweigbergk |
tests: update output for new branch cache messsages from Mercurial
|
changeset |
files
|
| Sat, 13 Jul 2019 18:22:34 +0800 |
Anton Shestakov |
metaedit: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 18:07:03 +0800 |
Anton Shestakov |
fold: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 17:04:08 +0800 |
Anton Shestakov |
rewind: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Wed, 10 Jul 2019 18:16:38 +0800 |
Anton Shestakov |
touch: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: make `import hgext3rd.evolve` work
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for template keyword registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: convert _origdoc to sysstr to match __doc__
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for revset predicate registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for wireprotocol command registration
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use byte strings for @command registrations
|
changeset |
files
|
| Wed, 03 Jul 2019 11:13:47 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
changeset |
files
|
| Wed, 03 Jul 2019 11:37:29 -0700 |
Martin von Zweigbergk |
py3: make metadata values be byte strings as Mercurial expects
|
changeset |
files
|
| Tue, 09 Jul 2019 21:49:37 -0700 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Thu, 11 Jul 2019 10:07:39 +0200 |
Pierre-Yves David |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Tue, 09 Jul 2019 17:08:34 +0800 |
Anton Shestakov |
rewriteutil: allow rewriting merge commits (issue4561)
|
changeset |
files
|
| Tue, 09 Jul 2019 17:02:44 +0800 |
Anton Shestakov |
tests: show what happens when trying to hg touch a merge commit
|
changeset |
files
|
| Thu, 04 Jul 2019 17:32:58 +0200 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 22:46:58 +0530 |
Sushil khanchi |
touch: let's not use util.acceptintervention() as it's not required
|
changeset |
files
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 26 Jun 2019 21:11:25 +0530 |
Sushil khanchi |
evolve: use right value for branch name when finding branch heads
|
changeset |
files
|
| Tue, 25 Jun 2019 21:54:22 +0530 |
Sushil khanchi |
evolve: fix confusion in branch heads checking logic when topic in play
|
changeset |
files
|
| Sun, 14 Apr 2019 12:55:46 +0530 |
Sushil khanchi |
topic: add tests to demonstrate topic confuses the branchhead checking logic
|
changeset |
files
|
| Mon, 01 Jul 2019 19:15:57 +0530 |
Sushil khanchi |
evolve: fix the inconsistent behaviour of prune (issue6137)
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 21:00:46 +0530 |
Sushil khanchi |
prune: add tests to demonstrate issue6137
stable
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sat, 29 Jun 2019 18:21:57 +0800 |
Anton Shestakov |
prune: update to the successor of wdir also with --pair/--biject (issue6142)
stable
|
changeset |
files
|
| Sat, 22 Jun 2019 18:37:21 +0800 |
Anton Shestakov |
tests: demonstrate prune --pair not moving bookmark correctly
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 10:17:42 +0200 |
Pierre-Yves David |
oops: backed out changeset 7ac40b4ea24c
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
changeset |
files
|
| Sun, 09 Jun 2019 12:07:08 +0530 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
changeset |
files
|
| Sat, 15 Jun 2019 17:17:19 +0530 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
changeset |
files
|
| Fri, 14 Jun 2019 18:17:03 +0800 |
Anton Shestakov |
pick: register pickstate as an unfinished state
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:14:57 +0800 |
Anton Shestakov |
pick: rename variable for unfinishedstates
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:26:24 +0800 |
Anton Shestakov |
pick: actually delete pickstate if --abort is given
stable
|
changeset |
files
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
changeset |
files
|
| Sat, 22 Dec 2018 18:31:32 +0800 |
Anton Shestakov |
tests: demonstrate obsmarker creation after discarding conflicting changes
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 18:14:48 +0800 |
Anton Shestakov |
pick: remove transaction on the whole command (issue6037)
stable
|
changeset |
files
|
| Sun, 23 Dec 2018 01:02:36 +0800 |
Anton Shestakov |
tests: demonstrate hg pick forgetting files after conflicts
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:27:26 +0800 |
Anton Shestakov |
packaging: follow hg's supported python version (>= 2.7)
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:19:44 +0800 |
Anton Shestakov |
packaging: require hg 4.5 also for usage, not just for building
stable
|
changeset |
files
|
| Tue, 11 Jun 2019 10:04:11 +0200 |
Philippe Pepiot |
packaging: require mercurial >= 4.5
stable
|
changeset |
files
|
| Sat, 08 Jun 2019 16:03:05 +0530 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
changeset |
files
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
changeset |
files
|
| Sat, 27 Apr 2019 13:09:34 +0530 |
Sushil khanchi |
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
|
changeset |
files
|
| Sat, 08 Jun 2019 16:57:34 +0800 |
Anton Shestakov |
pick: reduce configoverride() scope
|
changeset |
files
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
changeset |
files
|
| Sat, 08 Jun 2019 16:06:24 +0800 |
Anton Shestakov |
evolve: internationalize a message
|
changeset |
files
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
changeset |
files
|
| Wed, 05 Jun 2019 17:56:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Wed, 05 Jun 2019 17:46:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Wed, 05 Jun 2019 17:45:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Wed, 05 Jun 2019 17:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Wed, 05 Jun 2019 17:39:32 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Wed, 05 Jun 2019 17:38:32 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 07 Jun 2019 02:25:02 +0200 |
Pierre-Yves David |
branching: merge with 9.0.0
|
changeset |
files
|
| Fri, 07 Jun 2019 02:24:08 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:22:05 +0200 |
Pierre-Yves David |
packaging: mark as development versions
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:15:50 +0200 |
Pierre-Yves David |
Added tag 9.0.0 for changeset 756db65030c6
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 14:24:19 +0200 |
Pierre-Yves David |
packaging: prepare release 9.0.0
stable 9.0.0
|
changeset |
files
|
| Thu, 06 Jun 2019 14:32:25 +0200 |
Pierre-Yves David |
doc: clarify the status of configuration of the obshashrange protocol
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 13:26:44 +0200 |
Pierre-Yves David |
changelog: add various missing bits
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 19:45:35 +0200 |
Pierre-Yves David |
templatekw: keep compatibility with Mercurial 4.5
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 17:21:45 +0200 |
Pierre-Yves David |
test: adjust output to stable branch
stable
|
changeset |
files
|
| Tue, 04 Jun 2019 11:08:44 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 01 Jun 2019 02:30:14 +0200 |
Joerg Sonnenberger |
templates: don't alias keywords directly
stable
|
changeset |
files
|
| Tue, 28 May 2019 16:46:18 +0800 |
Anton Shestakov |
stack: remove 'topic.' prefix from colors/labels
|
changeset |
files
|
| Sat, 18 May 2019 16:56:47 +0800 |
Anton Shestakov |
stack: handle hash sizes when --debug flag is provided
|
changeset |
files
|
| Fri, 17 May 2019 17:50:25 +0800 |
Anton Shestakov |
stack: always provide (full) node hash to non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:42:06 +0800 |
Anton Shestakov |
stack: remove unnecessary prefix from stack output with non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:59:58 +0800 |
Anton Shestakov |
stack: provide context to formatter with non-default --template
|
changeset |
files
|
| Sat, 11 May 2019 17:14:32 +0800 |
Anton Shestakov |
stack: leverage labelsgen() to produce all needed labels for fm.write()
|
changeset |
files
|
| Wed, 08 May 2019 16:00:34 +0800 |
Anton Shestakov |
stack: check if stack is empty more pythonically
|
changeset |
files
|
| Wed, 08 May 2019 15:57:54 +0800 |
Anton Shestakov |
stack: implement __bool__ and __nonzero__
|
changeset |
files
|
| Sun, 05 May 2019 17:39:46 +0800 |
Anton Shestakov |
stack: get stack data directly from stack and remove stackdata()
|
changeset |
files
|
| Sun, 05 May 2019 16:14:53 +0800 |
Anton Shestakov |
stack: use stack._revs instead of stack.revs[1:] in external children revset
|
changeset |
files
|
| Tue, 04 Jun 2019 10:30:56 +0200 |
Pierre-Yves David |
test: update output to match the parent changesets
|
changeset |
files
|
| Mon, 27 May 2019 03:42:35 +0200 |
Pierre-Yves David |
topic: add a simple option to reject publishing
|
changeset |
files
|
| Tue, 04 Jun 2019 10:07:08 +0200 |
Pierre-Yves David |
compat: adjust `wrapadd` for upstream
|
changeset |
files
|
| Sun, 05 May 2019 22:48:41 +0530 |
Faheem Mitha |
debian: override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
| Mon, 27 May 2019 02:19:48 +0200 |
Pierre-Yves David |
obshashtree: move obshashtree in its own module
|
changeset |
files
|
| Mon, 27 May 2019 01:53:36 +0200 |
Pierre-Yves David |
obsdiscovery: drop `obshash` discovery protocol (issue6136)
|
changeset |
files
|
| Thu, 09 May 2019 09:42:51 -0700 |
Martin von Zweigbergk |
cmdrewrite: use context manager for some locks and transactions
|
changeset |
files
|
| Mon, 29 Apr 2019 23:43:16 +0530 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
changeset |
files
|
| Mon, 13 May 2019 18:47:58 +0530 |
Sushil khanchi |
touch: use util.acceptintervention() for closing the transaction
|
changeset |
files
|
| Mon, 13 May 2019 18:45:00 +0530 |
Sushil khanchi |
touch: use context manager for locks
|
changeset |
files
|
| Mon, 13 May 2019 18:39:43 +0530 |
Sushil khanchi |
touch: extract the logic of touching rev's to its own function
|
changeset |
files
|
| Mon, 27 May 2019 02:42:11 +0200 |
Pierre-Yves David |
changelog: mention user merging in the changelog
|
changeset |
files
|
| Sun, 05 May 2019 18:24:59 +0530 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
changeset |
files
|
| Sun, 05 May 2019 18:24:50 +0530 |
Sushil khanchi |
evolve: add tests for the case when div csets has different users
|
changeset |
files
|
| Fri, 03 May 2019 01:23:12 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
changeset |
files
|
| Fri, 03 May 2019 03:52:44 +0530 |
Faheem Mitha |
debian: Override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
| Fri, 03 May 2019 03:44:48 +0530 |
Faheem Mitha |
docs: add SPHINXBUILD make variable
stable
|
changeset |
files
|
| Sat, 27 Apr 2019 20:56:37 +0530 |
Sushil khanchi |
topic: add test to increase code coverage in case of multiple topics
stable
|
changeset |
files
|
| Sat, 27 Apr 2019 17:11:12 +0800 |
Anton Shestakov |
changelog: --no-update is the default, recommend --update instead
|
changeset |
files
|
| Sat, 27 Apr 2019 01:18:08 +0300 |
Pulkit Goyal |
topic: drop support for accessing csets in branch stack using bxx (issue6119)
|
changeset |
files
|
| Mon, 29 Apr 2019 23:16:29 -0400 |
Matt Harbison |
legacy: drop the check for `obsolete._enabled`
stable
|
changeset |
files
|
| Sun, 28 Apr 2019 00:21:28 -0400 |
Matt Harbison |
docs: drop references to the old temporary commit that was created with amend
|
changeset |
files
|
| Sat, 27 Apr 2019 22:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
changeset |
files
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
changeset |
files
|
| Sat, 27 Apr 2019 22:33:16 -0400 |
Matt Harbison |
revset: add `predecessor` aliases for `precursors` and `allprecursors`
|
changeset |
files
|
| Sat, 27 Apr 2019 22:24:30 -0400 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:54:52 -0400 |
Matt Harbison |
docs: change `bumped` references to `phase-divergent`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:41:04 -0400 |
Matt Harbison |
docs: change `divergent` references to `content-divergent`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:27:54 -0400 |
Matt Harbison |
docs: change `troubled` references to `unstable`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:24:18 -0400 |
Matt Harbison |
docs: change `unstable` references to `orphan`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:09:47 -0400 |
Matt Harbison |
doc: correct a typo
|
changeset |
files
|
| Sat, 27 Apr 2019 19:42:42 -0400 |
Matt Harbison |
docs: change `troubles` references to `instability`
|
changeset |
files
|
| Sat, 27 Apr 2019 19:32:03 -0400 |
Matt Harbison |
docs: change `precursors` references to `predecessors`
|
changeset |
files
|
| Sat, 27 Apr 2019 14:42:48 -0400 |
Matt Harbison |
docs: import figure diagrams with inkscape 0.92
|
changeset |
files
|
| Thu, 25 Apr 2019 15:14:21 -0700 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
changeset |
files
|
| Thu, 25 Apr 2019 13:58:29 -0700 |
Martin von Zweigbergk |
evolve: move more of the progress-related variables together
|
changeset |
files
|
| Thu, 25 Apr 2019 14:02:11 -0700 |
Martin von Zweigbergk |
evolve: delete dead calculation of number of troubled revisions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:23:53 -0700 |
Martin von Zweigbergk |
evolve: drop nested locks and transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 11:12:00 -0700 |
Martin von Zweigbergk |
next: start transaction before calling _solveone()
|
changeset |
files
|
| Fri, 19 Apr 2019 10:22:25 -0700 |
Martin von Zweigbergk |
evolve: use single transaction also when continuing
|
changeset |
files
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
changeset |
files
|
| Fri, 19 Apr 2019 10:01:32 -0700 |
Martin von Zweigbergk |
evolve: extract function for solving one revision, including merges
|
changeset |
files
|
| Thu, 25 Apr 2019 17:20:32 +0800 |
Anton Shestakov |
evolve: mention that --all is the default behavior now
|
changeset |
files
|
| Thu, 25 Apr 2019 17:19:41 +0800 |
Anton Shestakov |
evolve: mention that not all successful operations currently update wdir
|
changeset |
files
|
| Tue, 23 Apr 2019 11:07:28 -0700 |
Martin von Zweigbergk |
evolve: add progress support for --continue
|
changeset |
files
|
| Tue, 23 Apr 2019 10:56:42 -0700 |
Martin von Zweigbergk |
evolve: reduce scope of progress-related variables
|
changeset |
files
|
| Tue, 23 Apr 2019 10:49:47 -0700 |
Martin von Zweigbergk |
evolve: move progress-clearing out of _cleanup()
|
changeset |
files
|
| Tue, 23 Apr 2019 10:52:33 -0700 |
Martin von Zweigbergk |
evolve: stop passing no-op "progresscb" into continueevolve()
|
changeset |
files
|
| Tue, 23 Apr 2019 09:45:45 -0700 |
Martin von Zweigbergk |
evolve: _solveunstable() update progress only once
|
changeset |
files
|
| Tue, 23 Apr 2019 09:35:34 -0700 |
Martin von Zweigbergk |
evolve: don't update progress just before clearing it
|
changeset |
files
|
| Tue, 23 Apr 2019 09:31:32 -0700 |
Martin von Zweigbergk |
evolve: clean up progress bar also when using -r
|
changeset |
files
|
| Tue, 23 Apr 2019 10:20:03 -0700 |
Martin von Zweigbergk |
tests: add some basic testing of progress
|
changeset |
files
|
| Fri, 19 Apr 2019 10:03:39 -0700 |
Martin von Zweigbergk |
evolve: increment progress *after* a whole merge commit is done
|
changeset |
files
|
| Fri, 19 Apr 2019 11:02:35 -0700 |
Martin von Zweigbergk |
evolve: use util.acceptintervention() for closing transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:32:32 -0700 |
Martin von Zweigbergk |
evolve: use context manager for transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:52:16 -0700 |
Martin von Zweigbergk |
evolve: use consistent message and just re-raise InterventionRequired
|
changeset |
files
|
| Fri, 19 Apr 2019 10:47:12 -0700 |
Martin von Zweigbergk |
evolve: use standard InterventionRequired instead of MergeFailure
|
changeset |
files
|
| Fri, 19 Apr 2019 10:41:56 -0700 |
Martin von Zweigbergk |
evolve: don't use exception for local flow control
|
changeset |
files
|
| Tue, 23 Apr 2019 11:02:08 -0700 |
Martin von Zweigbergk |
evolve: reduce indentation with an early return statement
|
changeset |
files
|
| Tue, 23 Apr 2019 11:01:44 -0700 |
Martin von Zweigbergk |
evolve: remove a useless return statement at end of function
|
changeset |
files
|
| Sun, 21 Apr 2019 13:04:40 +0530 |
Sushil khanchi |
test: move a test to an appropriate test file
|
changeset |
files
|
| Sun, 21 Apr 2019 12:07:26 +0530 |
Sushil khanchi |
test: improve the title of a test
|
changeset |
files
|
| Sun, 21 Apr 2019 12:06:31 +0530 |
Sushil khanchi |
test: remove duplicated test
|
changeset |
files
|
| Sat, 09 Mar 2019 19:35:45 +0530 |
Sushil khanchi |
evolve: warn user for the metadata being lost in public divergence resolution
|
changeset |
files
|
| Wed, 17 Apr 2019 21:16:17 +0530 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
changeset |
files
|
| Wed, 24 Apr 2019 20:32:01 +0200 |
Pierre-Yves David |
test: use a shorter test name
|
changeset |
files
|
| Wed, 10 Apr 2019 18:20:33 +0800 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
changeset |
files
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
changeset |
files
|
| Wed, 24 Apr 2019 17:02:27 +0800 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 16:35:01 +0800 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
changeset |
files
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
changeset |
files
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 15:57:49 +0200 |
Anton Shestakov |
tests: don't create a nested repo for no reason
|
changeset |
files
|
| Wed, 24 Apr 2019 14:38:26 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:57:04 +0200 |
Pierre-Yves David |
Added tag 8.5.1 for changeset 05c9dcf5512e
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:30:39 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:08 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 22 Apr 2019 22:14:26 -0700 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
changeset |
files
|
| Sat, 20 Apr 2019 05:21:14 +0200 |
Pierre-Yves David |
packaging: mark extensions as tested with 5.0
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 13:26:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:48 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:47 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 12:24:22 +0200 |
Pierre-Yves David |
compat: drop support for Mercurial 4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:42 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Tue, 23 Apr 2019 12:20:12 +0200 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:07 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:04 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 19 Apr 2019 10:31:53 +0530 |
Sushil khanchi |
compat: fix a typo in compat patch
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 23:51:13 +0200 |
Pierre-Yves David |
changelog: mention extensions isolation (issue6121)
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:03:01 +0200 |
Pierre-Yves David |
topic: only wrap wireprotocaps for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:52 +0200 |
Pierre-Yves David |
topic: only wrap _pushb2phases for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:44 +0200 |
Pierre-Yves David |
topic: only wrap handlecheckheads for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:06 +0200 |
Pierre-Yves David |
topic: only wrap wireprotobranchmap for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:01:39 +0200 |
Pierre-Yves David |
topic: only wrap _headssummary for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:41:41 +0200 |
Pierre-Yves David |
topic: only wrap desthistedit for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:40:53 +0200 |
Pierre-Yves David |
topic: only wrap _destupdatetopic for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:39:41 +0200 |
Pierre-Yves David |
topic: only wrap _destmergebranch for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:36:11 +0200 |
Pierre-Yves David |
topic: only wrap gettopicrepo for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:49 +0200 |
Pierre-Yves David |
topic: only wrap mergeupdate for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:39 +0200 |
Pierre-Yves David |
topic: only wrap committext for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:24 +0200 |
Pierre-Yves David |
topic: only affect `hg commit` behavior for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:14 +0200 |
Pierre-Yves David |
topic: only wrap workingctx.__init__ for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:12:58 +0200 |
Pierre-Yves David |
topic: introduce a `hastopicext(repo)` function
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 00:20:44 +0530 |
Sushil khanchi |
tests: consolidate the public-content-divergent test cases
|
changeset |
files
|
| Wed, 17 Apr 2019 12:31:17 +0530 |
Sushil khanchi |
evolve: improve inline documentation for the public divergence resolution
|
changeset |
files
|
| Sun, 14 Apr 2019 20:26:05 +0530 |
Sushil khanchi |
cleanup: remove a duplicated line
|
changeset |
files
|
| Wed, 17 Apr 2019 21:39:28 +0200 |
Pierre-Yves David |
changelog: mention topic compatibility
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:58:10 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Wed, 17 Apr 2019 20:56:24 +0200 |
Pierre-Yves David |
tescompat: revert test change for mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 20:54:28 +0200 |
Pierre-Yves David |
branching: merge 8.5.0 expected output in stable
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:52:15 +0200 |
Pierre-Yves David |
testcompat: open a branch dedicated to mercurial 4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 18:46:41 +0800 |
Anton Shestakov |
topic: add compatibility for writing copy metadata in changelog.add()
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 16:18:22 +0800 |
Anton Shestakov |
serverminitopic: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:21:09 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 12 Apr 2019 02:20:24 +0200 |
Pierre-Yves David |
packaging: mark version as development version
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:17:03 +0200 |
Pierre-Yves David |
Added tag 8.5.0 for changeset 33c617626fd9
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:15:24 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.0
stable 8.5.0
|
changeset |
files
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 12 Apr 2019 02:07:53 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:25 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:06 +0200 |
Pierre-Yves David |
changelog: merge 8.4.1 and 8.5.1 entries
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:43:37 +0200 |
Pierre-Yves David |
branching: merge stable into default
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:12:09 +0200 |
Pierre-Yves David |
branching: merge default change into stable
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 22:13:55 +0200 |
Pierre-Yves David |
branching: merge default branch in stable to prepare 8.5.0 release
stable
|
changeset |
files
|
| Tue, 02 Apr 2019 22:42:01 -0400 |
Matt Harbison |
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
|
changeset |
files
|
| Thu, 11 Apr 2019 17:45:36 +0800 |
Anton Shestakov |
evolve: store --update flag state in evolvestate file
|
changeset |
files
|
| Fri, 12 Apr 2019 02:55:34 +0800 |
Anton Shestakov |
state: implement cmdstate.__contains__()
|
changeset |
files
|
| Thu, 11 Apr 2019 21:19:01 +0200 |
Pierre-Yves David |
changelog: mention Martin work on phase-divergence
|
changeset |
files
|
| Thu, 11 Apr 2019 21:09:31 +0200 |
Pierre-Yves David |
test: revert update from 5.0 record logic
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 17:42:48 +0800 |
Anton Shestakov |
tests: remove note about already implemented --confirm with --continue
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 23:19:29 +0530 |
Sushil khanchi |
evolve: compat patch for recordfilter change in mercurial
|
changeset |
files
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:24:55 +0200 |
Pierre-Yves David |
test: rename test about content divergent meta data
|
changeset |
files
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
changeset |
files
|
| Wed, 10 Apr 2019 20:03:07 +0200 |
Pierre-Yves David |
test: remove remaining duplicated file
|
changeset |
files
|
| Wed, 10 Apr 2019 17:57:11 +0200 |
Pierre-Yves David |
test: add test for content-divergence with file removal
|
changeset |
files
|
| Wed, 10 Apr 2019 17:29:40 +0200 |
Pierre-Yves David |
test: clarify changeset concent in the first content-divergence test
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:28 +0200 |
Pierre-Yves David |
branching: merge with test consolidation
|
changeset |
files
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sun, 07 Apr 2019 20:00:16 +0200 |
Joerg Sonnenberger |
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
|
changeset |
files
|
| Sun, 07 Apr 2019 19:53:53 +0200 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
changeset |
files
|
| Wed, 10 Apr 2019 16:11:59 +0200 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
changeset |
files
|
| Sat, 23 Feb 2019 15:17:55 +0100 |
Manuel Jacob |
pick: update working dir branch (issue6089)
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:47:28 +0200 |
Pierre-Yves David |
tests: rename test-grab to test-pick
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:26:41 +0200 |
Sushil khanchi |
evolve: add test which demonstrate issue6113
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
changeset |
files
|
| Tue, 09 Apr 2019 21:16:49 +0200 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
changeset |
files
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
changeset |
files
|
| Sat, 06 Apr 2019 15:50:15 +0200 |
Anton Shestakov |
stack: improve set combination logic
|
changeset |
files
|
| Sat, 06 Apr 2019 15:49:22 +0200 |
Anton Shestakov |
stack: fix phasecache._phasesets check logic
|
changeset |
files
|
| Tue, 02 Apr 2019 12:41:57 +0530 |
Sushil khanchi |
evolve: remove todo markers from a test which has been fixed
|
changeset |
files
|
| Fri, 05 Apr 2019 22:28:07 +0200 |
Pierre-Yves David |
next: clarify tests related to `commands.update.check` test
|
changeset |
files
|
| Wed, 03 Apr 2019 17:20:34 +0800 |
Anton Shestakov |
stack: simplify phasecache checks in _stackcandidates()
|
changeset |
files
|
| Fri, 05 Apr 2019 17:45:59 +0200 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
changeset |
files
|
| Fri, 29 Mar 2019 15:15:07 +0100 |
Pierre-Yves David |
test: fix a phase divergence test case to actually not contains conflict
|
changeset |
files
|
| Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
changeset |
files
|
| Thu, 04 Apr 2019 12:24:28 +0200 |
Pierre-Yves David |
test: apply unstability resolution to `test-unstability-resolution-result.t`
|
changeset |
files
|
| Thu, 04 Apr 2019 12:06:33 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-content-divergent.t
|
changeset |
files
|
| Thu, 04 Apr 2019 11:53:05 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-orphan.t
|
changeset |
files
|
| Wed, 03 Apr 2019 01:00:33 +0530 |
Sushil khanchi |
evolve: refactor the code which swap two nodes (in divergence resolution)
|
changeset |
files
|
| Tue, 02 Apr 2019 18:01:43 +0530 |
Sushil khanchi |
evolve: remove tmpctx arg from _resolvephasedivergent()
|
changeset |
files
|
| Fri, 29 Mar 2019 11:48:36 +0100 |
Pierre-Yves David |
doc: clarify _resolvephasedivergent role and constraint
|
changeset |
files
|
| Tue, 02 Apr 2019 20:32:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:56:29 +0800 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:56:05 +0800 |
Anton Shestakov |
evolve: remove unused StringIO import
stable
|
changeset |
files
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
stable
|
changeset |
files
|
| Wed, 21 Nov 2018 12:00:46 +0000 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
stable
|
changeset |
files
|
| Fri, 29 Mar 2019 11:19:24 +0100 |
Sushil khanchi |
evolve: compat patch to fix broken evolve obsdiscovery
|
changeset |
files
|
| Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
changeset |
files
|
| Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
changeset |
files
|
| Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
changeset |
files
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
changeset |
files
|
| Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
changeset |
files
|
| Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
changeset |
files
|
| Thu, 28 Mar 2019 12:37:55 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 27 Mar 2019 20:52:30 +0800 |
Anton Shestakov |
topicmap: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Wed, 27 Mar 2019 14:29:22 +0530 |
Sushil khanchi |
evolve: fix over-idented block
stable
|
changeset |
files
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
changeset |
files
|
| Tue, 26 Mar 2019 11:23:09 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:45:11 -0700 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
changeset |
files
|
| Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
changeset |
files
|
| Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
changeset |
files
|
| Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
|
changeset |
files
|
| Wed, 13 Mar 2019 17:32:14 +0530 |
Sushil khanchi |
evolve: preserve compatibility for hg < 4.8 versions
|
changeset |
files
|
| Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
changeset |
files
|