evolve: Graph

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
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
2019-01-18, by Sushil khanchi
evolve: cover the orphanmerge part missed by lastsolved
2018-12-25, by Sushil khanchi
evolve: add test which shows orphan-merge resolution can result to crash
2019-01-17, by Sushil khanchi
next: populate stacktemplate to the missed _nextevolve function
2018-12-25, by Sushil khanchi
evolve: adapt for deprecated ui.progress()
2019-01-14, by Martin von Zweigbergk
fold: sort concatenated commit messages in topological order
2019-01-11, by Martin von Zweigbergk
topic: make revsets like 'foo#topic[0]' work
2018-12-26, by Anton Shestakov
changelog: add an entry about the revset stack indexing
2019-01-10, by Pierre-Yves David
test: adapt output to minor behavior change
2019-01-10, by Pierre-Yves David
tests: remove unused variable and needless subshell in testlib/pythonpath.sh stable
2019-01-06, by Anton Shestakov
branching: merge with stable
2019-01-05, by Pierre-Yves David
tests: conditionalize some output for Windows stable
2019-01-04, by Matt Harbison
test-pyflakes: use '/' when printing the files to check stable
2019-01-04, by Matt Harbison
tests: fix PYTHONPATH manipulation on Windows stable
2019-01-04, by Matt Harbison
exthelper: update documentation with some examples for using registrar aliases
2019-01-03, by Matt Harbison
exthelper: simplify the ability to register filesets
2018-12-27, by Matt Harbison
exthelper: simplify the ability to register templates
2018-12-27, by Matt Harbison
exthelper: simplify the ability to register revsets
2018-12-27, by Matt Harbison
exthelper: support the option argument when registering a command
2018-12-23, by Matt Harbison
exthelper: simplify configitem registration
2018-12-22, by Matt Harbison
exthelper: avoid a [] default arg to wrapcommand()
2018-12-27, by Matt Harbison
configitems: move the default values to the registrar decorator
2019-01-04, by Matt Harbison
topic: make revsets like foo#stack[-1] work too
2018-12-26, by Anton Shestakov
topic: make revsets like 'foo#stack[0]' work
2018-12-16, by Anton Shestakov
exthelper: remove '_' in final_xxx() function names to conform to hg style
2018-12-22, by Matt Harbison
branching: merge with stable
2018-12-24, by Pierre-Yves David
packaging: mark as development version stable
2018-12-24, by Pierre-Yves David
Added tag 8.3.3 for changeset 97b18934d6db stable
2018-12-24, by Pierre-Yves David
packaging: prepare version 8.3.3 stable 8.3.3
2018-12-24, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-12-24, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-12-24, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2018-12-24, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2018-12-24, by Pierre-Yves David
test-compat: merge stable into mercurial-4.7 mercurial-4.7
2018-12-24, by Pierre-Yves David
evolve: detect unresolved conflict during evolve --continue (issue5966) stable
2018-12-21, by Pierre-Yves David
tests: filter out uninteresting log events
2018-12-20, by Anton Shestakov
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-12-21, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-12-21, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2018-12-21, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2018-12-21, by Pierre-Yves David
test-compat: merge stable into mercurial-4.7 mercurial-4.7
2018-12-21, by Pierre-Yves David
linter: silence rightful complains about unused variable stable
2018-12-21, by Pierre-Yves David
topic: merge _showlasttouched logic into _listtopics
2018-12-03, by Anton Shestakov
topic: simplify _showlasttouched and _getlasttouched (and its data structure)
2018-12-03, by Anton Shestakov
branching: merge with stable
2018-12-13, by Pierre-Yves David
split: add a --interactive flag
2018-12-13, by Boris Feld
split: take file patterns to limit selection on matching file patterns
2018-02-21, by Boris Feld
split: only accept explicit revision through the `-r` option
2018-02-21, by Boris Feld
issue-6028: resolves 6028 - return (False, ".") instead of (False, '') stable
2018-12-13, by James Reynolds
branching: merge with stable
2018-12-13, by Pierre-Yves David
tests: add sparserevlog cap since hg now has sparse revlogs by default
2018-12-12, by Anton Shestakov
split: rework the prompt to be more standard
2018-12-12, by Pierre-Yves David
split: add a option to discard remaining change during split
2018-02-20, by Pierre-Yves David
split: add a way to abort a split from the prompt
2018-02-20, by Pierre-Yves David
split: add a help entry to the final prompt
2018-02-20, by Pierre-Yves David
topic: make revset argument messages be similar to such messages in core stable
2018-12-05, by Anton Shestakov
tests: don't forget to add hg serve pid to DAEMON_PIDS in test-wireproto.t stable
2018-12-05, by Anton Shestakov
test: adapt to change output change on default
2018-12-04, by Pierre-Yves David
safeguard: don't reimplement auto-publish if it's in core (will be in 4.9)
2018-12-01, by Anton Shestakov
safeguard: the new default for auto-publish is 'publish'
2018-12-01, by Anton Shestakov
stack: add a --children flag to stack
2018-09-21, by James Reynolds
extensions: avoid shadowing imported module names with exthelper methods
2018-12-02, by Matt Harbison
extensions: add fileset support to exthelper
2018-11-30, by Matt Harbison
extensions: add uipopulate() support to exthelper
2018-12-02, by Matt Harbison
exthelper: clarify copyright and licence for the module
2018-12-02, by Pierre-Yves David
packaging: merge with version 8.3.2
2018-11-27, by Pierre-Yves David
packaging: mark development version stable
2018-11-27, by Pierre-Yves David
Added tag 8.3.2 for changeset 7edc5c148df0 stable
2018-11-27, by Pierre-Yves David
packagin: prepare release 8.3.2 stable 8.3.2
2018-11-27, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-11-27, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-11-27, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2018-11-27, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
2018-11-27, by Pierre-Yves David
test-compat: merge stable into mercurial-4.7 mercurial-4.7
2018-11-27, by Pierre-Yves David
changelog: add information about the topic message improvements
2018-11-27, by Pierre-Yves David
branching: merge with stable
2018-11-27, by Pierre-Yves David
evolve: update the abort to a ProgrammingError stable
2018-11-27, by Sushil khanchi
topics: improve the message around topic changing
2018-11-26, by Pulkit Goyal
tests: fix for POSIX compliance
2018-11-21, by Martijn Pieters
style: remove unused variables
2018-11-21, by Martijn Pieters
evolve: fix a documentation typo stable
2018-11-20, by Eric Spishak-Thomas
compat: drop 4.3 related obsfate code
2018-11-19, by Pierre-Yves David
compat: drop code dealing with incompatibility for --publish with 4.3
2018-11-19, by Pierre-Yves David
compat: clarify when some conditional are used
2018-11-19, by Pierre-Yves David
compat: drop 4.3 "new troubles" report code
2018-11-19, by Pierre-Yves David