Commit 7daa6793 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

branching: merge with stable

Pipeline #17107 passed with stage
in 8 minutes and 11 seconds
......@@ -5,7 +5,7 @@
---------------------
* evolve: remove spurious "working directory is now at ..." messages
* evolve: improve resolution of some case of parent divergence
* evolve: various documentation improvements
topic:
......@@ -15,7 +15,7 @@
--------------------
* strip: remove experimental.prunestrip option
* evolve: improve resolution of some case of parent divergence
* performance: speed up various operations using an in-memory cache for topic
10.1.0 -- 2020-10-31
......
......@@ -15,7 +15,7 @@
qnew ``commit``
qrefresh ``amend``
qrefresh --exclude ``uncommit``
qpop ``update`` or ``gdown``
qpush ``update`` or ``gup`` sometimes ``evolve``
qpop ``update`` or ``previous``
qpush ``update`` or ``next`` sometimes ``evolve`` or ``pick``
qrm ``prune``
qfold ``fold``
......@@ -20,4 +20,4 @@
qrm ``prune``
qfold ``fold``
qdiff ``odiff``
qdiff ``pdiff``
qrecord ``record``
......@@ -23,3 +23,4 @@
qrecord ``record``
qimport ``import``
qfinish --
......@@ -24,6 +25,6 @@
qfinish --
qimport --
qcommit --
============================== ============================================
......@@ -35,7 +36,8 @@
All your work in progress is now in real changesets all the time.
You can use the standard log command to display them. You can use the
phase revset to display unfinished work only, and use templates to have
the same kind of compact that the output of qseries has.
You can use the standard ``log`` command to display them. You can use the
``draft()`` (or ``secret()``) revset to display unfinished work only, and
use templates to have the same kind of compact that the output of
``qseries`` has.
......@@ -41,5 +43,7 @@
This will result in something like::
This will result in something like
.. code-block:: ini
[alias]
wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n'
......@@ -49,8 +53,10 @@
With evolve you handle standard changesets without an additional overlay.
Standard changeset are created using hg commit as usual::
Standard changeset are created using ``hg commit`` as usual
.. code-block:: console
$ hg commit
If you want to keep the "WIP is not pushed" behavior, you want to
......@@ -53,10 +59,10 @@
$ hg commit
If you want to keep the "WIP is not pushed" behavior, you want to
set your changeset in the secret phase using the phase command.
set your changeset in the secret phase using the ``phase`` command.
Note that you only need it for the first commit you want to be secret. Later
commits will inherit their parent's phase.
If you always want your new commit to be in the secret phase, your should
......@@ -58,8 +64,10 @@
Note that you only need it for the first commit you want to be secret. Later
commits will inherit their parent's phase.
If you always want your new commit to be in the secret phase, your should
consider updating your configuration:
consider updating your configuration
.. code-block:: ini
[phases]
......@@ -64,8 +72,8 @@
[phases]
new-commit=secret
new-commit = secret
hg qref
```````
A new command from evolution will allow you to rewrite the changeset you are
......@@ -67,9 +75,11 @@
hg qref
```````
A new command from evolution will allow you to rewrite the changeset you are
currently on. Just call:
currently on. Just call
.. code-block:: console
$ hg amend
......@@ -73,7 +83,7 @@
$ hg amend
This command takes the same options as commit, plus the switch '-e' (--edit)
This command takes the same options as ``commit``, plus the switch ``-e`` (``--edit``)
to edit the commit message in an editor.
......@@ -92,7 +102,9 @@
hg qref --exclude
`````````````````
To remove changes from your current commit use::
To remove changes from your current commit use
.. code-block:: console
$ hg uncommit not-ready.txt
......@@ -100,5 +112,7 @@
hg qpop
```````
The following command emulates the behavior of hg qpop:
To emulate the behavior of ``qpop`` use
.. code-block:: console
......@@ -104,3 +118,3 @@
$ hg gdown
$ hg previous
......@@ -106,5 +120,7 @@
If you need to go back to an arbitrary commit you can use:
If you need to go back to an arbitrary commit you can use
.. code-block:: console
$ hg update
......@@ -108,6 +124,6 @@
$ hg update
.. note:: gdown and update allow movement with working directory
.. note:: previous and update allow movement with working directory
changes applied, and gracefully merge them.
......@@ -112,5 +128,8 @@
changes applied, and gracefully merge them.
.. note:: Previous versions of the documentation recommended
the deprecated gdown command
hg qpush
````````
......@@ -114,7 +133,13 @@
hg qpush
````````
The following command emulates the behavior of ``hg qpush``
.. code-block:: console
$ hg next
When you rewrite changesets, descendants of rewritten changesets are marked as
"orphan". You need to rewrite them on top of the new version of their
ancestor.
......@@ -117,9 +142,10 @@
When you rewrite changesets, descendants of rewritten changesets are marked as
"orphan". You need to rewrite them on top of the new version of their
ancestor.
The evolution extension adds a command to rewrite "orphan"
changesets:::
The evolution extension adds a command to rewrite "orphan" changesets
.. code-block:: console
$ hg evolve
......@@ -123,5 +149,5 @@
$ hg evolve
You can also decide to do it manually using::
You can also reorder a changeset using
......@@ -127,3 +153,5 @@
$ hg grab <old-version>
.. code-block:: console
$ hg pick OLD_VERSION
......@@ -129,3 +157,5 @@
or::
or
.. code-block:: console
......@@ -131,3 +161,3 @@
$ hg rebase -r <revset for old version> -d .
$ hg rebase -r REVSET_FOR_OLD_VERSION -d .
......@@ -133,8 +163,8 @@
note: using graft allows you to pick the changeset you want next as the --move
option of qpush do.
note: using ``pick`` allows you to choose the changeset you want next as the ``--move``
option of ``qpush`` does.
hg qrm
``````
......@@ -136,7 +166,7 @@
hg qrm
``````
evolution introduce a new command to mark a changeset as "not wanted anymore".::
evolution introduces a new command to mark a changeset as "not wanted anymore".
......@@ -142,6 +172,8 @@
$ hg prune <revset>
.. code-block:: console
$ hg prune REVSET
hg qfold
````````
......@@ -144,5 +176,6 @@
hg qfold
````````
The following command emulates the behavior of ``qfold``
......@@ -148,3 +181,3 @@
::
.. code-block:: console
......@@ -150,6 +183,6 @@
$ hg fold first::last
$ hg fold FIRST::LAST
hg qdiff
````````
......@@ -152,8 +185,7 @@
hg qdiff
````````
``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ.
``pdiff`` is an alias for ``hg diff -r .^`` It works like ``qdiff``, but outside MQ.
......@@ -158,5 +190,9 @@
hg qfinish and hg qimport
`````````````````````````
hg qimport
``````````
To import a new patch, use
.. code-block:: console
......@@ -162,4 +198,3 @@
These are not necessary anymore. If you want to control the
mutability of changesets, see the phase feature.
$ hg import NEW_CHANGES.patch
......@@ -165,2 +200,4 @@
hg qfinish
``````````
......@@ -166,4 +203,6 @@
This is not necessary anymore. If you want to control the
mutability of changesets, see the ``phase`` feature.
hg qcommit
``````````
......
......@@ -49,7 +49,6 @@
.. toctree::
:maxdepth: 2
index
user-guide
sharing
concepts
......
......@@ -449,7 +449,7 @@
self._data.pop(r, None)
except (sqlite3.DatabaseError, sqlite3.OperationalError) as exc:
repo.ui.log(b'evoext-cache',
b'error while updating obshashrange cache: %s'
b'error while updating obshashrange cache: %s\n'
% forcebytestr(exc))
del self._updating
return
......@@ -562,5 +562,5 @@
del self._con
self._new.clear()
repo.ui.log(b'evoext-cache',
b'error while saving new data: %s'
b'error while saving new data: %s\n'
% forcebytestr(exc))
......@@ -566,5 +566,5 @@
% forcebytestr(exc))
repo.ui.debug(b'evoext-cache: error while saving new data: %s'
repo.ui.debug(b'evoext-cache: error while saving new data: %s\n'
% forcebytestr(exc))
def _trysave(self, repo):
......@@ -576,7 +576,7 @@
con = self._db()
if con is None:
repo.ui.log(b'evoext-cache', b'unable to write obshashrange cache'
b' - cannot create database')
b' - cannot create database\n')
return
with con:
for req in _sqliteschema:
......
......@@ -59,7 +59,7 @@
|
| Falling back to a less efficient fetching method.
|
| More efficient fetching method is possible and will be used in the future.
| More efficient fetching method is possible and will be used in the future.\n
"""
@eh.wrapfunction(exchange, '_pullbundle2extraprepare')
......
......@@ -295,8 +295,8 @@
if r'_con' in vars(self):
del self._con
self._unsavedsubranges.clear()
repo.ui.log(b'evoext-cache', b'error while saving new data: %s' % forcebytestr(exc))
repo.ui.debug(b'evoext-cache: error while saving new data: %s' % forcebytestr(exc))
repo.ui.log(b'evoext-cache', b'error while saving new data: %s\n' % forcebytestr(exc))
repo.ui.debug(b'evoext-cache: error while saving new data: %s\n' % forcebytestr(exc))
def _trysave(self, repo):
repo = repo.unfiltered()
......
......@@ -111,7 +111,7 @@
try:
versionblob = f.read(4)
if len(versionblob) < 4:
repo.ui.debug(b'ignoring corrupted evolvestate (file contains %i bits)'
repo.ui.debug(b'ignoring corrupted evolvestate (file contains %i bits)\n'
% len(versionblob))
return None
version = struct.unpack(b'>I', versionblob)[0]
......@@ -137,7 +137,7 @@
if rtype == b'C':
state[b'current'] = rdata
elif rtype.lower():
repo.ui.debug(b'ignore evolve state record type %s' % rtype)
repo.ui.debug(b'ignore evolve state record type %s\n' % rtype)
else:
raise error.Abort(_(b"unknown evolvestate field type '%s'")
% rtype, hint=_(b'upgrade your evolve'))
......
......@@ -1034,7 +1034,7 @@
return
ui.status(_(b'changed topic to "%s" on %d revisions\n') % (bmark,
rewrote))
ui.debug(b'removing bookmark "%s" from "%d"' % (bmark, old))
ui.debug(b'removing bookmark "%s" from "%d"\n' % (bmark, old))
bookmarks.delete(repo, tr, [bmark])
def _changecurrenttopic(repo, newtopic):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment