2019-04-28 |
Matt Harbison |
revset: add `predecessor` aliases for `precursors` and `allprecursors`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `bumped` references to `phase-divergent`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `divergent` references to `content-divergent`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `troubled` references to `unstable`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `unstable` references to `orphan`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
doc: correct a typo
|
changeset |
files
|
2019-04-27 |
Matt Harbison |
docs: change `troubles` references to `instability`
|
changeset |
files
|
2019-04-27 |
Matt Harbison |
docs: change `precursors` references to `predecessors`
|
changeset |
files
|
2019-04-27 |
Matt Harbison |
docs: import figure diagrams with inkscape 0.92
|
changeset |
files
|
2019-04-25 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
changeset |
files
|
2019-04-25 |
Martin von Zweigbergk |
evolve: move more of the progress-related variables together
|
changeset |
files
|
2019-04-25 |
Martin von Zweigbergk |
evolve: delete dead calculation of number of troubled revisions
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: drop nested locks and transactions
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
next: start transaction before calling _solveone()
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: use single transaction also when continuing
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: extract function for solving one revision, including merges
|
changeset |
files
|
2019-04-25 |
Anton Shestakov |
evolve: mention that --all is the default behavior now
|
changeset |
files
|
2019-04-25 |
Anton Shestakov |
evolve: mention that not all successful operations currently update wdir
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: add progress support for --continue
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: reduce scope of progress-related variables
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: move progress-clearing out of _cleanup()
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: stop passing no-op "progresscb" into continueevolve()
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: _solveunstable() update progress only once
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: don't update progress just before clearing it
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: clean up progress bar also when using -r
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
tests: add some basic testing of progress
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: increment progress *after* a whole merge commit is done
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: use util.acceptintervention() for closing transactions
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: use context manager for transactions
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: use consistent message and just re-raise InterventionRequired
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: use standard InterventionRequired instead of MergeFailure
|
changeset |
files
|
2019-04-19 |
Martin von Zweigbergk |
evolve: don't use exception for local flow control
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: reduce indentation with an early return statement
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: remove a useless return statement at end of function
|
changeset |
files
|
2019-04-21 |
Sushil khanchi |
test: move a test to an appropriate test file
|
changeset |
files
|
2019-04-21 |
Sushil khanchi |
test: improve the title of a test
|
changeset |
files
|
2019-04-21 |
Sushil khanchi |
test: remove duplicated test
|
changeset |
files
|
2019-03-09 |
Sushil khanchi |
evolve: warn user for the metadata being lost in public divergence resolution
|
changeset |
files
|
2019-04-17 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
changeset |
files
|
2019-04-24 |
Pierre-Yves David |
test: use a shorter test name
|
changeset |
files
|
2019-04-10 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
changeset |
files
|
2019-04-24 |
Anton Shestakov |
evolve: use --all by default (BC)
|
changeset |
files
|
2019-04-24 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
2019-04-24 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
changeset |
files
|
2019-04-24 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
changeset |
files
|
2019-04-13 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
2019-04-24 |
Anton Shestakov |
tests: don't create a nested repo for no reason
|
changeset |
files
|
2019-04-24 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
Added tag 8.5.1 for changeset 05c9dcf5512e
stable
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
2019-04-23 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
packaging: mark extensions as tested with 5.0
stable
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
2019-03-12 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
compat: drop support for Mercurial 4.4
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
changeset |
files
|
2019-04-23 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
2019-04-19 |
Sushil khanchi |
compat: fix a typo in compat patch
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
changelog: mention extensions isolation (issue6121)
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap wireprotocaps for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap _pushb2phases for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap handlecheckheads for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap wireprotobranchmap for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap _headssummary for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap desthistedit for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap _destupdatetopic for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap _destmergebranch for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap gettopicrepo for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap mergeupdate for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap committext for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only affect `hg commit` behavior for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: only wrap workingctx.__init__ for repo with topic
stable
|
changeset |
files
|
2019-04-18 |
Pierre-Yves David |
topic: introduce a `hastopicext(repo)` function
stable
|
changeset |
files
|
2019-04-16 |
Sushil khanchi |
tests: consolidate the public-content-divergent test cases
|
changeset |
files
|
2019-04-17 |
Sushil khanchi |
evolve: improve inline documentation for the public divergence resolution
|
changeset |
files
|
2019-04-14 |
Sushil khanchi |
cleanup: remove a duplicated line
|
changeset |
files
|