evolve: Graph

cmdrewrite: use context manager for some locks and transactions
2019-05-09, by Martin von Zweigbergk
evolve: mention that --all is default, in list of options
2019-04-29, by Sushil khanchi
touch: use util.acceptintervention() for closing the transaction
2019-05-13, by Sushil khanchi
touch: use context manager for locks
2019-05-13, by Sushil khanchi
touch: extract the logic of touching rev's to its own function
2019-05-13, by Sushil khanchi
changelog: mention user merging in the changelog
2019-05-27, by Pierre-Yves David
evolve: consider using three way merge to get the user for div resolution
2019-05-05, by Sushil khanchi
evolve: add tests for the case when div csets has different users
2019-05-05, by Sushil khanchi
branching: merge with stable
2019-05-03, by Pierre-Yves David
evolve: move status msg to verbose mode in content-divergence resolution
2019-04-26, by Sushil khanchi
debian: Override default value for SPHINXBUILD in docs/makefile stable
2019-05-03, by Faheem Mitha
docs: add SPHINXBUILD make variable stable
2019-05-03, by Faheem Mitha
topic: add test to increase code coverage in case of multiple topics stable
2019-04-27, by Sushil khanchi
changelog: --no-update is the default, recommend --update instead
2019-04-27, by Anton Shestakov
topic: drop support for accessing csets in branch stack using bxx (issue6119)
2019-04-27, by Pulkit Goyal
legacy: drop the check for `obsolete._enabled` stable
2019-04-29, by Matt Harbison
docs: drop references to the old temporary commit that was created with amend
2019-04-28, by Matt Harbison
templatekw: add `instabilities` alias for `troubles`
2019-04-27, by Matt Harbison
revset: switch internal uses and tests to `predecessors` from legacy name
2019-04-27, by Matt Harbison
revset: add `predecessor` aliases for `precursors` and `allprecursors`
2019-04-27, by Matt Harbison
revset: add `unstable` alias for `troubled`
2019-04-27, by Matt Harbison
docs: change `bumped` references to `phase-divergent`
2019-04-27, by Matt Harbison
docs: change `divergent` references to `content-divergent`
2019-04-27, by Matt Harbison
docs: change `troubled` references to `unstable`
2019-04-27, by Matt Harbison
docs: change `unstable` references to `orphan`
2019-04-27, by Matt Harbison
doc: correct a typo
2019-04-27, by Matt Harbison
docs: change `troubles` references to `instability`
2019-04-27, by Matt Harbison
docs: change `precursors` references to `predecessors`
2019-04-27, by Matt Harbison
docs: import figure diagrams with inkscape 0.92
2019-04-27, by Matt Harbison
messages: standardize on "working copy is now at" including "is"
2019-04-25, by Martin von Zweigbergk
evolve: move more of the progress-related variables together
2019-04-25, by Martin von Zweigbergk
evolve: delete dead calculation of number of troubled revisions
2019-04-25, by Martin von Zweigbergk
evolve: drop nested locks and transactions
2019-04-19, by Martin von Zweigbergk
next: start transaction before calling _solveone()
2019-04-19, by Martin von Zweigbergk
evolve: use single transaction also when continuing
2019-04-19, by Martin von Zweigbergk
evolve: run in a single transaction
2019-04-19, by Martin von Zweigbergk
evolve: extract function for solving one revision, including merges
2019-04-19, by Martin von Zweigbergk
evolve: mention that --all is the default behavior now
2019-04-25, by Anton Shestakov
evolve: mention that not all successful operations currently update wdir
2019-04-25, by Anton Shestakov
evolve: add progress support for --continue
2019-04-23, by Martin von Zweigbergk
evolve: reduce scope of progress-related variables
2019-04-23, by Martin von Zweigbergk
evolve: move progress-clearing out of _cleanup()
2019-04-23, by Martin von Zweigbergk
evolve: stop passing no-op "progresscb" into continueevolve()
2019-04-23, by Martin von Zweigbergk
evolve: _solveunstable() update progress only once
2019-04-23, by Martin von Zweigbergk
evolve: don't update progress just before clearing it
2019-04-23, by Martin von Zweigbergk
evolve: clean up progress bar also when using -r
2019-04-23, by Martin von Zweigbergk
tests: add some basic testing of progress
2019-04-23, by Martin von Zweigbergk
evolve: increment progress *after* a whole merge commit is done
2019-04-19, by Martin von Zweigbergk
evolve: use util.acceptintervention() for closing transactions
2019-04-19, by Martin von Zweigbergk
evolve: use context manager for transactions
2019-04-19, by Martin von Zweigbergk
evolve: use consistent message and just re-raise InterventionRequired
2019-04-19, by Martin von Zweigbergk
evolve: use standard InterventionRequired instead of MergeFailure
2019-04-19, by Martin von Zweigbergk
evolve: don't use exception for local flow control
2019-04-19, by Martin von Zweigbergk
evolve: reduce indentation with an early return statement
2019-04-23, by Martin von Zweigbergk
evolve: remove a useless return statement at end of function
2019-04-23, by Martin von Zweigbergk
test: move a test to an appropriate test file
2019-04-21, by Sushil khanchi
test: improve the title of a test
2019-04-21, by Sushil khanchi
test: remove duplicated test
2019-04-21, by Sushil khanchi
evolve: warn user for the metadata being lost in public divergence resolution
2019-03-09, by Sushil khanchi
evolve: show a status message when merging leads to public cset
2019-04-17, by Sushil khanchi
test: use a shorter test name
2019-04-24, by Pierre-Yves David
stack: rename troubledcount to unstablecount
2019-04-10, by Anton Shestakov
evolve: use --all by default (BC)
2019-04-24, by Anton Shestakov
tests: add --rev to hg evolve to reduce test changes for the next patch
2019-04-24, by Anton Shestakov
tests: add --no-all to hg evolve to reduce test changes
2019-04-24, by Anton Shestakov
evolve: don't update after instability resolution by default (BC)
2019-04-24, by Anton Shestakov
tests: add --update to hg evolve to reduce test changes for the next patch
2019-04-14, by Anton Shestakov
tests: don't create a nested repo for no reason
2019-04-24, by Anton Shestakov
branching: merge with stable
2019-04-24, by Pierre-Yves David
Added tag 8.5.1 for changeset 05c9dcf5512e stable
2019-04-23, by Pierre-Yves David
packaging: prepare version 8.5.1 stable 8.5.1
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-04-23, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
2019-04-23, by Pierre-Yves David
evolve: fix progress display with hg<4.7 stable
2019-04-22, by Martin von Zweigbergk
packaging: mark extensions as tested with 5.0 stable
2019-04-20, by Pierre-Yves David
branching: merge with stable
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-04-23, by Pierre-Yves David
evolve: use merge.update() for resolving phase divergence
2019-03-11, by Martin von Zweigbergk
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-04-23, by Pierre-Yves David
compat: drop support for Mercurial 4.4
2019-04-23, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
2019-04-23, by Pierre-Yves David
compat: backed out changeset cfcb7eedc666 stable
2019-04-23, by Pierre-Yves David
test-compat: adapt test output to 4.4 mercurial-4.4
2019-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-04-20, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-04-20, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-04-20, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-04-20, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-04-20, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
2019-04-20, by Pierre-Yves David
compat: fix a typo in compat patch stable
2019-04-19, by Sushil khanchi
changelog: mention extensions isolation (issue6121) stable
2019-04-18, by Pierre-Yves David
topic: only wrap wireprotocaps for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap _pushb2phases for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap handlecheckheads for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap wireprotobranchmap for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap _headssummary for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap desthistedit for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap _destupdatetopic for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap _destmergebranch for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap gettopicrepo for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap mergeupdate for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap committext for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only affect `hg commit` behavior for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: only wrap workingctx.__init__ for repo with topic stable
2019-04-18, by Pierre-Yves David
topic: introduce a `hastopicext(repo)` function stable
2019-04-18, by Pierre-Yves David
tests: consolidate the public-content-divergent test cases
2019-04-17, by Sushil khanchi
evolve: improve inline documentation for the public divergence resolution
2019-04-17, by Sushil khanchi
cleanup: remove a duplicated line
2019-04-14, by Sushil khanchi
changelog: mention topic compatibility stable
2019-04-17, by Pierre-Yves David
branching: merge stable back into default
2019-04-17, by Pierre-Yves David
tescompat: revert test change for mercurial-4.9 mercurial-4.9
2019-04-17, by Pierre-Yves David
branching: merge 8.5.0 expected output in stable stable
2019-04-17, by Pierre-Yves David
testcompat: open a branch dedicated to mercurial 4.9 mercurial-4.9
2019-04-17, by Pierre-Yves David
topic: add compatibility for writing copy metadata in changelog.add() stable
2019-04-17, by Anton Shestakov
serverminitopic: add compatibility for branchcache that now uses self._entries stable
2019-04-17, by Anton Shestakov
branching: merge stable into default
2019-04-12, by Pierre-Yves David
packaging: mark version as development version stable
2019-04-12, by Pierre-Yves David
Added tag 8.5.0 for changeset 33c617626fd9 stable
2019-04-12, by Pierre-Yves David
packaging: prepare version 8.5.0 stable 8.5.0
2019-04-12, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-04-11, by Pierre-Yves David
branching: merge stable back into default
2019-04-12, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-04-11, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-04-11, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-04-11, by Pierre-Yves David
test-compat: merge stable into mercurial-4.8 mercurial-4.8
2019-04-11, by Pierre-Yves David
changelog: merge 8.4.1 and 8.5.1 entries stable
2019-04-11, by Pierre-Yves David
branching: merge stable into default stable
2019-04-11, by Pierre-Yves David
branching: merge default change into stable stable
2019-04-11, by Pierre-Yves David
branching: merge default branch in stable to prepare 8.5.0 release stable
2019-04-11, by Pierre-Yves David
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
2019-04-02, by Matt Harbison
evolve: store --update flag state in evolvestate file
2019-04-11, by Anton Shestakov
state: implement cmdstate.__contains__()
2019-04-12, by Anton Shestakov
changelog: mention Martin work on phase-divergence
2019-04-11, by Pierre-Yves David
test: revert update from 5.0 record logic stable
2019-04-11, by Pierre-Yves David
tests: remove note about already implemented --confirm with --continue
2019-04-11, by Anton Shestakov
evolve: use merge.update() for resolving phase divergence
2019-03-11, by Martin von Zweigbergk
evolve: compat patch for recordfilter change in mercurial
2019-04-10, by Sushil khanchi
test: add file cancelation scenario for phase-divergence
2019-04-10, by Pierre-Yves David
test: introduce a more complete test for phase-divergence
2019-04-10, by Pierre-Yves David
test: rename test about content divergent meta data
2019-04-10, by Pierre-Yves David
test: cleanup title and doc phase-divergent cases
2019-04-10, by Pierre-Yves David
test: remove remaining duplicated file
2019-04-10, by Pierre-Yves David
test: add test for content-divergence with file removal
2019-04-10, by Pierre-Yves David
test: clarify changeset concent in the first content-divergence test
2019-04-10, by Pierre-Yves David
branching: merge with stable
2019-04-10, by Pierre-Yves David
branching: merge with test consolidation
2019-04-10, by Pierre-Yves David
branching: merge with stable
2019-04-10, by Pierre-Yves David
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
2019-04-07, by Joerg Sonnenberger
evolve: when using evolve, cache files belong into the master repo
2019-04-07, by Joerg Sonnenberger
changelog: mention issue6089 fix stable
2019-04-10, by Pierre-Yves David
pick: update working dir branch (issue6089) stable
2019-02-23, by Manuel Jacob
tests: rename test-grab to test-pick stable
2019-04-10, by Pierre-Yves David
evolve: make sure div resolution don't replace the initial author (issue6113) stable
2019-04-10, by Sushil khanchi
evolve: add test which demonstrate issue6113 stable
2019-04-10, by Sushil khanchi
test: consolidate the content-divergent test cases stable
2019-04-10, by Pierre-Yves David
changelog: mention the fix to issue6057 stable
2019-04-09, by Pierre-Yves David
extensions: avoid enabling evolve for unrelated repositories (issue6057) stable
2019-04-09, by Pierre-Yves David
stack: improve set combination logic
2019-04-06, by Anton Shestakov
stack: fix phasecache._phasesets check logic
2019-04-06, by Anton Shestakov
evolve: remove todo markers from a test which has been fixed
2019-04-02, by Sushil khanchi
next: clarify tests related to `commands.update.check` test
2019-04-05, by Pierre-Yves David
stack: simplify phasecache checks in _stackcandidates()
2019-04-03, by Anton Shestakov
evolve: fix divergence resolution when not merging a descendant
2019-04-05, by Pierre-Yves David
test: fix a phase divergence test case to actually not contains conflict
2019-03-29, by Pierre-Yves David
tests: use current instability names everywhere
2019-04-05, by Pierre-Yves David
test: apply unstability resolution to `test-unstability-resolution-result.t`
2019-04-04, by Pierre-Yves David
test: rename and clarify content of test-unstable-content-divergent.t
2019-04-04, by Pierre-Yves David
test: rename and clarify content of test-unstable-orphan.t
2019-04-04, by Pierre-Yves David
evolve: refactor the code which swap two nodes (in divergence resolution)
2019-04-03, by Sushil khanchi
evolve: remove tmpctx arg from _resolvephasedivergent()
2019-04-02, by Sushil khanchi
doc: clarify _resolvephasedivergent role and constraint
2019-03-29, by Pierre-Yves David
branching: merge with stable
2019-04-02, by Pierre-Yves David
evolve: unindent some lines caught by flake8 stable
2019-02-13, by Anton Shestakov
obsexchange: avoid importing io/StringIO module with a different name stable
2019-02-13, by Anton Shestakov
evolve: remove unused StringIO import stable
2019-02-13, by Anton Shestakov
compat: add support for new arg name in memfilectx.__init__ stable
2019-03-22, by Martin von Zweigbergk
topic: make topics compatible with branchmap refactor stable
2018-11-21, by Martijn Pieters
evolve: compat patch to fix broken evolve obsdiscovery
2019-03-29, by Sushil khanchi
tests: add obslog output to some tests for divergence resolution
2019-03-28, by Martin von Zweigbergk
tests: add tests for divergence resolution with split+amend
2019-03-28, by Martin von Zweigbergk
test: use 'split' instead of 'splitted' in the tests
2019-03-26, by Pierre-Yves David
evolve: drop the "computing new diff message" for phase-divergence
2019-03-26, by Pierre-Yves David
evolve: clarify output when phase-divergence resolution results in no change
2019-03-20, by Martin von Zweigbergk
tests: reduce dependence on previous tests for setup
2019-03-12, by Martin von Zweigbergk
branching: merge with stable
2019-03-28, by Pierre-Yves David
topicmap: add compatibility for branchcache that now uses self._entries stable
2019-03-27, by Anton Shestakov
evolve: fix over-idented block stable
2019-03-27, by Sushil khanchi
tests: create "private" repository in already-updated state
2019-03-12, by Martin von Zweigbergk
branching: merge with stable
2019-03-26, by Pierre-Yves David
touch: use action "touch", not "<function touch at ...>", in precheck stable
2019-03-25, by Martin von Zweigbergk
prune: use action "prune", not "touch", in precheck stable
2019-03-25, by Martin von Zweigbergk
evolve: test a common case of public divergence
2019-03-24, by Pierre-Yves David
evolve: add condition in case of pubdiv to not swap the two div csets
2019-03-24, by Sushil khanchi
evolve: add logic to handle a particular case in divergence resolution
2019-03-23, by Sushil khanchi
evolve: add a test reflecting wrong behaviour of content-div resolution
2019-03-22, by Sushil khanchi
compat: add support for new arg name in memfilectx.__init__
2019-03-22, by Martin von Zweigbergk
evolve: preserve compatibility for hg < 4.8 versions
2019-03-13, by Sushil khanchi
evolve: warn user if cset desc is being lost
2019-03-09, by Sushil khanchi
changelog: mention latest improvement
2019-03-10, by Pierre-Yves David
stack: make @ (current) more important than $ (some sort of unstable)
2019-03-10, by Anton Shestakov
stack: show content and phase divergent state and symbol
2019-03-09, by Anton Shestakov
stack: handle external-children just like other states
2019-03-09, by Anton Shestakov
stack: optimize revset used for stack --children
2019-03-07, by Anton Shestakov
stack: rename unstable -> orphan
2019-03-07, by Anton Shestakov
evolvecmd: compatibility with older geteffectflag() that took a tuple
2019-03-06, by Anton Shestakov
obshistory: remove unused geteffectflag(), it's been in core since 4.4
2019-03-06, by Anton Shestakov
compat: remove old vocabulary change fallbacks
2019-03-06, by Anton Shestakov
branching: merge with stable
2019-03-07, by Pierre-Yves David
evolve: fix a typo from directory to dirty stable
2019-03-07, by Sushil khanchi
evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stable
2019-03-07, by Sushil khanchi
evolve: add tests which shows evolve can get confused about copies (issue5930) stable
2019-03-07, by Sushil khanchi
test: include some documentation to describe the case briefly stable
2019-03-05, by Sushil khanchi
split: use ui.configoverride to preserve phase while commiting stable
2019-03-05, by Sushil khanchi
branching: merge with stable
2019-03-04, by Pierre-Yves David
changelog: add entries for the recent fixes stable
2019-03-04, by Pierre-Yves David
evolve: make sure user can recover from conflict (issue6053) stable
2019-03-04, by Sushil khanchi
evolve: add test which shows unrecoverable evolve state (issue6053) stable
2019-03-04, by Sushil khanchi
evolve: add a test in pubdiv where only merging leads to conflict
2019-03-02, by Sushil khanchi
evolve: cover continue case in pubdiv when merging results in same as public
2019-02-28, by Sushil khanchi
evolve: handle a case in pubic-div when merging results in same as public
2019-02-22, by Sushil khanchi
evolve: rename npublicdiv to publicnode
2019-02-28, by Sushil khanchi
evolve: in pubdiv resolution make sure that transaction get closed
2019-02-28, by Sushil khanchi
evolve: pin the public cset to local side in merging when solving public div
2019-02-25, by Sushil khanchi
evolve: add tests of relocation case in public divergence
2019-02-23, by Sushil khanchi
branching: merge with stable
2019-03-03, by Pierre-Yves David
split: make sure hg split preserve the phase of splitting cset (issue6048) stable
2019-03-02, by Sushil khanchi
split: add tests which demonstrate the issue6048 stable
2019-03-02, by Sushil khanchi
evolve: fix the broken behaviour on div resolution in relocation case
2019-02-22, by Sushil khanchi
evolve: change in a test which demonstrate divergence resolution can break
2019-02-22, by Sushil khanchi
tests: update the title of a test as it's not what it says
2019-02-22, by Sushil khanchi
obsexchange: avoid importing io/StringIO module with a different name
2019-02-13, by Anton Shestakov
evolve: remove unused StringIO import
2019-02-13, by Anton Shestakov
evolve: unindent some lines caught by flake8
2019-02-13, by Anton Shestakov