| 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
|
| Thu, 25 Apr 2019 17:19:41 +0800 |
Anton Shestakov |
evolve: mention that not all successful operations currently update wdir
|
changeset |
files
|
| Tue, 23 Apr 2019 11:07:28 -0700 |
Martin von Zweigbergk |
evolve: add progress support for --continue
|
changeset |
files
|
| Tue, 23 Apr 2019 10:56:42 -0700 |
Martin von Zweigbergk |
evolve: reduce scope of progress-related variables
|
changeset |
files
|
| Tue, 23 Apr 2019 10:49:47 -0700 |
Martin von Zweigbergk |
evolve: move progress-clearing out of _cleanup()
|
changeset |
files
|
| Tue, 23 Apr 2019 10:52:33 -0700 |
Martin von Zweigbergk |
evolve: stop passing no-op "progresscb" into continueevolve()
|
changeset |
files
|
| Tue, 23 Apr 2019 09:45:45 -0700 |
Martin von Zweigbergk |
evolve: _solveunstable() update progress only once
|
changeset |
files
|
| Tue, 23 Apr 2019 09:35:34 -0700 |
Martin von Zweigbergk |
evolve: don't update progress just before clearing it
|
changeset |
files
|
| Tue, 23 Apr 2019 09:31:32 -0700 |
Martin von Zweigbergk |
evolve: clean up progress bar also when using -r
|
changeset |
files
|
| Tue, 23 Apr 2019 10:20:03 -0700 |
Martin von Zweigbergk |
tests: add some basic testing of progress
|
changeset |
files
|
| Fri, 19 Apr 2019 10:03:39 -0700 |
Martin von Zweigbergk |
evolve: increment progress *after* a whole merge commit is done
|
changeset |
files
|
| Fri, 19 Apr 2019 11:02:35 -0700 |
Martin von Zweigbergk |
evolve: use util.acceptintervention() for closing transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:32:32 -0700 |
Martin von Zweigbergk |
evolve: use context manager for transactions
|
changeset |
files
|
| Fri, 19 Apr 2019 10:52:16 -0700 |
Martin von Zweigbergk |
evolve: use consistent message and just re-raise InterventionRequired
|
changeset |
files
|
| Fri, 19 Apr 2019 10:47:12 -0700 |
Martin von Zweigbergk |
evolve: use standard InterventionRequired instead of MergeFailure
|
changeset |
files
|
| Fri, 19 Apr 2019 10:41:56 -0700 |
Martin von Zweigbergk |
evolve: don't use exception for local flow control
|
changeset |
files
|
| Tue, 23 Apr 2019 11:02:08 -0700 |
Martin von Zweigbergk |
evolve: reduce indentation with an early return statement
|
changeset |
files
|
| Tue, 23 Apr 2019 11:01:44 -0700 |
Martin von Zweigbergk |
evolve: remove a useless return statement at end of function
|
changeset |
files
|
| Sun, 21 Apr 2019 13:04:40 +0530 |
Sushil khanchi |
test: move a test to an appropriate test file
|
changeset |
files
|
| Sun, 21 Apr 2019 12:07:26 +0530 |
Sushil khanchi |
test: improve the title of a test
|
changeset |
files
|
| Sun, 21 Apr 2019 12:06:31 +0530 |
Sushil khanchi |
test: remove duplicated test
|
changeset |
files
|
| Sat, 09 Mar 2019 19:35:45 +0530 |
Sushil khanchi |
evolve: warn user for the metadata being lost in public divergence resolution
|
changeset |
files
|
| Wed, 17 Apr 2019 21:16:17 +0530 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
changeset |
files
|
| Wed, 24 Apr 2019 20:32:01 +0200 |
Pierre-Yves David |
test: use a shorter test name
|
changeset |
files
|
| Wed, 10 Apr 2019 18:20:33 +0800 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
changeset |
files
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
changeset |
files
|
| Wed, 24 Apr 2019 17:02:27 +0800 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 16:35:01 +0800 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
changeset |
files
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
changeset |
files
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 15:57:49 +0200 |
Anton Shestakov |
tests: don't create a nested repo for no reason
|
changeset |
files
|
| Wed, 24 Apr 2019 14:38:26 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:57:04 +0200 |
Pierre-Yves David |
Added tag 8.5.1 for changeset 05c9dcf5512e
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:30:39 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:08 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 22 Apr 2019 22:14:26 -0700 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
changeset |
files
|
| Sat, 20 Apr 2019 05:21:14 +0200 |
Pierre-Yves David |
packaging: mark extensions as tested with 5.0
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 13:26:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:48 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:47 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 12:24:22 +0200 |
Pierre-Yves David |
compat: drop support for Mercurial 4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:42 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Tue, 23 Apr 2019 12:20:12 +0200 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:07 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:04 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 19 Apr 2019 10:31:53 +0530 |
Sushil khanchi |
compat: fix a typo in compat patch
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 23:51:13 +0200 |
Pierre-Yves David |
changelog: mention extensions isolation (issue6121)
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:03:01 +0200 |
Pierre-Yves David |
topic: only wrap wireprotocaps for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:52 +0200 |
Pierre-Yves David |
topic: only wrap _pushb2phases for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:44 +0200 |
Pierre-Yves David |
topic: only wrap handlecheckheads for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:06 +0200 |
Pierre-Yves David |
topic: only wrap wireprotobranchmap for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:01:39 +0200 |
Pierre-Yves David |
topic: only wrap _headssummary for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:41:41 +0200 |
Pierre-Yves David |
topic: only wrap desthistedit for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:40:53 +0200 |
Pierre-Yves David |
topic: only wrap _destupdatetopic for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:39:41 +0200 |
Pierre-Yves David |
topic: only wrap _destmergebranch for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:36:11 +0200 |
Pierre-Yves David |
topic: only wrap gettopicrepo for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:49 +0200 |
Pierre-Yves David |
topic: only wrap mergeupdate for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:39 +0200 |
Pierre-Yves David |
topic: only wrap committext for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:24 +0200 |
Pierre-Yves David |
topic: only affect `hg commit` behavior for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:14 +0200 |
Pierre-Yves David |
topic: only wrap workingctx.__init__ for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:12:58 +0200 |
Pierre-Yves David |
topic: introduce a `hastopicext(repo)` function
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 00:20:44 +0530 |
Sushil khanchi |
tests: consolidate the public-content-divergent test cases
|
changeset |
files
|
| Wed, 17 Apr 2019 12:31:17 +0530 |
Sushil khanchi |
evolve: improve inline documentation for the public divergence resolution
|
changeset |
files
|
| Sun, 14 Apr 2019 20:26:05 +0530 |
Sushil khanchi |
cleanup: remove a duplicated line
|
changeset |
files
|
| Wed, 17 Apr 2019 21:39:28 +0200 |
Pierre-Yves David |
changelog: mention topic compatibility
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:58:10 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Wed, 17 Apr 2019 20:56:24 +0200 |
Pierre-Yves David |
tescompat: revert test change for mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 20:54:28 +0200 |
Pierre-Yves David |
branching: merge 8.5.0 expected output in stable
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:52:15 +0200 |
Pierre-Yves David |
testcompat: open a branch dedicated to mercurial 4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 18:46:41 +0800 |
Anton Shestakov |
topic: add compatibility for writing copy metadata in changelog.add()
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 16:18:22 +0800 |
Anton Shestakov |
serverminitopic: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:21:09 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 12 Apr 2019 02:20:24 +0200 |
Pierre-Yves David |
packaging: mark version as development version
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:17:03 +0200 |
Pierre-Yves David |
Added tag 8.5.0 for changeset 33c617626fd9
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:15:24 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.0
stable 8.5.0
|
changeset |
files
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 12 Apr 2019 02:07:53 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:25 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:06 +0200 |
Pierre-Yves David |
changelog: merge 8.4.1 and 8.5.1 entries
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:43:37 +0200 |
Pierre-Yves David |
branching: merge stable into default
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:12:09 +0200 |
Pierre-Yves David |
branching: merge default change into stable
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 22:13:55 +0200 |
Pierre-Yves David |
branching: merge default branch in stable to prepare 8.5.0 release
stable
|
changeset |
files
|
| Tue, 02 Apr 2019 22:42:01 -0400 |
Matt Harbison |
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
|
changeset |
files
|
| Thu, 11 Apr 2019 17:45:36 +0800 |
Anton Shestakov |
evolve: store --update flag state in evolvestate file
|
changeset |
files
|
| Fri, 12 Apr 2019 02:55:34 +0800 |
Anton Shestakov |
state: implement cmdstate.__contains__()
|
changeset |
files
|
| Thu, 11 Apr 2019 21:19:01 +0200 |
Pierre-Yves David |
changelog: mention Martin work on phase-divergence
|
changeset |
files
|
| Thu, 11 Apr 2019 21:09:31 +0200 |
Pierre-Yves David |
test: revert update from 5.0 record logic
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 17:42:48 +0800 |
Anton Shestakov |
tests: remove note about already implemented --confirm with --continue
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 23:19:29 +0530 |
Sushil khanchi |
evolve: compat patch for recordfilter change in mercurial
|
changeset |
files
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:24:55 +0200 |
Pierre-Yves David |
test: rename test about content divergent meta data
|
changeset |
files
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
changeset |
files
|
| Wed, 10 Apr 2019 20:03:07 +0200 |
Pierre-Yves David |
test: remove remaining duplicated file
|
changeset |
files
|
| Wed, 10 Apr 2019 17:57:11 +0200 |
Pierre-Yves David |
test: add test for content-divergence with file removal
|
changeset |
files
|
| Wed, 10 Apr 2019 17:29:40 +0200 |
Pierre-Yves David |
test: clarify changeset concent in the first content-divergence test
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:28 +0200 |
Pierre-Yves David |
branching: merge with test consolidation
|
changeset |
files
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sun, 07 Apr 2019 20:00:16 +0200 |
Joerg Sonnenberger |
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
|
changeset |
files
|
| Sun, 07 Apr 2019 19:53:53 +0200 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
changeset |
files
|
| Wed, 10 Apr 2019 16:11:59 +0200 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
changeset |
files
|
| Sat, 23 Feb 2019 15:17:55 +0100 |
Manuel Jacob |
pick: update working dir branch (issue6089)
stable
|
changeset |
files
|
| 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
|
| Mon, 05 Nov 2018 16:04:01 +0800 |
Anton Shestakov |
safeguard: check auto-publish value before sending listkeys command
|
changeset |
files
|
| Sat, 10 Nov 2018 17:54:28 +0100 |
Pierre-Yves David |
style: silence another flak8 warning
|
changeset |
files
|
| Sat, 10 Nov 2018 16:11:19 +0100 |
Pierre-Yves David |
oops: backed out changeset df22f010cf24 pushed by error
|
changeset |
files
|
| Sat, 10 Nov 2018 15:50:05 +0100 |
Sushil khanchi |
next: make next command --evolve by default
|
changeset |
files
|
| Sat, 10 Nov 2018 16:05:34 +0100 |
Pierre-Yves David |
next: improve the message for dirty working copy with --evolve
|
changeset |
files
|
| Sat, 10 Nov 2018 16:01:31 +0100 |
Pierre-Yves David |
next: use the `hint` argument of bail if changed
|
changeset |
files
|
| Sat, 10 Nov 2018 15:59:16 +0100 |
Pierre-Yves David |
prev: use the `hint` argument of bail if changed
|
changeset |
files
|
| Sat, 10 Nov 2018 15:28:44 +0100 |
Pierre-Yves David |
next: explicitly specify --no-evolve in the tests
|
changeset |
files
|
| Sat, 10 Nov 2018 15:47:46 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 10 Nov 2018 15:37:22 +0100 |
Pierre-Yves David |
style: fix various flake8 warning
stable
|
changeset |
files
|
| Sat, 10 Nov 2018 15:30:10 +0100 |
Sushil khanchi |
next: set if we need to evolve or not; also move logic to appropriate pos
|
changeset |
files
|
| Tue, 06 Nov 2018 11:22:39 +0530 |
Sushil khanchi |
next: move some code to prepare for `next --evolve` by default
|
changeset |
files
|
| Sat, 10 Nov 2018 00:55:34 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 06 Nov 2018 15:53:18 +0530 |
Sushil khanchi |
topic: improve UX by using pager only when we should
stable
|
changeset |
files
|
| Tue, 06 Nov 2018 10:43:35 +0530 |
Sushil khanchi |
evolvecmd: _possibledestination() skip visiting empty parent
stable
|
changeset |
files
|
| Sat, 03 Nov 2018 12:21:19 +0530 |
Sushil khanchi |
pick: `hg help` was not showing the full cmd desc of `pick`
stable
|
changeset |
files
|
| Fri, 09 Nov 2018 20:19:01 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 09 Nov 2018 20:18:59 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 09 Nov 2018 20:18:58 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 09 Nov 2018 20:18:57 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Fri, 09 Nov 2018 20:18:55 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Wed, 07 Nov 2018 19:35:48 +0100 |
Boris Feld |
compat: fix fixedcopytracing compatibility with mercurial 4.8 and narrow
stable
|
changeset |
files
|
| Thu, 01 Nov 2018 21:33:15 +0300 |
Pulkit Goyal |
utility: don't translate commit messages in revselection prompt (issue6016)
stable
|
changeset |
files
|
| Fri, 26 Oct 2018 12:54:40 +0530 |
Sushil khanchi |
evolve: use stack template in --continue case also
|
changeset |
files
|
| Wed, 24 Oct 2018 19:38:02 +0530 |
Sushil khanchi |
evolve: add test showing currently stackalias fails in --continue case
|
changeset |
files
|
| Thu, 25 Oct 2018 18:51:55 +0200 |
Pierre-Yves David |
branching; merge with stable
|
changeset |
files
|
| Thu, 25 Oct 2018 18:50:42 +0200 |
Pierre-Yves David |
packaging: mark version as devel version
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 18:44:07 +0200 |
Pierre-Yves David |
Added tag 8.3.1 for changeset b90422a11a88
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 18:42:49 +0200 |
Pierre-Yves David |
packaging: prepare version 8.3.1
stable 8.3.1
|
changeset |
files
|
| Thu, 25 Oct 2018 18:32:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Thu, 25 Oct 2018 18:32:52 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Thu, 25 Oct 2018 18:32:51 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 25 Oct 2018 18:32:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 25 Oct 2018 18:32:49 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 25 Oct 2018 18:09:08 +0200 |
Pierre-Yves David |
evolve: do not try to display stack index of changeset who do not have one
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 18:08:34 +0200 |
Pierre-Yves David |
evolve: check if we should use stack template for each item in the stack
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 17:03:34 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Thu, 25 Oct 2018 16:33:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Thu, 25 Oct 2018 13:05:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Thu, 25 Oct 2018 13:04:08 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 25 Oct 2018 13:03:30 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 25 Oct 2018 13:03:03 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 25 Oct 2018 13:24:34 +0200 |
Pierre-Yves David |
branching: revert test outptu change for 4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 25 Oct 2018 10:01:58 +0200 |
Pierre-Yves David |
pullbundle: drop erroneous flagging of the command as basic
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:55:37 +0200 |
Pierre-Yves David |
test-compat: backed out changeset ba1e83c841f2
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:55:22 +0200 |
Pierre-Yves David |
test-compat: backed out changeset b0084d599112
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:55:12 +0200 |
Pierre-Yves David |
test-compat: backed out changeset e2d083cc447e
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:53:48 +0200 |
Pierre-Yves David |
test-compat: backed out changeset ccbfbeee6cf3
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:53:09 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 7091f7215651
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:52:34 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 8eec9422bd8e
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 12:49:48 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Thu, 25 Oct 2018 12:41:16 +0200 |
Pierre-Yves David |
branching: start test compatibility branch for Mercurial 4.7
mercurial-4.7
|
changeset |
files
|
| Sun, 21 Oct 2018 00:08:27 +0300 |
Pulkit Goyal |
topic: add the changelog argument to branchinfo()
stable
|
changeset |
files
|
| Thu, 18 Oct 2018 22:11:43 -0700 |
Martin von Zweigbergk |
evolve: adapt for changed @command decorator
stable
|
changeset |
files
|
| Wed, 17 Oct 2018 14:47:38 +0200 |
Pierre-Yves David |
topicidx: stop assigning index number to obsolete changesets
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 11:32:43 +0200 |
Pierre-Yves David |
stack-index: add some test featuring content diversion
stable
|
changeset |
files
|
| Thu, 25 Oct 2018 10:01:58 +0200 |
Pierre-Yves David |
pullbundle: drop erroneous flagging of the command as basic
|
changeset |
files
|
| Sun, 21 Oct 2018 00:08:27 +0300 |
Pulkit Goyal |
topic: add the changelog argument to branchinfo()
|
changeset |
files
|
| Fri, 19 Oct 2018 09:02:35 -0700 |
Martin von Zweigbergk |
topics: "prairie" is a not an animal (AFAIK, anyway)
|
changeset |
files
|
| Thu, 18 Oct 2018 21:59:24 -0700 |
Martin von Zweigbergk |
tests: remove a"| head -n 2" that just hides an error code
|
changeset |
files
|
| Thu, 18 Oct 2018 22:11:43 -0700 |
Martin von Zweigbergk |
evolve: adapt for changed @command decorator
|
changeset |
files
|
| Wed, 17 Oct 2018 23:10:30 +0800 |
Anton Shestakov |
commands: adjust metavariables as appropriate
|
changeset |
files
|
| Wed, 17 Oct 2018 14:02:18 +0200 |
Pierre-Yves David |
branching: merge with default
|
changeset |
files
|
| Wed, 17 Oct 2018 13:44:06 +0200 |
Pierre-Yves David |
branching: preserve the expected output on default
|
changeset |
files
|
| Sun, 14 Oct 2018 13:37:11 +0200 |
Anton Shestakov |
evolvecmd: use modern vocabulary in help text for evolve
stable
|
changeset |
files
|
| Sun, 14 Oct 2018 13:35:13 +0200 |
Anton Shestakov |
evolvecmd: mark flags with old instability names as deprecated
stable
|
changeset |
files
|
| Wed, 17 Oct 2018 13:36:08 +0200 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 16:31:20 +0200 |
Pierre-Yves David |
Added tag 8.3.0 for changeset 45d4b49d81d9
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 16:19:39 +0200 |
Pierre-Yves David |
packaging: prepare release 8.3.0
stable 8.3.0
|
changeset |
files
|
| Fri, 12 Oct 2018 16:25:06 +0200 |
Pierre-Yves David |
pullbundle: document working version and update changelog to mention it
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 15:20:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 12 Oct 2018 15:15:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 12 Oct 2018 15:15:07 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 12 Oct 2018 15:15:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Fri, 12 Oct 2018 15:37:22 +0200 |
Pierre-Yves David |
topic: fix '{topicidx}' keyword registration for mercurial <= 4.5
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 15:03:29 +0200 |
Pierre-Yves David |
branching: prepare release 8.3.0
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 15:07:23 +0200 |
Pierre-Yves David |
test: other harmless output change
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 15:02:51 +0200 |
Pierre-Yves David |
changelog: mention the fix of cache warming on hg strip
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:56:00 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset 6f391c2a773b
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:55:46 +0200 |
Pierre-Yves David |
test: backed out test output changes from changeset ef22eef37ecc
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:55:37 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset 0171a7ceb574
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:55:27 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset dfa69b5ece87
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:55:20 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset 01ad46551d7c
stable
|
changeset |
files
|
| Fri, 12 Oct 2018 14:40:03 +0200 |
Pierre-Yves David |
prev: also use stack shortcut in output when possible
|
changeset |
files
|
| Fri, 12 Oct 2018 14:33:03 +0200 |
Pierre-Yves David |
next: also use stack shortcut in output when possible
|
changeset |
files
|
| Fri, 12 Oct 2018 11:33:30 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 12 Oct 2018 02:12:23 +0300 |
Pulkit Goyal |
rewind: alias the command to undo
|
changeset |
files
|
| Fri, 12 Oct 2018 01:23:16 +0200 |
Pierre-Yves David |
changelog: add a line about the usage of s# in evolve
|
changeset |
files
|
| Thu, 11 Oct 2018 13:38:38 +0200 |
Pierre-Yves David |
caches: no longer warm the cache on strip in "auto" mode
stable
|
changeset |
files
|
| Tue, 02 Oct 2018 12:55:29 +0530 |
Sushil khanchi |
evolve: use stack alias s# in `hg evolve` msgs
|
changeset |
files
|
| Mon, 01 Oct 2018 19:59:17 +0530 |
Sushil khanchi |
evolve: extract displayer to _solveone()
|
changeset |
files
|
| Mon, 01 Oct 2018 13:20:30 +0530 |
Sushil khanchi |
utility: add a template alias that will be used in evolve msgs
|
changeset |
files
|
| Mon, 01 Oct 2018 12:37:42 +0530 |
Sushil khanchi |
topic: add topicidx template keyword
|
changeset |
files
|
| Tue, 09 Oct 2018 15:14:32 +0200 |
Pierre-Yves David |
changelog: fix version number
|
changeset |
files
|
| Tue, 02 Oct 2018 20:38:37 +0300 |
Pulkit Goyal |
tests: update the test-topic.t with changes in core mercurial
|
changeset |
files
|
| Wed, 26 Sep 2018 19:17:04 +0200 |
Pierre-Yves David |
pullbundle: fix style warning
|
changeset |
files
|
| Wed, 26 Sep 2018 18:41:55 +0200 |
Pierre-Yves David |
pullbundle: improves management of multiple branch while dealing with a head
|
changeset |
files
|
| Wed, 26 Sep 2018 18:42:44 +0200 |
Pierre-Yves David |
pullbundle: deal with head in a predicable order
|
changeset |
files
|
| Wed, 26 Sep 2018 17:17:11 +0200 |
Pierre-Yves David |
pullbundle: deal with another special case introduced by arbitrary ranges
|
changeset |
files
|
| Wed, 26 Sep 2018 13:15:40 +0200 |
Pierre-Yves David |
pullbundle: compat with Mercurial 4.7
|
changeset |
files
|
| Tue, 25 Sep 2018 19:35:33 +0200 |
Pierre-Yves David |
pullbundle: add some information on the cached change
|
changeset |
files
|
| Tue, 25 Sep 2018 18:41:51 +0200 |
Pierre-Yves David |
pullbundle: add data about the cached bundle size and hit
|
changeset |
files
|
| Tue, 25 Sep 2018 18:23:46 +0200 |
Pierre-Yves David |
pullbundle: add a command to generate cache hit statistic
|
changeset |
files
|
| Tue, 25 Sep 2018 13:44:32 +0200 |
Pierre-Yves David |
pullbundle: point out the output flooding issue from core
|
changeset |
files
|
| Tue, 25 Sep 2018 13:29:49 +0200 |
Pierre-Yves David |
pullbundle: issue local branches in the right order
|
changeset |
files
|
| Tue, 25 Sep 2018 12:53:34 +0200 |
Pierre-Yves David |
pullbundle: delay cache file opening
|
changeset |
files
|
| Tue, 25 Sep 2018 12:20:26 +0200 |
Pierre-Yves David |
pullbundle: improve slicing of the lower part of range
|
changeset |
files
|
| Tue, 25 Sep 2018 12:19:41 +0200 |
Pierre-Yves David |
stablerange: fix slicing of arbitrary ranges
|
changeset |
files
|
| Mon, 24 Sep 2018 01:16:00 +0200 |
Pierre-Yves David |
pullbundle: attempt to save stablerange cache after each computation
|
changeset |
files
|
| Mon, 24 Sep 2018 00:51:39 +0200 |
Pierre-Yves David |
pullbundle: add basic extension metadata
|
changeset |
files
|
| Mon, 24 Sep 2018 00:28:10 +0200 |
Pierre-Yves David |
pullbundle: add a config option for the cache directory
|
changeset |
files
|
| Sun, 23 Sep 2018 22:58:11 +0200 |
Pierre-Yves David |
pullbundle: add an output about the time spent slicing the set
|
changeset |
files
|
| Sun, 23 Sep 2018 22:45:23 +0200 |
Pierre-Yves David |
pullbundle: add extension documentation
|
changeset |
files
|
| Sun, 23 Sep 2018 23:46:49 +0200 |
Pierre-Yves David |
pullbundle: add an extra test showing how cache are reusable
|
changeset |
files
|
| Sun, 23 Sep 2018 00:08:02 +0200 |
Pierre-Yves David |
pullbundle: add caching logic
|
changeset |
files
|
| Sun, 23 Sep 2018 23:41:08 +0200 |
Pierre-Yves David |
pullbundle: slice pull into multiple ranges
|
changeset |
files
|
| Sun, 23 Sep 2018 23:53:23 +0200 |
Pierre-Yves David |
pullbundle: initial commit
|
changeset |
files
|
| Fri, 21 Sep 2018 20:02:03 +0200 |
Pierre-Yves David |
test: update output to make streamv2 capabilities
|
changeset |
files
|
| Fri, 21 Sep 2018 18:33:55 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 22 Sep 2018 13:09:06 +0200 |
Pierre-Yves David |
topic: respect preexisting 'topic' value on workingcommitctx
stable
|
changeset |
files
|
| Fri, 21 Sep 2018 19:49:28 +0200 |
Pierre-Yves David |
topic: add a compatibility to access transaction's names
stable
|
changeset |
files
|
| Fri, 21 Sep 2018 17:50:28 +0200 |
Pierre-Yves David |
topic: add a compatibility to access transaction's validator
stable
|
changeset |
files
|
| Fri, 21 Sep 2018 15:52:53 +0530 |
Sushil khanchi |
evovle: remove redundancy in evolve output
|
changeset |
files
|
| Fri, 21 Sep 2018 11:58:42 +0200 |
Pierre-Yves David |
amend: handle crash before transaction initialization with --patch
stable
|
changeset |
files
|
| Tue, 18 Sep 2018 02:14:10 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 17 Sep 2018 09:25:28 -0700 |
Gregory Szorc |
obsdiscovery: adopt to calling convention change
stable
|
changeset |
files
|
| Fri, 14 Sep 2018 12:21:32 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 14 Sep 2018 12:18:22 +0200 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Fri, 14 Sep 2018 12:17:21 +0200 |
Pierre-Yves David |
Added tag 8.2.1 for changeset c6362c4abd69
stable
|
changeset |
files
|
| Fri, 14 Sep 2018 12:17:06 +0200 |
Pierre-Yves David |
packagin: prepare release 8.2.1
stable 8.2.1
|
changeset |
files
|
| Fri, 14 Sep 2018 10:51:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 14 Sep 2018 10:51:43 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 14 Sep 2018 10:51:42 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 14 Sep 2018 10:51:40 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Fri, 14 Sep 2018 10:47:57 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 14 Sep 2018 10:39:01 +0200 |
Pierre-Yves David |
caches: issue both debug and blackbox log message
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 00:04:17 +0800 |
Anton Shestakov |
cmdrewrite: rename variable and move it closer to where it is used
|
changeset |
files
|
| Thu, 13 Sep 2018 19:46:05 +0200 |
Pierre-Yves David |
changelog: mention the cache improvements
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 17:09:44 +0200 |
Pierre-Yves David |
obshashrangecache: be more paranoid in the errors we catch
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 17:09:34 +0200 |
Pierre-Yves David |
stablerangecache: be more paranoid in the errors we catch
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 19:22:03 +0200 |
Pierre-Yves David |
stablesortcache: update the variable tracking on-disk state after write
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 19:22:39 +0200 |
Pierre-Yves David |
stablesortcache: ignore permission and OS errors when writing
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 19:09:48 +0200 |
Pierre-Yves David |
firstmergecache: update the variable tracking on-disk state after write
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 17:08:18 +0200 |
Pierre-Yves David |
firstmergecache: ignore permission and OS errors when writing
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 18:56:04 +0200 |
Pierre-Yves David |
depthcache: update the variable tracking on disk state after write
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 17:08:05 +0200 |
Pierre-Yves David |
depthcache: ignore permission and OS errors when writing
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 18:20:50 +0200 |
Pierre-Yves David |
obscache: update the variable tracking on disk state after write
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 18:21:07 +0200 |
Pierre-Yves David |
obscache: ignore permission and OS errors when writing
stable
|
changeset |
files
|
| Thu, 13 Sep 2018 02:49:58 +0200 |
Pierre-Yves David |
obshashrange: force reset if many changes
stable
|
changeset |
files
|
| Tue, 04 Sep 2018 19:30:19 +0800 |
Anton Shestakov |
topic: refactor revset.py slightly
|
changeset |
files
|
| Wed, 12 Sep 2018 12:02:17 +0200 |
Pierre-Yves David |
test: update output to match new `hg verify` reports
|
changeset |
files
|
| Wed, 12 Sep 2018 11:53:41 +0200 |
Pierre-Yves David |
test: update output to match new "pull" phase report
|
changeset |
files
|
| Wed, 12 Sep 2018 10:37:14 +0200 |
Pierre-Yves David |
test: adapt to change in revert messages order
|
changeset |
files
|
| Fri, 07 Sep 2018 11:08:47 -0700 |
Martin von Zweigbergk |
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
stable
|
changeset |
files
|
| Thu, 06 Sep 2018 16:14:24 -0700 |
Martin von Zweigbergk |
evolve: fix use of "'%d' % ctx"
stable
|
changeset |
files
|
| Thu, 06 Sep 2018 23:24:26 -0400 |
Gerald Squelart |
stablerange: only issue the message once
stable
|
changeset |
files
|
| Fri, 07 Sep 2018 00:06:00 -0400 |
Pierre-Yves David |
changelog: fix version number
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 23:30:28 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Mon, 03 Sep 2018 23:29:15 +0200 |
Pierre-Yves David |
packaing: mark as development version
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 23:27:54 +0200 |
Pierre-Yves David |
Added tag 8.2.0 for changeset 8d8f08245f97
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 23:21:39 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Mon, 03 Sep 2018 23:17:50 +0200 |
Pierre-Yves David |
packaging: prepare new release
stable 8.2.0
|
changeset |
files
|
| Mon, 03 Sep 2018 22:59:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Mon, 03 Sep 2018 22:59:19 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Mon, 03 Sep 2018 22:59:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Mon, 03 Sep 2018 22:59:16 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 03 Sep 2018 22:47:18 +0200 |
Pierre-Yves David |
topic: rework topic templatekw declaration to be 4.5 compatible again
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 22:09:26 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Mon, 03 Sep 2018 22:06:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Mon, 03 Sep 2018 22:05:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Mon, 03 Sep 2018 21:59:24 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Mon, 03 Sep 2018 21:08:33 +0200 |
Pierre-Yves David |
branching: merge the two stable heads
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 17:21:16 +0200 |
Pierre-Yves David |
test-output: backout test output update in 8fcee1e65e29
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 17:20:28 +0200 |
Pierre-Yves David |
test-output: backout test output update in 503ae2689df8
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 20:54:17 +0200 |
Pierre-Yves David |
topic: update the changelog with the 's#' alias change
|
changeset |
files
|
| Mon, 03 Sep 2018 20:53:12 +0200 |
Pierre-Yves David |
topic: update other occurrence of 't0' is 's0' in the code
|
changeset |
files
|
| Mon, 03 Sep 2018 17:28:50 +0200 |
Pierre-Yves David |
topic: mention t0 in topic documentation
stable
|
changeset |
files
|
| Mon, 03 Sep 2018 17:07:36 +0200 |
Pierre-Yves David |
stack: display 's#' instead of 't#' and 'b#'
|
changeset |
files
|
| Mon, 03 Sep 2018 16:41:32 +0200 |
Pierre-Yves David |
stack: clarify s# error message in case of branch
|
changeset |
files
|
| Mon, 03 Sep 2018 16:29:02 +0200 |
Pierre-Yves David |
alias: allow reference through 's#'
|
changeset |
files
|
| Sat, 01 Sep 2018 14:00:41 +0200 |
Pierre-Yves David |
topic-revset: get the list of revset through the official localrepo API
|
changeset |
files
|
| Sat, 01 Sep 2018 21:47:00 +0200 |
Pierre-Yves David |
topic-revset: strictly read string
|
changeset |
files
|
| Sat, 01 Sep 2018 21:45:15 +0200 |
Pierre-Yves David |
test: search for empty topic as a string
|
changeset |
files
|
| Thu, 30 Aug 2018 21:05:17 +0800 |
Anton Shestakov |
topic: handle ambiguous arguments to topic() revset
|
changeset |
files
|
| Thu, 30 Aug 2018 20:21:17 +0800 |
Anton Shestakov |
topic: handle revsets passed to topic() revset
|
changeset |
files
|
| Thu, 30 Aug 2018 19:13:56 +0800 |
Anton Shestakov |
topic: handle string argument to topic() revset earlier
|
changeset |
files
|
| Thu, 30 Aug 2018 18:02:41 +0800 |
Anton Shestakov |
topic: prepare to handle non-string arguments to topic() revset
|
changeset |
files
|
| Thu, 30 Aug 2018 17:42:11 +0800 |
Anton Shestakov |
topic: return result early if there are no arguments to topic() revset
|
changeset |
files
|
| Fri, 31 Aug 2018 00:31:01 +0200 |
Pierre-Yves David |
obshashrange: enable by default
|
changeset |
files
|
| Thu, 30 Aug 2018 22:50:26 +0200 |
Pierre-Yves David |
obshashrange: issue a warning if the cache takes a long time to load
|
changeset |
files
|
| Fri, 31 Aug 2018 14:26:37 +0200 |
Boris Feld |
pick: fix last references of grab in code
|
changeset |
files
|
| Fri, 31 Aug 2018 09:21:19 +0200 |
Pierre-Yves David |
pick: replace `hg grab` invocation in test with `hg pick`
|
changeset |
files
|
| Fri, 31 Aug 2018 09:20:21 +0200 |
Pierre-Yves David |
pick: replace "grabstate" with "pickstate"
|
changeset |
files
|
| Fri, 31 Aug 2018 09:19:13 +0200 |
Pierre-Yves David |
pick: use "pick" as operation name in obsolescence markers
|
changeset |
files
|
| Fri, 31 Aug 2018 12:45:56 +0200 |
Pierre-Yves David |
pick: use "pick" instead of "grab" for various internal API
|
changeset |
files
|
| Fri, 31 Aug 2018 09:13:11 +0200 |
Pierre-Yves David |
pick: update command output to mention pick instead of grab
|
changeset |
files
|
| Fri, 31 Aug 2018 09:11:04 +0200 |
Pierre-Yves David |
pick: rename the grab command to pick
|
changeset |
files
|
| Fri, 31 Aug 2018 09:08:13 +0200 |
Pierre-Yves David |
grab: prefix function with 'cmd' as for the other command in the extension
|
changeset |
files
|
| Thu, 30 Aug 2018 19:40:18 +0200 |
Pierre-Yves David |
readme: document the purpose of the evolve extension
|
changeset |
files
|
| Thu, 30 Aug 2018 19:50:39 +0200 |
Pierre-Yves David |
prune: replace --biject with --pair
|
changeset |
files
|
| Tue, 28 Aug 2018 21:28:41 +0800 |
Anton Shestakov |
topic: check that repo.currenttopic is set before using it as an argument
|
changeset |
files
|
| Wed, 29 Aug 2018 18:59:07 +0200 |
Pierre-Yves David |
test: update output after merge message change
|
changeset |
files
|
| Wed, 29 Aug 2018 17:32:47 +0200 |
Pierre-Yves David |
readme: document the tag we use on output change
|
changeset |
files
|
| Wed, 29 Aug 2018 17:23:25 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 29 Aug 2018 10:46:37 +0200 |
Pierre-Yves David |
packaging: fix debian version numbers
stable
|
changeset |
files
|
| Wed, 29 Aug 2018 10:46:37 +0200 |
Pierre-Yves David |
packaging: fix debian version numbers
|
changeset |
files
|
| Tue, 28 Aug 2018 21:53:42 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Tue, 28 Aug 2018 21:53:07 +0200 |
Pierre-Yves David |
packaging: mark in progress work as development version
stable
|
changeset |
files
|
| Tue, 28 Aug 2018 20:30:57 +0200 |
Pierre-Yves David |
Added tag 8.1.2 for changeset f1cde4c97806
stable
|
changeset |
files
|
| Tue, 28 Aug 2018 19:59:20 +0200 |
Pierre-Yves David |
packagin: prepare version 8.1.2
stable 8.1.2
|
changeset |
files
|
| Tue, 28 Aug 2018 20:00:46 +0200 |
Pierre-Yves David |
obshashrange: force obshashrange invalidation by bumping schema
stable
|
changeset |
files
|
| Tue, 28 Aug 2018 11:25:32 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Tue, 28 Aug 2018 11:24:52 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 28 Aug 2018 11:24:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 28 Aug 2018 11:24:49 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 28 Aug 2018 11:18:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 28 Aug 2018 10:24:18 +0200 |
Pierre-Yves David |
changelog: mention the database robutness fix in the changelog
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 12:40:47 +0200 |
Pierre-Yves David |
sqlcache: also catch malformed database error
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 12:40:41 +0200 |
Pierre-Yves David |
stablerange: rework saving logic to be clearer and safer
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 12:12:49 +0200 |
Pierre-Yves David |
obshashrange: rework saving branching to be clearer and safer
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 11:40:32 +0200 |
Pierre-Yves David |
sqlcache: protect read query too
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 11:33:09 +0200 |
Pierre-Yves David |
sqlite: fast path when nothing to save
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 11:27:04 +0200 |
Pierre-Yves David |
sqlcache: initialize meta table last
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 10:20:15 +0200 |
Pierre-Yves David |
obshashrange: always check in base cachekey against the recorded one
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 10:16:12 +0200 |
Pierre-Yves David |
stablerangecache: fix output in the drifted case
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 00:35:51 +0200 |
Pierre-Yves David |
sqlcache: also ignore integrity error
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 00:28:19 +0200 |
Pierre-Yves David |
sqlcache: cache OperationError when saving
stable
|
changeset |
files
|
| Mon, 27 Aug 2018 00:18:06 +0200 |
Pierre-Yves David |
sqlcache: passe better connection option
stable
|
changeset |
files
|
| Sun, 26 Aug 2018 20:55:26 +0200 |
Pierre-Yves David |
contrib: introduce a small script to stress tests obsolescence exchange
stable
|
changeset |
files
|
| Tue, 28 Aug 2018 10:24:18 +0200 |
Pierre-Yves David |
changelog: mention the database robutness fix in the changelog
|
changeset |
files
|
| Mon, 27 Aug 2018 12:40:47 +0200 |
Pierre-Yves David |
sqlcache: also catch malformed database error
|
changeset |
files
|
| Mon, 27 Aug 2018 12:40:41 +0200 |
Pierre-Yves David |
stablerange: rework saving logic to be clearer and safer
|
changeset |
files
|
| Mon, 27 Aug 2018 12:12:49 +0200 |
Pierre-Yves David |
obshashrange: rework saving branching to be clearer and safer
|
changeset |
files
|
| Mon, 27 Aug 2018 11:40:32 +0200 |
Pierre-Yves David |
sqlcache: protect read query too
|
changeset |
files
|
| Mon, 27 Aug 2018 11:33:09 +0200 |
Pierre-Yves David |
sqlite: fast path when nothing to save
|
changeset |
files
|
| Mon, 27 Aug 2018 11:27:04 +0200 |
Pierre-Yves David |
sqlcache: initialize meta table last
|
changeset |
files
|
| Mon, 27 Aug 2018 10:20:15 +0200 |
Pierre-Yves David |
obshashrange: always check in base cachekey against the recorded one
|
changeset |
files
|
| Mon, 27 Aug 2018 10:16:12 +0200 |
Pierre-Yves David |
stablerangecache: fix output in the drifted case
|
changeset |
files
|
| Mon, 27 Aug 2018 00:35:51 +0200 |
Pierre-Yves David |
sqlcache: also ignore integrity error
|
changeset |
files
|
| Mon, 27 Aug 2018 00:28:19 +0200 |
Pierre-Yves David |
sqlcache: cache OperationError when saving
|
changeset |
files
|
| Mon, 27 Aug 2018 00:18:06 +0200 |
Pierre-Yves David |
sqlcache: passe better connection option
|
changeset |
files
|
| Sun, 26 Aug 2018 20:55:26 +0200 |
Pierre-Yves David |
contrib: introduce a small script to stress tests obsolescence exchange
|
changeset |
files
|
| Tue, 21 Aug 2018 14:09:33 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Tue, 21 Aug 2018 13:59:27 +0200 |
Pierre-Yves David |
test: adjust glob in previous changeset
mercurial-4.4
|
changeset |
files
|
| Tue, 21 Aug 2018 15:32:02 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 21 Aug 2018 15:30:54 +0200 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 15:29:32 +0200 |
Pierre-Yves David |
Added tag 8.1.1 for changeset e7abf863e113
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 15:29:13 +0200 |
Pierre-Yves David |
packaging: prepare release 8.1.1
stable 8.1.1
|
changeset |
files
|
| Tue, 21 Aug 2018 14:23:47 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 21 Aug 2018 13:26:35 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 21 Aug 2018 13:25:29 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 21 Aug 2018 13:25:28 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 21 Aug 2018 13:18:52 +0200 |
Pierre-Yves David |
changelog: add a line about improved prune documentation
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 13:17:27 +0200 |
Pierre-Yves David |
changelog: reorder content
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:13:28 +0200 |
Dan Villiom Podlaski Christiansen |
prune: more human-friendly documentation
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:14:04 +0200 |
Dan Villiom Podlaski Christiansen |
prune: improve help first line
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:21:05 +0200 |
Pierre-Yves David |
prune: try to clarify the "multi" revisions case
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:21:59 +0200 |
Pierre-Yves David |
prune: move help about biject after the one about split and fold
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:18:11 +0200 |
Pierre-Yves David |
prune: no longer consider dropping --biject
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 12:13:01 +0200 |
Dan Villiom Podlaski Christiansen |
prune: more human-friendly documentation for --biject
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 11:56:49 +0200 |
Dan Villiom Podlaski Christiansen |
prune: use ``-s/--succ`` in documentation
stable
|
changeset |
files
|
| Tue, 21 Aug 2018 04:08:38 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 21 Aug 2018 04:05:12 +0200 |
Pierre-Yves David |
compat: import the module dagutil module in evolve
|
changeset |
files
|
| Mon, 20 Aug 2018 12:21:39 +0300 |
Pulkit Goyal |
evolve: delete evolvestate after aborting interrupted `next --evolve`
stable
|
changeset |
files
|
| Mon, 20 Aug 2018 12:19:05 +0300 |
Pulkit Goyal |
tests: check that we delete evolvestate correctly after abort/stop
stable
|
changeset |
files
|
| Mon, 20 Aug 2018 23:04:37 +0200 |
Pierre-Yves David |
changelog: update with issue5927 fix
stable
|
changeset |
files
|
| Sat, 18 Aug 2018 21:03:45 +0530 |
Pulkit Goyal |
evolve: set the second parent if we get conflicts while evolving
stable
|
changeset |
files
|
| Sat, 18 Aug 2018 21:01:14 +0530 |
Pulkit Goyal |
evolvecmd: import mercurial.node module as nodemod
stable
|
changeset |
files
|
| Sat, 18 Aug 2018 20:24:41 +0530 |
Pulkit Goyal |
tests: demonstrate the interrupted evolve does not set p2
stable
|
changeset |
files
|
| Sat, 18 Aug 2018 01:32:52 +0200 |
Pierre-Yves David |
cleanup: remove unused import
|
changeset |
files
|
| Sat, 18 Aug 2018 01:03:19 +0200 |
Pierre-Yves David |
cleanup: remove old comment that lost all meaning
|
changeset |
files
|
| Sat, 18 Aug 2018 01:02:52 +0200 |
Pierre-Yves David |
template: remove compatibility layer for `showobsolete`
|
changeset |
files
|
| Sat, 18 Aug 2018 01:06:30 +0200 |
Pierre-Yves David |
exthelper: drop compatibility layer for `command`
|
changeset |
files
|
| Sat, 18 Aug 2018 01:05:00 +0200 |
Pierre-Yves David |
topic: drop compat layer for `command`
|
changeset |
files
|
| Sat, 18 Aug 2018 01:00:08 +0200 |
Pierre-Yves David |
legacy: drop compat layer for "command"
|
changeset |
files
|
| Sat, 18 Aug 2018 00:59:44 +0200 |
Pierre-Yves David |
drophack: drop compat layer for "command"
|
changeset |
files
|
| Sat, 18 Aug 2018 00:53:12 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for updatecaches
|
changeset |
files
|
| Sat, 18 Aug 2018 00:48:05 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 17 Aug 2018 16:26:44 +0200 |
Pierre-Yves David |
obshashrange: force saving of stablesort and firstmerge cache
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 13:31:35 +0200 |
Pierre-Yves David |
test: add a test about cache warming
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 12:56:13 +0200 |
Pierre-Yves David |
stablerange: save stablesort cache alongside the stablerange one
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 12:07:55 +0200 |
Pierre-Yves David |
obshashrange: always save stable range cache alongside the obshashrange one
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 12:06:43 +0200 |
Pierre-Yves David |
obshashrange: clear in-memory cache alongside the sqlite one
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 01:07:37 +0200 |
Pierre-Yves David |
branching: merge with fixes on stable
|
changeset |
files
|
| Fri, 17 Aug 2018 01:04:49 +0200 |
Pierre-Yves David |
changelog: summarize the recent improvement
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 00:27:10 +0200 |
Pierre-Yves David |
obshashrange: re-enabled more selective pruning of affected range
stable
|
changeset |
files
|
| Fri, 17 Aug 2018 00:23:20 +0200 |
Pierre-Yves David |
obshashrange: fix computation of affected ranges
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 22:45:36 +0200 |
Pierre-Yves David |
obshashrange: add more validation output to tests
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 21:12:57 +0200 |
Pierre-Yves David |
obshashrange: correctly detect changeset directly affected by prune
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 21:18:18 +0200 |
Pierre-Yves David |
obshashrange: do not search for affected ranges above the highest we have
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 20:49:55 +0200 |
Pierre-Yves David |
obshashrange: do not search for affected stable range cache is unavailable
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 20:22:19 +0200 |
Pierre-Yves David |
stablerange: build closure a bit less inefficiently
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 22:19:19 +0200 |
Pierre-Yves David |
discovery: make sure repository wrapping happens in the right order
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 11:58:07 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 16 Aug 2018 11:54:30 +0200 |
Pierre-Yves David |
changelog: add an entry about the next --evolve fix
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 11:53:49 +0200 |
Pierre-Yves David |
changelog: update 8.1.0 release date
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 11:44:32 +0200 |
Pierre-Yves David |
next: fix topic constraint in the --evolve case
stable
|
changeset |
files
|
| Thu, 16 Aug 2018 11:43:53 +0200 |
Pierre-Yves David |
next: use set for membership testing
stable
|
changeset |
files
|
| Tue, 14 Aug 2018 19:22:54 +0200 |
Pierre-Yves David |
test: adapt to core output change on unknown command
|
changeset |
files
|
| Tue, 14 Aug 2018 19:15:35 +0200 |
Pierre-Yves David |
compat: use new style template keyword declaration
|
changeset |
files
|
| Tue, 14 Aug 2018 18:32:30 +0200 |
Pierre-Yves David |
test: fix previous changeset output
|
changeset |
files
|
| Tue, 14 Aug 2018 15:24:22 +0200 |
Pierre-Yves David |
obshashrange: add a test for `hg debugupdatecache`
|
changeset |
files
|
| Tue, 14 Aug 2018 18:21:23 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 08 Aug 2018 20:21:34 +0900 |
Yuya Nishihara |
templatekw: do not override in-core {obsolete} keyword
stable
|
changeset |
files
|
| Mon, 13 Aug 2018 12:55:10 +0200 |
Pierre-Yves David |
packaging: mark version as development version
stable
|
changeset |
files
|
| Fri, 03 Aug 2018 05:43:54 +0200 |
Pierre-Yves David |
Added tag 8.1.0 for changeset 2c5d79c6459c
stable
|
changeset |
files
|
| Fri, 03 Aug 2018 05:41:08 +0200 |
Pierre-Yves David |
packaging: prepare version
stable 8.1.0
|
changeset |
files
|
| Fri, 03 Aug 2018 01:16:51 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 03 Aug 2018 00:22:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 03 Aug 2018 00:19:47 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 03 Aug 2018 00:19:46 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Fri, 03 Aug 2018 00:19:45 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Fri, 03 Aug 2018 00:52:10 +0200 |
Boris Feld |
compat: fix obslog compatiblity with 4.3
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 16:54:40 +0300 |
Pulkit Goyal |
compat: add a fixed version of mergecopies for hg<=4.3
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Thu, 02 Aug 2018 02:42:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 02 Aug 2018 02:42:14 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 02 Aug 2018 04:11:54 +0200 |
Pierre-Yves David |
compat: make compatible call to ui.edit for hg <= 4.3
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 03:08:52 +0200 |
Pierre-Yves David |
compat: ignore extra status feature for hg <= 4.3
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 02:41:33 +0200 |
Pierre-Yves David |
format: fix indentation level
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 01:58:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 02 Aug 2018 01:57:13 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 02 Aug 2018 02:15:48 +0200 |
Pierre-Yves David |
compat: disable empty topic warning on `hg phases` for hg <=4.5
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 01:31:02 +0200 |
Pierre-Yves David |
compat: restore compatibility with Mercurial <= 4.5
stable
|
changeset |
files
|
| Thu, 02 Aug 2018 01:53:01 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 12:54:46 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Wed, 01 Aug 2018 23:52:10 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Tue, 31 Jul 2018 07:38:37 -0500 |
Andrew Fischer |
compat: improve detection of Mercurial 4.6
stable
|
changeset |
files
|
| Tue, 31 Jul 2018 13:06:20 +0200 |
Pierre-Yves David |
cleanup: use NotImplementedError instead of NotImplemented
stable
|
changeset |
files
|
| Tue, 24 Jul 2018 00:52:14 +0530 |
Pulkit Goyal |
CHANGELOG: add some entries and remove duplicated entries
stable
|
changeset |
files
|
| Tue, 31 Jul 2018 12:52:06 +0200 |
Pierre-Yves David |
branching: merge default into stable
stable
|
changeset |
files
|
| Tue, 31 Jul 2018 12:07:39 +0200 |
Pierre-Yves David |
branching: merge with the other head
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 11:48:15 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 8fe8152ff071
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 11:47:20 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 11:46:30 +0200 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 11:45:01 +0200 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
changeset |
files
|
| Tue, 31 Jul 2018 11:25:57 +0200 |
Pierre-Yves David |
compat: use older API for older version
|
changeset |
files
|
| Tue, 31 Jul 2018 09:28:19 +0200 |
Pierre-Yves David |
branching: create mercurial-4.6 branch for updated test output
mercurial-4.6
|
changeset |
files
|
| Wed, 25 Jul 2018 16:12:01 -0700 |
Martin von Zweigbergk |
builddependencies: extract function for getting successors
|
changeset |
files
|
| Wed, 25 Jul 2018 16:23:25 -0700 |
Martin von Zweigbergk |
builddependencies: share code between single- and multi-successor cases
|
changeset |
files
|
| Wed, 25 Jul 2018 14:33:48 -0700 |
Martin von Zweigbergk |
builddependencies: build inverse dict from forward dict
|
changeset |
files
|
| Wed, 25 Jul 2018 14:21:49 -0700 |
Martin von Zweigbergk |
builddependencies: remove a use of defaultdict
|
changeset |
files
|
| Tue, 31 Jul 2018 09:03:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 25 Jul 2018 15:30:37 -0700 |
Martin von Zweigbergk |
builddependencies: don't remove found deps when divergence found (issue5946)
stable
|
changeset |
files
|
| Wed, 25 Jul 2018 14:47:16 -0700 |
Martin von Zweigbergk |
builddependencies: don't add dependency on revision outside input set
stable
|
changeset |
files
|
| Wed, 25 Jul 2018 15:16:25 -0700 |
Martin von Zweigbergk |
builddependencies: consider all divergent successors
stable
|
changeset |
files
|
| Wed, 25 Jul 2018 14:00:49 -0700 |
Martin von Zweigbergk |
tests: add test for issue5946
stable
|
changeset |
files
|
| Fri, 25 May 2018 17:17:56 +0200 |
Boris Feld |
obslog: check filtered output with folded changesets
|
changeset |
files
|
| Fri, 25 May 2018 16:50:04 +0200 |
Boris Feld |
obslog: check filtered output with splitted changesets
|
changeset |
files
|
| Fri, 25 May 2018 11:52:48 +0200 |
Boris Feld |
obslog: check filtered output with pruned changesets
|
changeset |
files
|
| Tue, 22 May 2018 16:48:35 +0200 |
Boris Feld |
obslog: check filtered output with amended changesets
|
changeset |
files
|
| Fri, 25 May 2018 11:48:19 +0200 |
Boris Feld |
tests: add a content-divergent obshistory test
|
changeset |
files
|
| Tue, 22 May 2018 17:44:05 +0200 |
Boris Feld |
tests: extract the obshistory amend then fold test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 17:42:56 +0200 |
Boris Feld |
tests: extract the content-divergence test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 17:41:57 +0200 |
Boris Feld |
tests: extract the obshistory fold test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 17:40:56 +0200 |
Boris Feld |
tests: extract the obshistory lots of split test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 17:37:51 +0200 |
Boris Feld |
tests: extract the obshistory split test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 17:37:40 +0200 |
Boris Feld |
tests: extract the obshistory prune test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 15:40:29 +0200 |
Boris Feld |
tests: extract the obshistory amend test case into a separate file
|
changeset |
files
|
| Tue, 22 May 2018 15:35:54 +0200 |
Boris Feld |
tests: extract obshistory setup in a separate file
|
changeset |
files
|
| Tue, 22 May 2018 12:07:24 +0200 |
Boris Feld |
obslog: add a new flag to filter out non-local nodes
|
changeset |
files
|
| Thu, 26 Jul 2018 18:28:44 +0200 |
Pierre-Yves David |
compat: drop compatibility hack for mercurial <4.3
|
changeset |
files
|
| Sat, 21 Jul 2018 02:42:29 +0530 |
Pulkit Goyal |
compat: temporarily move copies fix to compat.py
|
changeset |
files
|
| Thu, 07 Jun 2018 18:18:30 +0530 |
Pulkit Goyal |
evolve: continue conflicted relocation content-divergence
|
changeset |
files
|
| Wed, 18 Jul 2018 18:17:16 +0800 |
Anton Shestakov |
topic: use self instead of repo in topicrepo methods
stable
|
changeset |
files
|
| Sun, 08 Jul 2018 22:16:17 +0530 |
Pulkit Goyal |
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
|
changeset |
files
|
| Sun, 08 Jul 2018 21:18:33 +0530 |
Pulkit Goyal |
evolvecmd: move remaining logic to merge commit desc to existing utility fn
|
changeset |
files
|
| Sun, 08 Jul 2018 22:52:33 +0530 |
Pulkit Goyal |
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
|
changeset |
files
|
| Sun, 08 Jul 2018 22:50:16 +0530 |
Pulkit Goyal |
tests: add a test to demonstrate issue5925
|
changeset |
files
|
| Mon, 09 Jul 2018 01:18:40 +0200 |
Pierre-Yves David |
test: fix possible output change from 4.7
|
changeset |
files
|
| Fri, 06 Jul 2018 11:36:24 -0700 |
Martin von Zweigbergk |
state: add the get() method that evolvecmd:1836 expects
|
changeset |
files
|
| Sun, 17 Jun 2018 03:56:54 +0200 |
Pierre-Yves David |
rewing: prevent rewind in case of uncommitted changes
|
changeset |
files
|
| Sun, 17 Jun 2018 03:46:46 +0200 |
Pierre-Yves David |
rewind: default to rewinding the current stack
|
changeset |
files
|
| Sun, 17 Jun 2018 03:10:19 +0200 |
Pierre-Yves David |
rewing: add the ability to rewind "from" revisions
|
changeset |
files
|
| Sun, 17 Jun 2018 03:29:34 +0200 |
Pierre-Yves David |
evolve: exclude "identical" precursors from the precursors set
|
changeset |
files
|
| Sun, 17 Jun 2018 03:07:53 +0200 |
Pierre-Yves David |
rewind: move revision selection into its own function
|
changeset |
files
|
| Sun, 17 Jun 2018 02:32:29 +0200 |
Pierre-Yves David |
rewind: automatically rewind entire stack
|
changeset |
files
|
| Sun, 17 Jun 2018 02:22:28 +0200 |
Pierre-Yves David |
rewind: add a test about rewinding top of stack
|
changeset |
files
|
| Sun, 17 Jun 2018 02:03:03 +0200 |
Pierre-Yves David |
rewind: use rewinded parent when creating multiple changesets
|
changeset |
files
|
| Sun, 17 Jun 2018 00:22:31 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a fold
|
changeset |
files
|
| Sun, 17 Jun 2018 01:36:30 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a split
|
changeset |
files
|
| Sun, 17 Jun 2018 00:33:43 +0200 |
Pierre-Yves David |
rewind: update the working copy if it gets obsoleted
|
changeset |
files
|
| Sun, 17 Jun 2018 01:04:20 +0200 |
Pierre-Yves David |
rewind: add a message about obsolete changeset
|
changeset |
files
|
| Sun, 17 Jun 2018 00:15:18 +0200 |
Pierre-Yves David |
rewind: obsolete latest successors unless instructed otherwise
|
changeset |
files
|
| Sat, 16 Jun 2018 23:32:22 +0200 |
Pierre-Yves David |
rewind: test rewinding an amended changesets
|
changeset |
files
|
| Sun, 17 Jun 2018 00:57:09 +0200 |
Pierre-Yves David |
rewind: add a message about the rewinded changesets
|
changeset |
files
|
| Sat, 16 Jun 2018 23:11:52 +0200 |
Pierre-Yves David |
rewind: add a proto version of the command
|
changeset |
files
|
| Fri, 29 Jun 2018 16:51:56 +0200 |
Pierre-Yves David |
stablesort: make sure heads are processed in sorted order
|
changeset |
files
|
| Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
changeset |
files
|
| Tue, 19 Jun 2018 23:21:44 +0530 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
changeset |
files
|
| Thu, 28 Jun 2018 17:26:16 +0200 |
Pierre-Yves David |
changelog: add an entry about the new `evolve.interrupted` section
|
changeset |
files
|
| Fri, 15 Jun 2018 00:50:17 +0530 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
changeset |
files
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
changeset |
files
|
| Thu, 14 Jun 2018 02:58:30 +0200 |
Pierre-Yves David |
changelog: add a changelog entry about divergence resolution
|
changeset |
files
|
| Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
changeset |
files
|
| Thu, 14 Jun 2018 01:39:11 +0530 |
Pulkit Goyal |
tests: fix a test case to not create conflicts
|
changeset |
files
|
| Thu, 14 Jun 2018 01:06:12 +0530 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
changeset |
files
|
| Wed, 13 Jun 2018 18:08:57 +0530 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
changeset |
files
|
| Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
changeset |
files
|
| Tue, 12 Jun 2018 23:20:54 +0530 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
changeset |
files
|
| Tue, 12 Jun 2018 21:13:02 +0530 |
Pulkit Goyal |
tests: add test of resolution of content-divergent stacks
|
changeset |
files
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
changeset |
files
|
| Tue, 12 Jun 2018 04:01:19 +0530 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
changeset |
files
|
| Tue, 12 Jun 2018 03:29:13 +0530 |
Pulkit Goyal |
tests: add test about aborting content-divergence when multiple parents
|
changeset |
files
|
| Wed, 13 Jun 2018 15:47:19 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about the --update flag
|
changeset |
files
|
| Wed, 06 Jun 2018 04:29:05 +0530 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
changeset |
files
|
| Tue, 12 Jun 2018 13:58:14 +0200 |
Denis Laxalde |
style: drop a (commented) debug print
|
changeset |
files
|
| Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
changeset |
files
|
| Tue, 12 Jun 2018 10:40:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 11 Jun 2018 23:31:44 +0530 |
Pulkit Goyal |
Added tag 8.0.1 for changeset 0887c30255a1
stable
|
changeset |
files
|
| Mon, 11 Jun 2018 23:30:24 +0530 |
Pulkit Goyal |
packaging: prepare for 8.0.1 release
stable 8.0.1
|
changeset |
files
|
| Mon, 11 Jun 2018 20:24:45 +0200 |
Pierre-Yves David |
changelog: add a couple of missing entry
stable
|
changeset |
files
|
| Mon, 11 Jun 2018 20:17:56 +0530 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
changeset |
files
|
| Mon, 11 Jun 2018 20:13:36 +0530 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
changeset |
files
|
| Mon, 11 Jun 2018 15:52:11 +0530 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
changeset |
files
|
| Mon, 11 Jun 2018 15:38:43 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
changeset |
files
|
| Mon, 11 Jun 2018 01:00:57 +0530 |
Pulkit Goyal |
tests: add more test of --stop while resolving content-divergence
|
changeset |
files
|
| Mon, 11 Jun 2018 00:47:28 +0530 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
changeset |
files
|
| Mon, 11 Jun 2018 00:43:39 +0530 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
changeset |
files
|
| Sun, 10 Jun 2018 22:52:11 +0530 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
changeset |
files
|
| Sun, 10 Jun 2018 22:42:57 +0530 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
changeset |
files
|
| Sun, 10 Jun 2018 22:38:08 +0530 |
Pulkit Goyal |
tests: add test for --stop flag when resolving multiparents content-div
|
changeset |
files
|
| Sun, 10 Jun 2018 20:35:48 +0530 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
changeset |
files
|
| Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
changeset |
files
|
| Sat, 09 Jun 2018 00:15:27 +0530 |
Pulkit Goyal |
packaging: update tested-with statements in evolve and topic
stable
|
changeset |
files
|
| Sat, 09 Jun 2018 00:12:08 +0530 |
Pulkit Goyal |
CHANGELOG: mention about 4.6.1 compatibility
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:53 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:52 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:51 +0530 |
Pulkit Goyal |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 19:48:53 +0530 |
Pulkit Goyal |
CHANGELOG: add couple of entries about things fixed
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 17:36:28 +0530 |
Pulkit Goyal |
next-prev: always respect the --merge flag
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 18:32:48 +0530 |
Pulkit Goyal |
next-prev: add tests showing --merge not respected in some cases
stable
|
changeset |
files
|
| Thu, 07 Jun 2018 22:59:39 +0530 |
Pulkit Goyal |
evolve: store the evolvestate if relocation results in conflicts
|
changeset |
files
|
| Thu, 07 Jun 2018 22:45:54 +0530 |
Pulkit Goyal |
tests: add more test of resolution of content-divergent changesets
|
changeset |
files
|
| Thu, 07 Jun 2018 18:18:10 +0530 |
Pulkit Goyal |
evolvestate: store info about relocation while resolving content-divergence
|
changeset |
files
|
| Thu, 07 Jun 2018 18:13:54 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge content divergent csets in separate fn
|
changeset |
files
|
| Thu, 07 Jun 2018 20:27:03 +0530 |
Pulkit Goyal |
evolve: commit the transaction if conflicts occur while merging content-div
|
changeset |
files
|
| Thu, 07 Jun 2018 15:54:32 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence when different parents
|
changeset |
files
|
| Fri, 01 Jun 2018 19:52:06 +0530 |
Pulkit Goyal |
evolve: implement resolution of content-divergence when on differet parents
|
changeset |
files
|
| Fri, 01 Jun 2018 19:57:19 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence with parent change
|
changeset |
files
|
| Wed, 06 Jun 2018 03:49:17 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5877
|
changeset |
files
|
| Wed, 06 Jun 2018 03:26:47 +0530 |
Pulkit Goyal |
evolve: pop up editor if conflicts occur while merging commit messages
|
changeset |
files
|
| Mon, 04 Jun 2018 01:28:02 +0530 |
Pulkit Goyal |
evolve: merge commit messages while resolving content-divergence (issue5877)
|
changeset |
files
|
| Wed, 06 Jun 2018 01:19:36 +0530 |
Pulkit Goyal |
evolve: move if-else block under the right block
|
changeset |
files
|
| Tue, 05 Jun 2018 22:02:24 +0530 |
Pulkit Goyal |
tests: make sure we don't result in commit messages conflict
|
changeset |
files
|
| Tue, 05 Jun 2018 21:02:09 +0530 |
Pulkit Goyal |
tests: don't use mkcommit shell function in test-divergent.t
|
changeset |
files
|
| Wed, 06 Jun 2018 14:35:36 +0200 |
Pierre-Yves David |
evolve: remove duplicated documentation
|
changeset |
files
|
| Wed, 06 Jun 2018 04:09:49 +0530 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
changeset |
files
|
| Wed, 23 May 2018 01:11:59 +0530 |
Pulkit Goyal |
evolve: add a help topic `Interrupted-Evolve`
|
changeset |
files
|
| Tue, 05 Jun 2018 03:37:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 05 Jun 2018 03:36:40 +0200 |
Pierre-Yves David |
changelog: fix version number error
stable
|
changeset |
files
|
| Thu, 24 May 2018 02:12:14 +0530 |
Pulkit Goyal |
evolve: return the new node formed only as the replacement
|
changeset |
files
|
| Thu, 24 May 2018 17:04:20 +0530 |
Pulkit Goyal |
tests: add more test of --abort flag for content-divergence resolution
|
changeset |
files
|
| Mon, 04 Jun 2018 04:03:02 +0530 |
Pulkit Goyal |
evolve: prompt user for branch selection while resolving content-divergence
|
changeset |
files
|
| Tue, 05 Jun 2018 03:51:01 +0530 |
Pulkit Goyal |
evolve: pass the base revision in _completecontentdivergent()
|
changeset |
files
|
| Tue, 05 Jun 2018 03:49:49 +0530 |
Pulkit Goyal |
evolve: store the base of content-divergents in evolvestate
|
changeset |
files
|
| Tue, 05 Jun 2018 00:53:21 +0530 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
changeset |
files
|
| Sun, 03 Jun 2018 01:59:41 +0530 |
Pulkit Goyal |
corecompat: update the tests output to show phase update summary
|
changeset |
files
|
| Sun, 03 Jun 2018 03:24:43 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about issue 5808 being fixed
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 03:21:25 +0530 |
Pulkit Goyal |
next-prev: replace the error hint to mention about `--merge` flag
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 03:13:47 +0530 |
Pulkit Goyal |
tests: add tests for conflicts while respecting commands.update.check
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:37:13 +0530 |
Pulkit Goyal |
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:36:24 +0530 |
Pulkit Goyal |
prev: respect `commands.update.check` config option in `hg prev` (issue5808)
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:50:55 +0530 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:26:19 +0530 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:24:28 +0530 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 03:35:22 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5897
stable
|
changeset |
files
|
| Sun, 27 May 2018 02:32:58 +0530 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
changeset |
files
|
| Wed, 30 May 2018 00:34:35 +0530 |
Pulkit Goyal |
tests: add a test demonstrating issue5897
stable
|
changeset |
files
|
| Thu, 24 May 2018 17:50:02 +0530 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
changeset |
files
|
| Thu, 24 May 2018 02:02:11 +0530 |
Pulkit Goyal |
tests: add tests for testing --abort while content-divergence resolution
|
changeset |
files
|
| Thu, 24 May 2018 00:58:50 +0530 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
changeset |
files
|
| Thu, 24 May 2018 00:58:35 +0530 |
Pulkit Goyal |
tests: add more tests related to aborting while resolving phase-divergence
|
changeset |
files
|
| Wed, 23 May 2018 12:16:24 +0200 |
Denis Laxalde |
topic: suggest to clear a topic that becomes empty
|
changeset |
files
|
| Wed, 23 May 2018 11:37:37 +0200 |
Denis Laxalde |
topic: display a hint pointing at help when a topic becomes non-empty
|
changeset |
files
|
| Thu, 24 May 2018 18:57:46 +0200 |
Pierre-Yves David |
branching: merge with compat fix on default
|
changeset |
files
|
| Thu, 24 May 2018 01:50:26 +0530 |
Pulkit Goyal |
evolve: add compat for repair.stripbmrevset which is moved to scmutil
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:18:14 +0200 |
Pierre-Yves David |
evolve: update the readme with more information about contribution
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:03:31 +0200 |
Denis Laxalde |
topic: dedent items about publishing behavior in docstring
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:00:11 +0200 |
Denis Laxalde |
topic: use preformatted block for config snippets documentation
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:09:37 +0200 |
Denis Laxalde |
tests: add a test for "hg help -e topic"
stable
|
changeset |
files
|
| Wed, 23 May 2018 01:24:02 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 22 May 2018 21:33:50 +0530 |
Pulkit Goyal |
content-div: add test showing `--stop` works during interrupted resolution
|
changeset |
files
|
| Mon, 23 Apr 2018 14:48:53 +0530 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
changeset |
files
|
| Tue, 22 May 2018 20:33:42 +0530 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
changeset |
files
|
| Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
|
changeset |
files
|
| Wed, 23 May 2018 02:46:20 +0530 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
changeset |
files
|
| Wed, 23 May 2018 02:43:23 +0530 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
changeset |
files
|
| Wed, 23 May 2018 02:36:14 +0530 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
changeset |
files
|
| Wed, 23 May 2018 02:33:14 +0530 |
Pulkit Goyal |
evolve: return the new replacement node to be stored in evolvestate
|
changeset |
files
|
| Wed, 23 May 2018 02:39:38 +0530 |
Pulkit Goyal |
evolve: don't make values of replacements dict lists
|
changeset |
files
|
| Wed, 23 May 2018 02:41:08 +0530 |
Pulkit Goyal |
tests: add a test file `--abort` flag while resolving phase-divergence
|
changeset |
files
|
| Tue, 15 May 2018 22:17:27 -0700 |
Martin von Zweigbergk |
evolve: pass revisions as strings to commands.*()
stable
|
changeset |
files
|
| Wed, 23 May 2018 01:27:13 +0530 |
Pulkit Goyal |
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
|
changeset |
files
|
| Mon, 21 May 2018 16:56:52 +0200 |
Pierre-Yves David |
branching: merge with branch for stable
|
changeset |
files
|
| Mon, 21 May 2018 16:25:29 +0200 |
Boris Feld |
compat: update obshashrange test output
|
changeset |
files
|
| Mon, 21 May 2018 14:56:51 +0200 |
Boris Feld |
test: update to new outputs
|
changeset |
files
|
| Mon, 21 May 2018 13:07:49 +0200 |
Boris Feld |
compat: fix obslog with Mercurial 4.6+
|
changeset |
files
|
| Sat, 19 May 2018 18:26:36 +0530 |
Faheem Mitha |
debian: add line to clean-docs target to delete additional docs file
stable
|
changeset |
files
|
| Mon, 14 May 2018 15:25:38 -0700 |
Martin von Zweigbergk |
amend: use context manager for locks (issue5887)
stable
|
changeset |
files
|
| Thu, 10 May 2018 21:37:28 -0700 |
Martin von Zweigbergk |
evolve: point to '--abort' in verbose status message
stable
|
changeset |
files
|
| Sun, 22 Apr 2018 20:14:42 +0530 |
Pulkit Goyal |
evolvecmd: add comments and new lines in content-divergence handling logic
|
changeset |
files
|
| Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
changeset |
files
|
| Sun, 29 Apr 2018 19:14:41 +0530 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
changeset |
files
|
| Sun, 29 Apr 2018 19:11:29 +0530 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
changeset |
files
|
| Sun, 29 Apr 2018 19:04:18 +0530 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
changeset |
files
|
| Sun, 29 Apr 2018 18:51:56 +0530 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
changeset |
files
|
| Sun, 29 Apr 2018 18:48:36 +0530 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
changeset |
files
|
| Sun, 29 Apr 2018 18:13:29 +0530 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
changeset |
files
|
| Sun, 29 Apr 2018 17:54:01 +0530 |
Pulkit Goyal |
evolve: store divergent nodes in evolvestate when resolving content-divergence
|
changeset |
files
|
| Wed, 02 May 2018 11:59:06 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Sat, 28 Apr 2018 18:44:07 +0530 |
Pulkit Goyal |
tests: add test showing `hg evolve --stop` works fine with phase-divergence
stable
|
changeset |
files
|
| Sat, 28 Apr 2018 18:03:32 +0530 |
Pulkit Goyal |
tests: rename the test file to add 'orphan' in the name
stable
|
changeset |
files
|