| Sat, 13 Jul 2019 18:22:34 +0800 |
Anton Shestakov |
metaedit: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 18:07:03 +0800 |
Anton Shestakov |
fold: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 17:04:08 +0800 |
Anton Shestakov |
rewind: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Wed, 10 Jul 2019 18:16:38 +0800 |
Anton Shestakov |
touch: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: make `import hgext3rd.evolve` work
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for template keyword registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: convert _origdoc to sysstr to match __doc__
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for revset predicate registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for wireprotocol command registration
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use byte strings for @command registrations
|
changeset |
files
|
| Wed, 03 Jul 2019 11:13:47 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
changeset |
files
|
| Wed, 03 Jul 2019 11:37:29 -0700 |
Martin von Zweigbergk |
py3: make metadata values be byte strings as Mercurial expects
|
changeset |
files
|
| Tue, 09 Jul 2019 21:49:37 -0700 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Thu, 11 Jul 2019 10:07:39 +0200 |
Pierre-Yves David |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Tue, 09 Jul 2019 17:08:34 +0800 |
Anton Shestakov |
rewriteutil: allow rewriting merge commits (issue4561)
|
changeset |
files
|
| Tue, 09 Jul 2019 17:02:44 +0800 |
Anton Shestakov |
tests: show what happens when trying to hg touch a merge commit
|
changeset |
files
|
| Thu, 04 Jul 2019 17:32:58 +0200 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 22:46:58 +0530 |
Sushil khanchi |
touch: let's not use util.acceptintervention() as it's not required
|
changeset |
files
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 26 Jun 2019 21:11:25 +0530 |
Sushil khanchi |
evolve: use right value for branch name when finding branch heads
|
changeset |
files
|
| Tue, 25 Jun 2019 21:54:22 +0530 |
Sushil khanchi |
evolve: fix confusion in branch heads checking logic when topic in play
|
changeset |
files
|
| Sun, 14 Apr 2019 12:55:46 +0530 |
Sushil khanchi |
topic: add tests to demonstrate topic confuses the branchhead checking logic
|
changeset |
files
|
| Mon, 01 Jul 2019 19:15:57 +0530 |
Sushil khanchi |
evolve: fix the inconsistent behaviour of prune (issue6137)
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 21:00:46 +0530 |
Sushil khanchi |
prune: add tests to demonstrate issue6137
stable
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sat, 29 Jun 2019 18:21:57 +0800 |
Anton Shestakov |
prune: update to the successor of wdir also with --pair/--biject (issue6142)
stable
|
changeset |
files
|
| Sat, 22 Jun 2019 18:37:21 +0800 |
Anton Shestakov |
tests: demonstrate prune --pair not moving bookmark correctly
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 10:17:42 +0200 |
Pierre-Yves David |
oops: backed out changeset 7ac40b4ea24c
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
changeset |
files
|
| Sun, 09 Jun 2019 12:07:08 +0530 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
changeset |
files
|
| Sat, 15 Jun 2019 17:17:19 +0530 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
changeset |
files
|
| Fri, 14 Jun 2019 18:17:03 +0800 |
Anton Shestakov |
pick: register pickstate as an unfinished state
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:14:57 +0800 |
Anton Shestakov |
pick: rename variable for unfinishedstates
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:26:24 +0800 |
Anton Shestakov |
pick: actually delete pickstate if --abort is given
stable
|
changeset |
files
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
changeset |
files
|
| Sat, 22 Dec 2018 18:31:32 +0800 |
Anton Shestakov |
tests: demonstrate obsmarker creation after discarding conflicting changes
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 18:14:48 +0800 |
Anton Shestakov |
pick: remove transaction on the whole command (issue6037)
stable
|
changeset |
files
|
| Sun, 23 Dec 2018 01:02:36 +0800 |
Anton Shestakov |
tests: demonstrate hg pick forgetting files after conflicts
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:27:26 +0800 |
Anton Shestakov |
packaging: follow hg's supported python version (>= 2.7)
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:19:44 +0800 |
Anton Shestakov |
packaging: require hg 4.5 also for usage, not just for building
stable
|
changeset |
files
|
| Tue, 11 Jun 2019 10:04:11 +0200 |
Philippe Pepiot |
packaging: require mercurial >= 4.5
stable
|
changeset |
files
|
| Sat, 08 Jun 2019 16:03:05 +0530 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
changeset |
files
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
changeset |
files
|
| Sat, 27 Apr 2019 13:09:34 +0530 |
Sushil khanchi |
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
|
changeset |
files
|
| Sat, 08 Jun 2019 16:57:34 +0800 |
Anton Shestakov |
pick: reduce configoverride() scope
|
changeset |
files
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
changeset |
files
|
| Sat, 08 Jun 2019 16:06:24 +0800 |
Anton Shestakov |
evolve: internationalize a message
|
changeset |
files
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
changeset |
files
|
| Wed, 05 Jun 2019 17:56:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Wed, 05 Jun 2019 17:46:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Wed, 05 Jun 2019 17:45:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Wed, 05 Jun 2019 17:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Wed, 05 Jun 2019 17:39:32 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Wed, 05 Jun 2019 17:38:32 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 07 Jun 2019 02:25:02 +0200 |
Pierre-Yves David |
branching: merge with 9.0.0
|
changeset |
files
|
| Fri, 07 Jun 2019 02:24:08 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:22:05 +0200 |
Pierre-Yves David |
packaging: mark as development versions
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:15:50 +0200 |
Pierre-Yves David |
Added tag 9.0.0 for changeset 756db65030c6
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 14:24:19 +0200 |
Pierre-Yves David |
packaging: prepare release 9.0.0
stable 9.0.0
|
changeset |
files
|
| Thu, 06 Jun 2019 14:32:25 +0200 |
Pierre-Yves David |
doc: clarify the status of configuration of the obshashrange protocol
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 13:26:44 +0200 |
Pierre-Yves David |
changelog: add various missing bits
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 19:45:35 +0200 |
Pierre-Yves David |
templatekw: keep compatibility with Mercurial 4.5
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 17:21:45 +0200 |
Pierre-Yves David |
test: adjust output to stable branch
stable
|
changeset |
files
|
| Tue, 04 Jun 2019 11:08:44 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 01 Jun 2019 02:30:14 +0200 |
Joerg Sonnenberger |
templates: don't alias keywords directly
stable
|
changeset |
files
|
| Tue, 28 May 2019 16:46:18 +0800 |
Anton Shestakov |
stack: remove 'topic.' prefix from colors/labels
|
changeset |
files
|
| Sat, 18 May 2019 16:56:47 +0800 |
Anton Shestakov |
stack: handle hash sizes when --debug flag is provided
|
changeset |
files
|
| Fri, 17 May 2019 17:50:25 +0800 |
Anton Shestakov |
stack: always provide (full) node hash to non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:42:06 +0800 |
Anton Shestakov |
stack: remove unnecessary prefix from stack output with non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:59:58 +0800 |
Anton Shestakov |
stack: provide context to formatter with non-default --template
|
changeset |
files
|
| Sat, 11 May 2019 17:14:32 +0800 |
Anton Shestakov |
stack: leverage labelsgen() to produce all needed labels for fm.write()
|
changeset |
files
|
| Wed, 08 May 2019 16:00:34 +0800 |
Anton Shestakov |
stack: check if stack is empty more pythonically
|
changeset |
files
|
| Wed, 08 May 2019 15:57:54 +0800 |
Anton Shestakov |
stack: implement __bool__ and __nonzero__
|
changeset |
files
|
| Sun, 05 May 2019 17:39:46 +0800 |
Anton Shestakov |
stack: get stack data directly from stack and remove stackdata()
|
changeset |
files
|
| Sun, 05 May 2019 16:14:53 +0800 |
Anton Shestakov |
stack: use stack._revs instead of stack.revs[1:] in external children revset
|
changeset |
files
|
| Tue, 04 Jun 2019 10:30:56 +0200 |
Pierre-Yves David |
test: update output to match the parent changesets
|
changeset |
files
|
| Mon, 27 May 2019 03:42:35 +0200 |
Pierre-Yves David |
topic: add a simple option to reject publishing
|
changeset |
files
|
| Tue, 04 Jun 2019 10:07:08 +0200 |
Pierre-Yves David |
compat: adjust `wrapadd` for upstream
|
changeset |
files
|
| Sun, 05 May 2019 22:48:41 +0530 |
Faheem Mitha |
debian: override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
| Mon, 27 May 2019 02:19:48 +0200 |
Pierre-Yves David |
obshashtree: move obshashtree in its own module
|
changeset |
files
|
| Mon, 27 May 2019 01:53:36 +0200 |
Pierre-Yves David |
obsdiscovery: drop `obshash` discovery protocol (issue6136)
|
changeset |
files
|
| Thu, 09 May 2019 09:42:51 -0700 |
Martin von Zweigbergk |
cmdrewrite: use context manager for some locks and transactions
|
changeset |
files
|
| Mon, 29 Apr 2019 23:43:16 +0530 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
changeset |
files
|
| Mon, 13 May 2019 18:47:58 +0530 |
Sushil khanchi |
touch: use util.acceptintervention() for closing the transaction
|
changeset |
files
|
| Mon, 13 May 2019 18:45:00 +0530 |
Sushil khanchi |
touch: use context manager for locks
|
changeset |
files
|
| Mon, 13 May 2019 18:39:43 +0530 |
Sushil khanchi |
touch: extract the logic of touching rev's to its own function
|
changeset |
files
|
| Mon, 27 May 2019 02:42:11 +0200 |
Pierre-Yves David |
changelog: mention user merging in the changelog
|
changeset |
files
|
| Sun, 05 May 2019 18:24:59 +0530 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
changeset |
files
|
| Sun, 05 May 2019 18:24:50 +0530 |
Sushil khanchi |
evolve: add tests for the case when div csets has different users
|
changeset |
files
|
| Fri, 03 May 2019 01:23:12 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
changeset |
files
|
| Fri, 03 May 2019 03:52:44 +0530 |
Faheem Mitha |
debian: Override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
| Fri, 03 May 2019 03:44:48 +0530 |
Faheem Mitha |
docs: add SPHINXBUILD make variable
stable
|
changeset |
files
|
| Sat, 27 Apr 2019 20:56:37 +0530 |
Sushil khanchi |
topic: add test to increase code coverage in case of multiple topics
stable
|
changeset |
files
|
| Sat, 27 Apr 2019 17:11:12 +0800 |
Anton Shestakov |
changelog: --no-update is the default, recommend --update instead
|
changeset |
files
|
| Sat, 27 Apr 2019 01:18:08 +0300 |
Pulkit Goyal |
topic: drop support for accessing csets in branch stack using bxx (issue6119)
|
changeset |
files
|
| Mon, 29 Apr 2019 23:16:29 -0400 |
Matt Harbison |
legacy: drop the check for `obsolete._enabled`
stable
|
changeset |
files
|
| Sun, 28 Apr 2019 00:21:28 -0400 |
Matt Harbison |
docs: drop references to the old temporary commit that was created with amend
|
changeset |
files
|
| Sat, 27 Apr 2019 22:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
changeset |
files
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
changeset |
files
|
| Sat, 27 Apr 2019 22:33:16 -0400 |
Matt Harbison |
revset: add `predecessor` aliases for `precursors` and `allprecursors`
|
changeset |
files
|
| Sat, 27 Apr 2019 22:24:30 -0400 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:54:52 -0400 |
Matt Harbison |
docs: change `bumped` references to `phase-divergent`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:41:04 -0400 |
Matt Harbison |
docs: change `divergent` references to `content-divergent`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:27:54 -0400 |
Matt Harbison |
docs: change `troubled` references to `unstable`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:24:18 -0400 |
Matt Harbison |
docs: change `unstable` references to `orphan`
|
changeset |
files
|
| Sat, 27 Apr 2019 21:09:47 -0400 |
Matt Harbison |
doc: correct a typo
|
changeset |
files
|
| Sat, 27 Apr 2019 19:42:42 -0400 |
Matt Harbison |
docs: change `troubles` references to `instability`
|
changeset |
files
|
| Sat, 27 Apr 2019 19:32:03 -0400 |
Matt Harbison |
docs: change `precursors` references to `predecessors`
|
changeset |
files
|
| Sat, 27 Apr 2019 14:42:48 -0400 |
Matt Harbison |
docs: import figure diagrams with inkscape 0.92
|
changeset |
files
|
| Thu, 25 Apr 2019 15:14:21 -0700 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
changeset |
files
|
| Thu, 25 Apr 2019 13:58:29 -0700 |
Martin von Zweigbergk |
evolve: move more of the progress-related variables together
|
changeset |
files
|
| Thu, 25 Apr 2019 14:02:11 -0700 |
Martin von Zweigbergk |
evolve: delete dead calculation of number of troubled revisions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:23:53 -0700 |
Martin von Zweigbergk |
evolve: drop nested locks and transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 11:12:00 -0700 |
Martin von Zweigbergk |
next: start transaction before calling _solveone()
|
changeset |
files
|
| Fri, 19 Apr 2019 10:22:25 -0700 |
Martin von Zweigbergk |
evolve: use single transaction also when continuing
|
changeset |
files
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
changeset |
files
|
| Fri, 19 Apr 2019 10:01:32 -0700 |
Martin von Zweigbergk |
evolve: extract function for solving one revision, including merges
|
changeset |
files
|
| Thu, 25 Apr 2019 17:20:32 +0800 |
Anton Shestakov |
evolve: mention that --all is the default behavior now
|
changeset |
files
|