Wed, 10 Apr 2019 15:47:28 +0200 |
Pierre-Yves David |
tests: rename test-grab to test-pick
stable
|
changeset |
files
|
Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
changeset |
files
|
Wed, 10 Apr 2019 15:26:41 +0200 |
Sushil khanchi |
evolve: add test which demonstrate issue6113
stable
|
changeset |
files
|
Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
changeset |
files
|
Tue, 09 Apr 2019 21:16:49 +0200 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
changeset |
files
|
Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
changeset |
files
|
Sat, 06 Apr 2019 15:50:15 +0200 |
Anton Shestakov |
stack: improve set combination logic
|
changeset |
files
|
Sat, 06 Apr 2019 15:49:22 +0200 |
Anton Shestakov |
stack: fix phasecache._phasesets check logic
|
changeset |
files
|
Tue, 02 Apr 2019 12:41:57 +0530 |
Sushil khanchi |
evolve: remove todo markers from a test which has been fixed
|
changeset |
files
|
Fri, 05 Apr 2019 22:28:07 +0200 |
Pierre-Yves David |
next: clarify tests related to `commands.update.check` test
|
changeset |
files
|
Wed, 03 Apr 2019 17:20:34 +0800 |
Anton Shestakov |
stack: simplify phasecache checks in _stackcandidates()
|
changeset |
files
|
Fri, 05 Apr 2019 17:45:59 +0200 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
changeset |
files
|
Fri, 29 Mar 2019 15:15:07 +0100 |
Pierre-Yves David |
test: fix a phase divergence test case to actually not contains conflict
|
changeset |
files
|
Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
changeset |
files
|
Thu, 04 Apr 2019 12:24:28 +0200 |
Pierre-Yves David |
test: apply unstability resolution to `test-unstability-resolution-result.t`
|
changeset |
files
|
Thu, 04 Apr 2019 12:06:33 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-content-divergent.t
|
changeset |
files
|
Thu, 04 Apr 2019 11:53:05 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-orphan.t
|
changeset |
files
|
Wed, 03 Apr 2019 01:00:33 +0530 |
Sushil khanchi |
evolve: refactor the code which swap two nodes (in divergence resolution)
|
changeset |
files
|
Tue, 02 Apr 2019 18:01:43 +0530 |
Sushil khanchi |
evolve: remove tmpctx arg from _resolvephasedivergent()
|
changeset |
files
|
Fri, 29 Mar 2019 11:48:36 +0100 |
Pierre-Yves David |
doc: clarify _resolvephasedivergent role and constraint
|
changeset |
files
|
Tue, 02 Apr 2019 20:32:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
stable
|
changeset |
files
|
Wed, 13 Feb 2019 21:56:29 +0800 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
stable
|
changeset |
files
|
Wed, 13 Feb 2019 21:56:05 +0800 |
Anton Shestakov |
evolve: remove unused StringIO import
stable
|
changeset |
files
|
Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
stable
|
changeset |
files
|
Wed, 21 Nov 2018 12:00:46 +0000 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
stable
|
changeset |
files
|
Fri, 29 Mar 2019 11:19:24 +0100 |
Sushil khanchi |
evolve: compat patch to fix broken evolve obsdiscovery
|
changeset |
files
|
Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
changeset |
files
|
Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
changeset |
files
|
Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
changeset |
files
|
Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
changeset |
files
|
Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
changeset |
files
|
Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
changeset |
files
|
Thu, 28 Mar 2019 12:37:55 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 27 Mar 2019 20:52:30 +0800 |
Anton Shestakov |
topicmap: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
Wed, 27 Mar 2019 14:29:22 +0530 |
Sushil khanchi |
evolve: fix over-idented block
stable
|
changeset |
files
|
Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
changeset |
files
|
Tue, 26 Mar 2019 11:23:09 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Mon, 25 Mar 2019 15:45:11 -0700 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
changeset |
files
|
Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
changeset |
files
|
Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
changeset |
files
|
Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
changeset |
files
|
Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
changeset |
files
|
Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
changeset |
files
|
Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
|
changeset |
files
|
Wed, 13 Mar 2019 17:32:14 +0530 |
Sushil khanchi |
evolve: preserve compatibility for hg < 4.8 versions
|
changeset |
files
|
Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
changeset |
files
|
Sun, 10 Mar 2019 18:00:08 +0100 |
Pierre-Yves David |
changelog: mention latest improvement
|
changeset |
files
|
Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
changeset |
files
|
Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
changeset |
files
|
Sat, 09 Mar 2019 12:54:00 +0800 |
Anton Shestakov |
stack: handle external-children just like other states
|
changeset |
files
|
Thu, 07 Mar 2019 22:50:56 +0800 |
Anton Shestakov |
stack: optimize revset used for stack --children
|
changeset |
files
|
Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
changeset |
files
|
Wed, 06 Mar 2019 21:47:08 +0800 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
changeset |
files
|
Wed, 06 Mar 2019 21:42:32 +0800 |
Anton Shestakov |
obshistory: remove unused geteffectflag(), it's been in core since 4.4
|
changeset |
files
|
Wed, 06 Mar 2019 16:56:25 +0800 |
Anton Shestakov |
compat: remove old vocabulary change fallbacks
|
changeset |
files
|
Thu, 07 Mar 2019 10:51:48 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Thu, 07 Mar 2019 01:57:43 +0530 |
Sushil khanchi |
evolve: fix a typo from directory to dirty
stable
|
changeset |
files
|
Thu, 07 Mar 2019 01:47:14 +0530 |
Sushil khanchi |
evolve: fix the dirstate after setting parents with dirty wdir (issue5930)
stable
|
changeset |
files
|
Thu, 07 Mar 2019 01:02:05 +0530 |
Sushil khanchi |
evolve: add tests which shows evolve can get confused about copies (issue5930)
stable
|
changeset |
files
|
Tue, 05 Mar 2019 21:15:05 +0530 |
Sushil khanchi |
test: include some documentation to describe the case briefly
stable
|
changeset |
files
|
Tue, 05 Mar 2019 20:07:23 +0530 |
Sushil khanchi |
split: use ui.configoverride to preserve phase while commiting
stable
|
changeset |
files
|
Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Mon, 04 Mar 2019 11:54:49 +0100 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
changeset |
files
|
Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
changeset |
files
|
Mon, 04 Mar 2019 02:55:38 +0530 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
changeset |
files
|
Sat, 02 Mar 2019 02:34:29 +0530 |
Sushil khanchi |
evolve: add a test in pubdiv where only merging leads to conflict
|
changeset |
files
|
Thu, 28 Feb 2019 03:12:39 +0530 |
Sushil khanchi |
evolve: cover continue case in pubdiv when merging results in same as public
|
changeset |
files
|
Fri, 22 Feb 2019 01:02:51 +0530 |
Sushil khanchi |
evolve: handle a case in pubic-div when merging results in same as public
|
changeset |
files
|
Thu, 28 Feb 2019 02:08:58 +0530 |
Sushil khanchi |
evolve: rename npublicdiv to publicnode
|
changeset |
files
|
Thu, 28 Feb 2019 02:02:18 +0530 |
Sushil khanchi |
evolve: in pubdiv resolution make sure that transaction get closed
|
changeset |
files
|
Mon, 25 Feb 2019 22:50:24 +0530 |
Sushil khanchi |
evolve: pin the public cset to local side in merging when solving public div
|
changeset |
files
|
Sat, 23 Feb 2019 00:47:14 +0530 |
Sushil khanchi |
evolve: add tests of relocation case in public divergence
|
changeset |
files
|
Sun, 03 Mar 2019 16:29:32 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Sat, 02 Mar 2019 01:43:14 +0530 |
Sushil khanchi |
split: make sure hg split preserve the phase of splitting cset (issue6048)
stable
|
changeset |
files
|
Sat, 02 Mar 2019 01:37:04 +0530 |
Sushil khanchi |
split: add tests which demonstrate the issue6048
stable
|
changeset |
files
|
Fri, 22 Feb 2019 21:01:06 +0530 |
Sushil khanchi |
evolve: fix the broken behaviour on div resolution in relocation case
|
changeset |
files
|
Fri, 22 Feb 2019 23:49:37 +0530 |
Sushil khanchi |
evolve: change in a test which demonstrate divergence resolution can break
|
changeset |
files
|
Fri, 22 Feb 2019 23:57:18 +0530 |
Sushil khanchi |
tests: update the title of a test as it's not what it says
|
changeset |
files
|
Wed, 13 Feb 2019 21:56:29 +0800 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
|
changeset |
files
|
Wed, 13 Feb 2019 21:56:05 +0800 |
Anton Shestakov |
evolve: remove unused StringIO import
|
changeset |
files
|
Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
|
changeset |
files
|
Wed, 13 Feb 2019 12:46:57 +0100 |
Pierre-Yves David |
branching: overwrite broken merge with a correct one
|
changeset |
files
|
Wed, 13 Feb 2019 19:18:17 +0800 |
Anton Shestakov |
branching: merge with stable
|
changeset |
files
|
Tue, 12 Feb 2019 15:03:14 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Mon, 11 Feb 2019 21:33:02 +0800 |
Anton Shestakov |
obshistory: omit keyword arguments with default values in patch.diffui() calls
stable
|
changeset |
files
|
Fri, 08 Feb 2019 17:52:49 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Fri, 08 Feb 2019 10:21:09 +0100 |
Pierre-Yves David |
test: wider another time matching in prev/next lock testing
stable
|
changeset |
files
|
Fri, 08 Feb 2019 09:29:54 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Fri, 08 Feb 2019 09:26:48 +0100 |
Pierre-Yves David |
test: wider time matching in prev/next lock testing
stable
|
changeset |
files
|
Wed, 21 Nov 2018 12:00:46 +0000 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
|
changeset |
files
|
Wed, 30 Jan 2019 10:03:00 -0800 |
Martin von Zweigbergk |
prompts: use 1-indexing in revselectionprompt()
|
changeset |
files
|
Thu, 07 Feb 2019 16:24:59 +0800 |
Anton Shestakov |
test-split: split now ignores diff.* settings
|
changeset |
files
|
Sun, 03 Feb 2019 17:03:02 +0530 |
Sangeet Kumar Mishra |
pick: add --tool for hg pick to specify mergetool
|
changeset |
files
|
Wed, 06 Feb 2019 13:49:29 +0800 |
Anton Shestakov |
revset: use getintrange() to parse relation subscript
|
changeset |
files
|
Sun, 03 Feb 2019 12:04:50 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Thu, 31 Jan 2019 15:38:48 +0530 |
Sushil khanchi |
compat: pass contexts to _findlimit() (issue6066)
stable
|
changeset |
files
|
Sun, 03 Feb 2019 08:10:48 +0100 |
Pierre-Yves David |
packaging: fix debian changelog
stable
|
changeset |
files
|
Wed, 30 Jan 2019 04:45:40 +0100 |
Pierre-Yves David |
changelog: add relevant entries
|
changeset |
files
|
Tue, 22 Jan 2019 18:40:10 +0530 |
Sushil khanchi |
evolve: add test for the case where public divergence on difference parents
|
changeset |
files
|
Mon, 21 Jan 2019 23:06:10 +0530 |
Sushil khanchi |
evolve: update the public divergence resolution logic to cover --continue case
|
changeset |
files
|
Mon, 21 Jan 2019 23:06:34 +0530 |
Sushil khanchi |
evolve: add logic to resolve content-divergence with a public cset
|
changeset |
files
|
Sun, 13 Jan 2019 19:33:19 +0530 |
Sushil khanchi |
evolve: introduce function to create a obsmarker relation even for public cset
|
changeset |
files
|
Tue, 29 Jan 2019 20:45:14 +0800 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#stack[1:2]'
|
changeset |
files
|
Mon, 28 Jan 2019 22:31:31 +0800 |
Anton Shestakov |
topic: simplify #stack index check/access
|
changeset |
files
|
Sun, 27 Jan 2019 17:39:09 +0800 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#topic[1:2]'
|
changeset |
files
|
Fri, 25 Jan 2019 16:51:36 +0530 |
Sushil khanchi |
evolve: add description of function solveobswdp
|
changeset |
files
|
Wed, 23 Jan 2019 12:11:36 -0800 |
Martin von Zweigbergk |
evolve: document the "if not shouldupdate" block
|
changeset |
files
|
Wed, 23 Jan 2019 11:55:20 -0800 |
Martin von Zweigbergk |
evolve: make "startnode" consistently be a node, not a context
|
changeset |
files
|
Tue, 22 Jan 2019 22:36:29 -0800 |
Martin von Zweigbergk |
evolve: use context managers for locks and transaction
|
changeset |
files
|
Tue, 22 Jan 2019 10:17:58 -0800 |
Martin von Zweigbergk |
prune: use scmutil.cleanupnodes()
|
changeset |
files
|
Tue, 22 Jan 2019 10:45:16 -0800 |
Martin von Zweigbergk |
uncommit: use scmtutil.cleanupnodes()
|
changeset |
files
|
Tue, 22 Jan 2019 10:33:02 -0800 |
Martin von Zweigbergk |
amend: use scmutil.cleanupnodes() with --patch
|
changeset |
files
|
Tue, 22 Jan 2019 10:32:44 -0800 |
Martin von Zweigbergk |
pick: use scmutil.cleanupnodes()
|
changeset |
files
|
Tue, 22 Jan 2019 09:45:25 -0800 |
Martin von Zweigbergk |
fold: use scmutil.cleanupnodes()
|
changeset |
files
|
Sat, 26 Jan 2019 23:58:18 +0800 |
Anton Shestakov |
revset: subscriptrelations functions now have two bounds
|
changeset |
files
|
Wed, 23 Jan 2019 15:49:44 -0500 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 23 Jan 2019 15:48:44 -0500 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
Wed, 23 Jan 2019 15:46:38 -0500 |
Pierre-Yves David |
Added tag 8.4.0 for changeset 8c4289d0e91e
stable
|
changeset |
files
|
Tue, 22 Jan 2019 20:25:36 -0500 |
Pierre-Yves David |
packaging: prepare release 8.4.0
stable 8.4.0
|
changeset |
files
|
Wed, 23 Jan 2019 09:05:12 -0500 |
Pierre-Yves David |
minitopic: add warning about extensions state and testing
stable
|
changeset |
files
|
Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Tue, 22 Jan 2019 12:55:09 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Tue, 22 Jan 2019 12:59:33 -0500 |
Pierre-Yves David |
branching: closing test-compat branch for mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Tue, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Tue, 22 Jan 2019 12:54:43 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
Tue, 22 Jan 2019 12:54:41 -0500 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 12:50:54 -0500 |
Pierre-Yves David |
changelog: explicit the part related to topic
stable
|
changeset |
files
|
Tue, 22 Jan 2019 10:46:02 -0500 |
Pierre-Yves David |
branching: merge with future version
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 10:43:44 -0500 |
Pierre-Yves David |
branching: start branch for test compat with Mercurial 4.8
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 10:45:09 -0500 |
Pierre-Yves David |
test-compat: reverse test change from 9bce7e6c18b3
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 10:44:49 -0500 |
Pierre-Yves David |
test-compat: reverse test change from db87432df8de
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 10:44:33 -0500 |
Pierre-Yves David |
test-compat: reverse test change from ac39cfb5bddd
mercurial-4.8
|
changeset |
files
|
Tue, 22 Jan 2019 10:41:53 -0500 |
Pierre-Yves David |
branching: merge stable into default prior to new version
stable
|
changeset |
files
|
Sat, 19 Jan 2019 21:41:15 +0100 |
Pierre-Yves David |
branching: merge wit stable
|
changeset |
files
|
Thu, 17 Jan 2019 12:37:40 +0100 |
Pierre-Yves David |
obsdiscovery: use consistent filtering during discovery
|
changeset |
files
|
Fri, 18 Jan 2019 23:09:44 +0530 |
Sushil khanchi |
evolve: make sure we don't stop after evolution of obsparent (issue5881)
|
changeset |
files
|
Fri, 18 Jan 2019 23:08:43 +0530 |
Sushil khanchi |
evolve: extract "update" code into its own function
|
changeset |
files
|
Tue, 25 Dec 2018 16:08:05 +0530 |
Sushil khanchi |
evolve: add test case for issue 5881
|
changeset |
files
|
Fri, 18 Jan 2019 13:54:30 +0530 |
Sushil khanchi |
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
|
changeset |
files
|
Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
changeset |
files
|
Thu, 17 Jan 2019 16:20:35 +0530 |
Sushil khanchi |
evolve: add test which shows orphan-merge resolution can result to crash
|
changeset |
files
|
Tue, 25 Dec 2018 10:10:12 +0530 |
Sushil khanchi |
next: populate stacktemplate to the missed _nextevolve function
|
changeset |
files
|
Mon, 14 Jan 2019 09:14:38 -0800 |
Martin von Zweigbergk |
evolve: adapt for deprecated ui.progress()
|
changeset |
files
|
Fri, 11 Jan 2019 09:26:41 -0800 |
Martin von Zweigbergk |
fold: sort concatenated commit messages in topological order
|
changeset |
files
|
Wed, 26 Dec 2018 14:52:07 +0800 |
Anton Shestakov |
topic: make revsets like 'foo#topic[0]' work
|
changeset |
files
|
Thu, 10 Jan 2019 17:30:01 +0100 |
Pierre-Yves David |
changelog: add an entry about the revset stack indexing
|
changeset |
files
|
Thu, 10 Jan 2019 17:36:59 +0100 |
Pierre-Yves David |
test: adapt output to minor behavior change
|
changeset |
files
|
Sun, 06 Jan 2019 00:27:54 +0800 |
Anton Shestakov |
tests: remove unused variable and needless subshell in testlib/pythonpath.sh
stable
|
changeset |
files
|
Sat, 05 Jan 2019 05:21:37 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Fri, 04 Jan 2019 19:17:38 -0500 |
Matt Harbison |
tests: conditionalize some output for Windows
stable
|
changeset |
files
|
Fri, 04 Jan 2019 18:49:53 -0500 |
Matt Harbison |
test-pyflakes: use '/' when printing the files to check
stable
|
changeset |
files
|
Fri, 04 Jan 2019 18:46:46 -0500 |
Matt Harbison |
tests: fix PYTHONPATH manipulation on Windows
stable
|
changeset |
files
|
Thu, 03 Jan 2019 00:01:54 -0500 |
Matt Harbison |
exthelper: update documentation with some examples for using registrar aliases
|
changeset |
files
|
Thu, 27 Dec 2018 23:46:35 -0500 |
Matt Harbison |
exthelper: simplify the ability to register filesets
|
changeset |
files
|
Thu, 27 Dec 2018 21:55:22 -0500 |
Matt Harbison |
exthelper: simplify the ability to register templates
|
changeset |
files
|
Thu, 27 Dec 2018 21:26:17 -0500 |
Matt Harbison |
exthelper: simplify the ability to register revsets
|
changeset |
files
|
Sun, 23 Dec 2018 21:54:56 -0500 |
Matt Harbison |
exthelper: support the option argument when registering a command
|
changeset |
files
|
Sat, 22 Dec 2018 22:26:36 -0500 |
Matt Harbison |
exthelper: simplify configitem registration
|
changeset |
files
|
Thu, 27 Dec 2018 21:26:17 -0500 |
Matt Harbison |
exthelper: avoid a [] default arg to wrapcommand()
|
changeset |
files
|
Fri, 04 Jan 2019 00:10:44 -0500 |
Matt Harbison |
configitems: move the default values to the registrar decorator
|
changeset |
files
|
Wed, 26 Dec 2018 22:14:23 +0800 |
Anton Shestakov |
topic: make revsets like foo#stack[-1] work too
|
changeset |
files
|
Sun, 16 Dec 2018 11:22:04 +0800 |
Anton Shestakov |
topic: make revsets like 'foo#stack[0]' work
|
changeset |
files
|
Sat, 22 Dec 2018 01:29:59 -0500 |
Matt Harbison |
exthelper: remove '_' in final_xxx() function names to conform to hg style
|
changeset |
files
|
Mon, 24 Dec 2018 18:38:25 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Mon, 24 Dec 2018 18:36:25 +0100 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
Mon, 24 Dec 2018 18:01:30 +0100 |
Pierre-Yves David |
Added tag 8.3.3 for changeset 97b18934d6db
stable
|
changeset |
files
|
Mon, 24 Dec 2018 17:55:25 +0100 |
Pierre-Yves David |
packaging: prepare version 8.3.3
stable 8.3.3
|
changeset |
files
|
Mon, 24 Dec 2018 17:47:40 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Mon, 24 Dec 2018 17:47:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Mon, 24 Dec 2018 17:47:29 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Mon, 24 Dec 2018 17:47:28 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Mon, 24 Dec 2018 17:47:27 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
Fri, 21 Dec 2018 13:14:59 +0800 |
Pierre-Yves David |
evolve: detect unresolved conflict during evolve --continue (issue5966)
stable
|
changeset |
files
|
Thu, 20 Dec 2018 13:59:07 +0800 |
Anton Shestakov |
tests: filter out uninteresting log events
|
changeset |
files
|
Fri, 21 Dec 2018 20:14:26 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Fri, 21 Dec 2018 20:14:23 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Fri, 21 Dec 2018 20:14:21 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Fri, 21 Dec 2018 20:14:20 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Fri, 21 Dec 2018 20:14:18 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
Fri, 21 Dec 2018 19:48:01 +0100 |
Pierre-Yves David |
linter: silence rightful complains about unused variable
stable
|
changeset |
files
|
Mon, 03 Dec 2018 14:41:03 +0800 |
Anton Shestakov |
topic: merge _showlasttouched logic into _listtopics
|
changeset |
files
|
Mon, 03 Dec 2018 14:15:00 +0800 |
Anton Shestakov |
topic: simplify _showlasttouched and _getlasttouched (and its data structure)
|
changeset |
files
|
Thu, 13 Dec 2018 18:57:49 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Thu, 13 Dec 2018 17:40:41 +0000 |
Boris Feld |
split: add a --interactive flag
|
changeset |
files
|
Wed, 21 Feb 2018 14:39:48 +0100 |
Boris Feld |
split: take file patterns to limit selection on matching file patterns
|
changeset |
files
|
Wed, 21 Feb 2018 12:39:17 +0100 |
Boris Feld |
split: only accept explicit revision through the `-r` option
|
changeset |
files
|
Thu, 13 Dec 2018 17:41:06 +0100 |
James Reynolds |
issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
stable
|
changeset |
files
|
Thu, 13 Dec 2018 17:26:26 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 12 Dec 2018 01:19:30 +0800 |
Anton Shestakov |
tests: add sparserevlog cap since hg now has sparse revlogs by default
|
changeset |
files
|
Wed, 12 Dec 2018 17:22:58 +0100 |
Pierre-Yves David |
split: rework the prompt to be more standard
|
changeset |
files
|
Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a option to discard remaining change during split
|
changeset |
files
|
Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a way to abort a split from the prompt
|
changeset |
files
|
Tue, 20 Feb 2018 09:36:55 +0100 |
Pierre-Yves David |
split: add a help entry to the final prompt
|
changeset |
files
|
Wed, 05 Dec 2018 23:15:29 +0800 |
Anton Shestakov |
topic: make revset argument messages be similar to such messages in core
stable
|
changeset |
files
|
Wed, 05 Dec 2018 23:13:26 +0800 |
Anton Shestakov |
tests: don't forget to add hg serve pid to DAEMON_PIDS in test-wireproto.t
stable
|
changeset |
files
|
Tue, 04 Dec 2018 13:33:51 +0100 |
Pierre-Yves David |
test: adapt to change output change on default
|
changeset |
files
|
Sat, 01 Dec 2018 16:08:42 +0800 |
Anton Shestakov |
safeguard: don't reimplement auto-publish if it's in core (will be in 4.9)
|
changeset |
files
|
Sat, 01 Dec 2018 16:07:55 +0800 |
Anton Shestakov |
safeguard: the new default for auto-publish is 'publish'
|
changeset |
files
|
Fri, 21 Sep 2018 11:44:34 -0400 |
James Reynolds |
stack: add a --children flag to stack
|
changeset |
files
|
Sun, 02 Dec 2018 16:52:14 +0100 |
Matt Harbison |
extensions: avoid shadowing imported module names with exthelper methods
|
changeset |
files
|
Fri, 30 Nov 2018 22:10:39 -0500 |
Matt Harbison |
extensions: add fileset support to exthelper
|
changeset |
files
|
Sun, 02 Dec 2018 16:48:05 +0100 |
Matt Harbison |
extensions: add uipopulate() support to exthelper
|
changeset |
files
|
Sun, 02 Dec 2018 16:45:08 +0100 |
Pierre-Yves David |
exthelper: clarify copyright and licence for the module
|
changeset |
files
|
Tue, 27 Nov 2018 04:46:35 +0100 |
Pierre-Yves David |
packaging: merge with version 8.3.2
|
changeset |
files
|
Tue, 27 Nov 2018 04:42:45 +0100 |
Pierre-Yves David |
packaging: mark development version
stable
|
changeset |
files
|
Tue, 27 Nov 2018 12:53:24 +0100 |
Pierre-Yves David |
Added tag 8.3.2 for changeset 7edc5c148df0
stable
|
changeset |
files
|
Tue, 27 Nov 2018 04:31:03 +0100 |
Pierre-Yves David |
packagin: prepare release 8.3.2
stable 8.3.2
|
changeset |
files
|
Tue, 27 Nov 2018 04:07:38 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Tue, 27 Nov 2018 04:07:36 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Tue, 27 Nov 2018 04:07:35 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Tue, 27 Nov 2018 04:07:33 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Tue, 27 Nov 2018 04:07:31 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
Tue, 27 Nov 2018 03:57:30 +0100 |
Pierre-Yves David |
changelog: add information about the topic message improvements
|
changeset |
files
|
Tue, 27 Nov 2018 03:56:27 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Tue, 27 Nov 2018 03:46:06 +0100 |
Sushil khanchi |
evolve: update the abort to a ProgrammingError
stable
|
changeset |
files
|
Mon, 26 Nov 2018 16:43:39 +0300 |
Pulkit Goyal |
topics: improve the message around topic changing
|
changeset |
files
|
Wed, 21 Nov 2018 11:13:21 +0000 |
Martijn Pieters |
tests: fix for POSIX compliance
|
changeset |
files
|
Wed, 21 Nov 2018 10:47:07 +0000 |
Martijn Pieters |
style: remove unused variables
|
changeset |
files
|
Tue, 20 Nov 2018 11:33:38 -0500 |
Eric Spishak-Thomas |
evolve: fix a documentation typo
stable
|
changeset |
files
|
Mon, 19 Nov 2018 02:34:39 +0000 |
Pierre-Yves David |
compat: drop 4.3 related obsfate code
|
changeset |
files
|
Mon, 19 Nov 2018 02:27:13 +0000 |
Pierre-Yves David |
compat: drop code dealing with incompatibility for --publish with 4.3
|
changeset |
files
|
Mon, 19 Nov 2018 02:25:37 +0000 |
Pierre-Yves David |
compat: clarify when some conditional are used
|
changeset |
files
|
Mon, 19 Nov 2018 02:20:44 +0000 |
Pierre-Yves David |
compat: drop 4.3 "new troubles" report code
|
changeset |
files
|
Mon, 19 Nov 2018 02:18:58 +0000 |
Pierre-Yves David |
compat: drop 4.3 wrapping of createmarker for effect flag support
|
changeset |
files
|
Mon, 19 Nov 2018 01:52:45 +0000 |
Pierre-Yves David |
compat: drop 4.3 monkey patch of `copies.mergecopies`
|
changeset |
files
|
Mon, 19 Nov 2018 01:45:34 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `obsutil.allprecursors` function
|
changeset |
files
|
Mon, 19 Nov 2018 01:44:28 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `ui.edit` method
|
changeset |
files
|
Mon, 19 Nov 2018 01:42:50 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for 'successors' revset
|
changeset |
files
|
Mon, 19 Nov 2018 01:41:36 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for 'precursors' revset
|
changeset |
files
|
Sat, 10 Nov 2018 23:54:46 -0500 |
Matt Harbison |
compat: drop Mercurial 4.3 support for exthelper
|
changeset |
files
|
Mon, 19 Nov 2018 01:49:34 +0000 |
Pierre-Yves David |
compat: update metadata about minimum ag version
|
changeset |
files
|
Tue, 06 Nov 2018 10:41:50 +0530 |
Sushil khanchi |
next: solve the issue of `next` get confused by split
|
changeset |
files
|
Tue, 06 Nov 2018 15:10:56 +0530 |
Sushil khanchi |
next: add test which shows that `next` get confused by split
|
changeset |
files
|
Wed, 31 Oct 2018 14:08:56 +0530 |
Sushil khanchi |
cleanup: avoid a Yoda condition
|
changeset |
files
|
Wed, 31 Oct 2018 14:06:17 +0530 |
Sushil khanchi |
evolve: modify and move the comment to appropriate position
|
changeset |
files
|
Wed, 31 Oct 2018 14:01:58 +0530 |
Sushil khanchi |
next: update the command description
|
changeset |
files
|
Sat, 10 Nov 2018 15:50:05 +0100 |
Sushil khanchi |
next: make next command --evolve by default
|
changeset |
files
|
Mon, 05 Nov 2018 19:56:33 +0800 |
Anton Shestakov |
safeguard: allow push to succeed (and without warning) with --publish
|
changeset |
files
|
Sun, 04 Nov 2018 22:06:23 +0800 |
Anton Shestakov |
topic: only add --publish flag to push if it's not already there
|
changeset |
files
|