evolve: Graph

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