evolve: Graph

branching: merge with stable
2019-09-27, by Pierre-Yves David
stable-doc: note about not storing smaller range
2019-09-25, by Pierre-Yves David
stable-doc: small typo
2019-09-25, by Pierre-Yves David
stable-doc: add more advanced examples
2019-09-25, by Pierre-Yves David
stable-doc: add multiples example for the simple cases
2019-09-25, by Pierre-Yves David
test-output: oops
2019-09-26, by Pierre-Yves David
test: update part count in tests
2019-09-25, by Pierre-Yves David
evolve: check that relocating makes sense in _solvedivergent() (issue5958) stable
2019-09-09, by Anton Shestakov
tests: demonstrate content divergence causing "relocate node on top of itself" stable
2018-10-24, by Pierre-Yves David
cmdstate: introduce a "saver" contextmanager and use it in place of save()
2019-09-16, by Kyle Lippincott
cmdstate: avoid setting a default argument to a mutable object (`{}`)
2019-09-16, by Kyle Lippincott
cmdstate: switch to new-style classes
2019-09-16, by Kyle Lippincott
branching: merge stable into default
2019-09-24, by Pierre-Yves David
docs: add example for the `prune` command stable
2019-07-19, by Raphaël Gomès
tests: add some more actions to test-issue-6028, describe what's being done stable
2019-09-19, by Anton Shestakov
topic: fix some API to make it more robust stable
2019-09-13, by Valentin Gatien-Baron
rewriteutil: move allowdivergence check to foldcheck() stable
2019-09-10, by Anton Shestakov
test: change to output around transaction timing
2019-09-12, by Pierre-Yves David
branching: merge with stable
2019-09-10, by Pierre-Yves David
stablerange: add some data from field testing
2019-09-08, by Pierre-Yves David
stablerange: add a debugstablerangecache command
2019-09-08, by Pierre-Yves David
stablerange: add some documentation about the general concept
2019-09-08, by Pierre-Yves David
stablesort: add some field data about stable sort cache
2019-09-08, by Pierre-Yves David
stablesort: introduce a small debugstablesortcache command
2019-09-08, by Pierre-Yves David
stablesort: add some documentation for stablesort
2019-09-08, by Pierre-Yves David
fold: check allowdivergence before folding obsolete changesets (issue5817) stable
2019-09-07, by Anton Shestakov
tests: demonstrate that fold doesn't care about allowdivergence config option stable
2019-08-28, by Anton Shestakov
stack: remove unnecessary copying of rdependencies stable
2019-09-06, by Anton Shestakov
stack: make a deep copy of `dependencies` before modifying its items stable
2019-09-06, by Anton Shestakov
stack: demonstrate that not reusing cached property gives different results stable
2019-09-06, by Anton Shestakov
branching: merge with stable
2019-09-03, by Pierre-Yves David
changelog: add missing entry for 9af212b8565a stable
2019-09-03, by Anton Shestakov
evolve: test that target is not orig in _solveunstable() (issue6097) stable
2019-09-03, by Anton Shestakov
tests: demonstrate an orphan changeset cause "relocate node on top of itself" stable
2019-09-02, by Anton Shestakov
obslog: only indent the first chunk and chunks just after newlines (issue6175) stable
2019-08-30, by Anton Shestakov
tests: demonstrate too many spaces in olog -p output with word-diff stable
2019-08-30, by Anton Shestakov
rewind: add --keep flag that "doesn't modify working directory"
2019-07-25, by Anton Shestakov
tests: separate rewinding of merge commits, temporarily drop an error case
2019-07-23, by Anton Shestakov
python3: add python3 beta support to the CHANGELOG
2019-08-07, by Raphaël Gomès
python3: mention beta Python 3 support in README
2019-08-07, by Raphaël Gomès
python3: add supported python versions to setup.py
2019-08-07, by Raphaël Gomès
test: update output for wider cache warming
2019-08-09, by Pierre-Yves David
branching: merge with stable
2019-08-06, by Pierre-Yves David
python3: use format-source to run byteify-strings in .py files
2019-08-06, by Raphaël Gomès
topic: add a new random attribute stable
2019-08-06, by Pierre-Yves David
python3: enforce byte prefix for vfs.open()
2019-08-06, by Raphaël Gomès
python3: add raw prefix to sqlite isolation level
2019-08-06, by Raphaël Gomès
python3: add ignore block around python 2 compatibility if branch
2019-08-06, by Raphaël Gomès
flake8: silence F633 error stable
2019-08-06, by Raphaël Gomès
python3: add raw prefix to edge-cases kwargs-like objects
2019-08-06, by Raphaël Gomès
python3: add raw prefix to open()-like functions
2019-08-06, by Raphaël Gomès
python3: add raw prefix to all array.array() calls
2019-08-06, by Raphaël Gomès
python3: add raw prefix to "troubles"-related dicts
2019-08-06, by Raphaël Gomès
python3: add raw prefix in cases harder to analyze at the token level
2019-08-06, by Raphaël Gomès
python3: add byte prefix for objects that look like kwargs but aren't
2019-08-06, by Raphaël Gomès
python3: mark all SQL queries as raw strings
2019-08-06, by Raphaël Gomès
python3: prefix all regex to work with python 2 and 3
2019-08-06, by Raphaël Gomès
pick: added support for hg abort
2019-08-06, by Taapas Agrawal
pick: factor our the abort function
2019-08-06, by Taapas Agrawal
abort: added support for evolve to hg abort
2019-07-11, by Taapas Agrawal
evolve: fixed lock acquire before checking state
2019-07-12, by Taapas Agrawal
py3: add back a progress(0) call lost in 8664231b47ac
2019-07-31, by Martin von Zweigbergk
prune: adjust 'nothing to prune' to imply user needs to specify revs to prune
2019-08-02, by Kyle Lippincott
rewind: working directory is the preferred term
2019-07-20, by Anton Shestakov
rewind: add command synopsis
2019-07-20, by Anton Shestakov
py3: make setup.py py3 compatible
2019-06-28, by Ludovic Chabant
branching: merge stable back into default
2019-07-30, by Pierre-Yves David
packaging: mark as development version stable
2019-07-30, by Pierre-Yves David
Added tag 9.1.0 for changeset 6f37fdad7ac1 stable
2019-07-30, by Pierre-Yves David
packaging: update version number for 9.1.0 release stable 9.1.0
2019-07-29, by Pierre-Yves David
changelog: add missing entry for dfd88e3fa90a stable
2019-07-30, by Pierre-Yves David
packaging: groom changelog prior to release stable
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
2019-07-29, by Pierre-Yves David
test-compat: merge stable into mercurial-5.0 mercurial-5.0
2019-07-29, by Pierre-Yves David
branching: merge the two mercurial-5.0 heads mercurial-5.0
2019-07-29, by Pierre-Yves David
test-compat: reverte output change from 4764e8436b2a (hg-5.1) mercurial-5.0
2019-07-29, by Pierre-Yves David
test-compat: reverte output change from f802a75da585 (hg-5.1) mercurial-5.0
2019-07-29, by Pierre-Yves David
test-compat: reverte output change from c7d236b55a3e (hg-5.1) mercurial-5.0
2019-07-29, by Pierre-Yves David
branching: merge default into stable to prepare 9.1.0 stable
2019-07-29, by Pierre-Yves David
branching: merge stable into default
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-07-29, by Pierre-Yves David
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
2019-07-29, by Pierre-Yves David
test-compat: merge stable into mercurial-5.0 mercurial-5.0
2019-07-29, by Pierre-Yves David
test-compat: opening test compatibility branch for mercurial 5.0 mercurial-5.0
2019-07-25, by Pierre-Yves David
test-compat: close branch for mercurial-4.0 mercurial-4.4
2019-07-29, by Pierre-Yves David
prune: fix small grammatical issues in help text stable
2019-07-25, by Kyle Lippincott
docs: update evolve-faq.rst with new prune flag and proper vocabulary stable
2019-07-19, by Anton Shestakov
prune: spell --successor flag without any unnecessary shortcuts stable
2019-07-19, by Anton Shestakov
py3: redefine "troublecategories" in evolve as a dict
2019-07-17, by Martin von Zweigbergk
py3: store to __doc__ as str (unicode on py3)
2019-07-12, by Martin von Zweigbergk
py3: also catch ImportError when relative import fails
2019-07-17, by Martin von Zweigbergk
py3: convert exceptions to bytes using pycompat.bytestr()
2019-07-12, by Martin von Zweigbergk
py3: use "%d" for formatting integers
2019-07-11, by Martin von Zweigbergk
py3: avoid "%s" for formatting None
2019-07-12, by Martin von Zweigbergk
py3: use "%f" for formatting floating point number
2019-07-12, by Martin von Zweigbergk
py3: fix progress() functions to not use "%s" with int
2019-07-11, by Martin von Zweigbergk
py3: make random topic name generation consistent across py2/py3
2019-07-17, by Martin von Zweigbergk
py3: convert str to bytes before passing to core exception
2019-07-12, by Martin von Zweigbergk
py3: convert opts keys to bytes before passing to core APIs
2019-07-17, by Martin von Zweigbergk
evolve: further clarify when update is performed stable
2019-06-14, by kevpeng
py3: avoid comparing int and None
2019-07-11, by Martin von Zweigbergk
py3: avoid "%r" for list of byte strings, which produces b'' on py3
2019-07-11, by Martin von Zweigbergk
py3: avoid "%r" for byte string, which produces b'' on py3
2019-07-11, by Martin von Zweigbergk
py3: replace str(ctx) by bytes(ctx)
2019-07-11, by Martin von Zweigbergk
py3: use inspect.signature() instead of inspect.getargspec() on py3
2019-07-11, by Martin von Zweigbergk
py3: use array.array.{to,from}bytes() on py3
2019-07-09, by Martin von Zweigbergk
py3: config values can be bytes, but never unicode
2019-07-11, by Martin von Zweigbergk
py3: call branchmap.items() on py3 and continue to call iteritems() on py2
2019-07-13, by Martin von Zweigbergk
py3: switch from iteritems() to items() in the topics extension
2019-07-12, by Martin von Zweigbergk
py3: filter() now returns a generator, so wrap when we need a list
2019-07-14, by Martin von Zweigbergk
py3: don't depend on map() iterating over its input
2019-07-12, by Martin von Zweigbergk
py3: implement __bool__ in addition to __nonzero__
2019-07-11, by Martin von Zweigbergk
py3: replace iter.next() by next(iter)
2019-07-11, by Martin von Zweigbergk
py3: replace xrange() by range()
2019-07-11, by Martin von Zweigbergk
py3: read sqlite3 data as bytes
2019-07-11, by Martin von Zweigbergk
py3: sqlite3.connect() expects str arguments
2019-07-11, by Martin von Zweigbergk
cleanup: remove check only needed for hg versions before 4.4
2019-07-12, by Martin von Zweigbergk
split: remove an unnecessary (and confusingly typed) fallback revision
2019-07-12, by Martin von Zweigbergk
evolve: rename variable "children" to "child" where it's clearly singular
2019-07-11, by Martin von Zweigbergk
evolve: remove some unused variables
2019-07-11, by Martin von Zweigbergk
py3: back out 23323092f0a7
2019-07-11, by Martin von Zweigbergk
branching: merge with stable
2019-07-17, by Pierre-Yves David
touch: fix the inconsistent behavior of divergence catching logic (issue6107) stable
2019-07-17, by Sushil khanchi
touch: add test which shows touch can fail to warn about divergence stable
2019-06-29, by Sushil khanchi
touch: clarify some inline documentation stable
2019-07-17, by Sushil khanchi
tests: update output for new branch cache messsages from Mercurial
2019-07-15, by Martin von Zweigbergk
metaedit: allow operations on merge commits with some conditions
2019-07-13, by Anton Shestakov
fold: allow operations on merge commits with some conditions
2019-07-11, by Anton Shestakov
rewind: make sure merge commits include files from p1 and p2
2019-07-11, by Anton Shestakov
touch: make sure merge commits include files from p1 and p2
2019-07-10, by Anton Shestakov
py3: make `import hgext3rd.evolve` work
2019-07-09, by Martin von Zweigbergk
py3: use bytes for template keyword registrations
2019-07-09, by Martin von Zweigbergk
py3: convert _origdoc to sysstr to match __doc__
2019-07-09, by Martin von Zweigbergk
py3: use bytes for revset predicate registrations
2019-07-09, by Martin von Zweigbergk
py3: use bytes for wireprotocol command registration
2019-07-09, by Martin von Zweigbergk
py3: use byte strings for @command registrations
2019-07-09, by Martin von Zweigbergk
py3: switch from iteritems() to items()
2019-07-03, by Martin von Zweigbergk
py3: make metadata values be byte strings as Mercurial expects
2019-07-03, by Martin von Zweigbergk
tests: update output for shorted prompts from Mercurial
2019-07-09, by Martin von Zweigbergk
tests: update output for shorted prompts from Mercurial
2019-07-11, by Pierre-Yves David
rewriteutil: allow rewriting merge commits (issue4561)
2019-07-09, by Anton Shestakov
tests: show what happens when trying to hg touch a merge commit
2019-07-09, by Anton Shestakov
evolve: further clarify that update is performed only when requested stable
2019-07-04, by kevpeng
touch: let's not use util.acceptintervention() as it's not required
2019-06-14, by Sushil khanchi
branching: merge with stable
2019-07-04, by Pierre-Yves David
evolve: use right value for branch name when finding branch heads
2019-06-26, by Sushil khanchi
evolve: fix confusion in branch heads checking logic when topic in play
2019-06-25, by Sushil khanchi
topic: add tests to demonstrate topic confuses the branchhead checking logic
2019-04-14, by Sushil khanchi
evolve: fix the inconsistent behaviour of prune (issue6137) stable
2019-07-01, by Sushil khanchi
prune: add tests to demonstrate issue6137 stable
2019-07-02, by Sushil khanchi
compat: fix `setupevolveunfinished` for upstream
2019-06-30, by Sushil khanchi
prune: update to the successor of wdir also with --pair/--biject (issue6142) stable
2019-06-29, by Anton Shestakov
tests: demonstrate prune --pair not moving bookmark correctly stable
2019-06-22, by Anton Shestakov
oops: backed out changeset 7ac40b4ea24c
2019-07-02, by Pierre-Yves David
compat: fix `setupevolveunfinished` for upstream
2019-06-30, by Sushil khanchi
evolve: fix the code flow pattern of solving obswdir par and troubled revs
2019-06-16, by Sushil khanchi
evolve: refactor for consistent behavior of evolve when wdp is obsolete
2019-06-09, by Sushil khanchi
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
2019-06-15, by Sushil khanchi
pick: register pickstate as an unfinished state stable
2019-06-14, by Anton Shestakov
pick: rename variable for unfinishedstates stable
2019-06-14, by Anton Shestakov
pick: actually delete pickstate if --abort is given stable
2019-06-14, by Anton Shestakov
evolve: orphans that evolve into nothing don't need successors (issue5967) stable
2019-06-18, by Anton Shestakov
tests: demonstrate obsmarker creation after discarding conflicting changes stable
2018-12-22, by Anton Shestakov
pick: remove transaction on the whole command (issue6037) stable
2019-06-07, by Anton Shestakov
tests: demonstrate hg pick forgetting files after conflicts stable
2018-12-23, by Anton Shestakov
packaging: follow hg's supported python version (>= 2.7) stable
2019-06-13, by Anton Shestakov
packaging: require hg 4.5 also for usage, not just for building stable
2019-06-13, by Anton Shestakov
packaging: require mercurial >= 4.5 stable
2019-06-11, by Philippe Pepiot
evolve: clarify why returning by adding inline doc
2019-06-08, by Sushil khanchi
evolve: move a code block to have right value in has_some_val
2019-06-08, by Sushil khanchi
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
2019-04-27, by Sushil khanchi
pick: reduce configoverride() scope
2019-06-08, by Anton Shestakov
evolve: correct action verb in a message
2019-06-08, by Anton Shestakov
evolve: internationalize a message
2019-06-08, by Anton Shestakov
evolvecmd: the proper way to deal with conflicts is to resolve them
2019-06-06, by Anton Shestakov
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-06-05, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-06-05, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-06-05, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-06-05, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
2019-06-05, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
2019-06-05, by Pierre-Yves David
branching: merge with 9.0.0
2019-06-07, by Pierre-Yves David
branching: merge back with stable
2019-06-07, by Pierre-Yves David
packaging: mark as development versions stable
2019-06-07, by Pierre-Yves David
Added tag 9.0.0 for changeset 756db65030c6 stable
2019-06-07, by Pierre-Yves David
packaging: prepare release 9.0.0 stable 9.0.0
2019-06-06, by Pierre-Yves David
doc: clarify the status of configuration of the obshashrange protocol stable
2019-06-06, by Pierre-Yves David
changelog: add various missing bits stable
2019-06-06, by Pierre-Yves David
templatekw: keep compatibility with Mercurial 4.5 stable
2019-06-05, by Pierre-Yves David
test: adjust output to stable branch stable
2019-06-05, by Pierre-Yves David
branching: merge with stable
2019-06-04, by Pierre-Yves David
templates: don't alias keywords directly stable
2019-06-01, by Joerg Sonnenberger
stack: remove 'topic.' prefix from colors/labels
2019-05-28, by Anton Shestakov
stack: handle hash sizes when --debug flag is provided
2019-05-18, by Anton Shestakov
stack: always provide (full) node hash to non-default --template
2019-05-17, by Anton Shestakov
stack: remove unnecessary prefix from stack output with non-default --template
2019-05-17, by Anton Shestakov
stack: provide context to formatter with non-default --template
2019-05-17, by Anton Shestakov
stack: leverage labelsgen() to produce all needed labels for fm.write()
2019-05-11, by Anton Shestakov
stack: check if stack is empty more pythonically
2019-05-08, by Anton Shestakov
stack: implement __bool__ and __nonzero__
2019-05-08, by Anton Shestakov
stack: get stack data directly from stack and remove stackdata()
2019-05-05, by Anton Shestakov
stack: use stack._revs instead of stack.revs[1:] in external children revset
2019-05-05, by Anton Shestakov
test: update output to match the parent changesets
2019-06-04, by Pierre-Yves David
topic: add a simple option to reject publishing
2019-05-27, by Pierre-Yves David
compat: adjust `wrapadd` for upstream
2019-06-04, by Pierre-Yves David
debian: override default value for SPHINXBUILD in docs/makefile stable
2019-05-05, by Faheem Mitha
obshashtree: move obshashtree in its own module
2019-05-27, by Pierre-Yves David
obsdiscovery: drop `obshash` discovery protocol (issue6136)
2019-05-27, by Pierre-Yves David
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
branching: overwrite broken merge with a correct one
2019-02-13, by Pierre-Yves David
branching: merge with stable
2019-02-13, by Anton Shestakov
branching: merge with stable
2019-02-12, by Pierre-Yves David
obshistory: omit keyword arguments with default values in patch.diffui() calls stable
2019-02-11, by Anton Shestakov
branching: merge with stable
2019-02-08, by Pierre-Yves David
test: wider another time matching in prev/next lock testing stable
2019-02-08, by Pierre-Yves David
branching: merge with stable
2019-02-08, by Pierre-Yves David
test: wider time matching in prev/next lock testing stable
2019-02-08, by Pierre-Yves David
topic: make topics compatible with branchmap refactor
2018-11-21, by Martijn Pieters
prompts: use 1-indexing in revselectionprompt()
2019-01-30, by Martin von Zweigbergk
test-split: split now ignores diff.* settings
2019-02-07, by Anton Shestakov
pick: add --tool for hg pick to specify mergetool
2019-02-03, by Sangeet Kumar Mishra
revset: use getintrange() to parse relation subscript
2019-02-06, by Anton Shestakov
branching: merge with stable
2019-02-03, by Pierre-Yves David
compat: pass contexts to _findlimit() (issue6066) stable
2019-01-31, by Sushil khanchi
packaging: fix debian changelog stable
2019-02-03, by Pierre-Yves David
changelog: add relevant entries
2019-01-30, by Pierre-Yves David
evolve: add test for the case where public divergence on difference parents
2019-01-22, by Sushil khanchi
evolve: update the public divergence resolution logic to cover --continue case
2019-01-21, by Sushil khanchi
evolve: add logic to resolve content-divergence with a public cset
2019-01-21, by Sushil khanchi
evolve: introduce function to create a obsmarker relation even for public cset
2019-01-13, by Sushil khanchi
topic: make ranges work in revset relations like 'foo#stack[1:2]'
2019-01-29, by Anton Shestakov
topic: simplify #stack index check/access
2019-01-28, by Anton Shestakov
topic: make ranges work in revset relations like 'foo#topic[1:2]'
2019-01-27, by Anton Shestakov
evolve: add description of function solveobswdp
2019-01-25, by Sushil khanchi
evolve: document the "if not shouldupdate" block
2019-01-23, by Martin von Zweigbergk
evolve: make "startnode" consistently be a node, not a context
2019-01-23, by Martin von Zweigbergk
evolve: use context managers for locks and transaction
2019-01-22, by Martin von Zweigbergk
prune: use scmutil.cleanupnodes()
2019-01-22, by Martin von Zweigbergk
uncommit: use scmtutil.cleanupnodes()
2019-01-22, by Martin von Zweigbergk
amend: use scmutil.cleanupnodes() with --patch
2019-01-22, by Martin von Zweigbergk
pick: use scmutil.cleanupnodes()
2019-01-22, by Martin von Zweigbergk
fold: use scmutil.cleanupnodes()
2019-01-22, by Martin von Zweigbergk
revset: subscriptrelations functions now have two bounds
2019-01-26, by Anton Shestakov
branching: merge with stable
2019-01-23, by Pierre-Yves David
packaging: mark as development version stable
2019-01-23, by Pierre-Yves David
Added tag 8.4.0 for changeset 8c4289d0e91e stable
2019-01-23, by Pierre-Yves David
packaging: prepare release 8.4.0 stable 8.4.0
2019-01-22, by Pierre-Yves David
minitopic: add warning about extensions state and testing stable
2019-01-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-01-22, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2019-01-22, by Pierre-Yves David
branching: closing test-compat branch for mercurial-4.3 mercurial-4.3
2019-01-22, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2019-01-22, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
2019-01-22, by Pierre-Yves David
test-compat: merge stable into mercurial-4.8 mercurial-4.8
2019-01-22, by Pierre-Yves David
changelog: explicit the part related to topic stable
2019-01-22, by Pierre-Yves David
branching: merge with future version mercurial-4.8
2019-01-22, by Pierre-Yves David
branching: start branch for test compat with Mercurial 4.8 mercurial-4.8
2019-01-22, by Pierre-Yves David
test-compat: reverse test change from 9bce7e6c18b3 mercurial-4.8
2019-01-22, by Pierre-Yves David
test-compat: reverse test change from db87432df8de mercurial-4.8
2019-01-22, by Pierre-Yves David
test-compat: reverse test change from ac39cfb5bddd mercurial-4.8
2019-01-22, by Pierre-Yves David
branching: merge stable into default prior to new version stable
2019-01-22, by Pierre-Yves David
branching: merge wit stable
2019-01-19, by Pierre-Yves David
obsdiscovery: use consistent filtering during discovery
2019-01-17, by Pierre-Yves David
evolve: make sure we don't stop after evolution of obsparent (issue5881)
2019-01-18, by Sushil khanchi
evolve: extract "update" code into its own function
2019-01-18, by Sushil khanchi
evolve: add test case for issue 5881
2018-12-25, by Sushil khanchi