Mercurial > hg-stable
changeset 27471:fe79f86099ae
commands: consistently indent notes 3 spaces
most notes have 3 spaces for indentation, these had 2...
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Fri, 18 Dec 2015 06:33:48 +0000 |
| parents | d394a1a3708a |
| children | 3dea4eae4eeb |
| files | contrib/perf.py mercurial/commands.py mercurial/revlog.py |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/perf.py Sun Dec 20 18:38:21 2015 -0800 +++ b/contrib/perf.py Fri Dec 18 06:33:48 2015 +0000 @@ -525,6 +525,7 @@ r.clearcaches() r._chunkraw(chain[0], chain[-1]) + @util.nogc def dodecompress(data, chain): if not cache: r.clearcaches()
--- a/mercurial/commands.py Sun Dec 20 18:38:21 2015 -0800 +++ b/mercurial/commands.py Fri Dec 18 06:33:48 2015 +0000 @@ -542,8 +542,8 @@ .. note:: - backout cannot be used to fix either an unwanted or - incorrect merge. + backout cannot be used to fix either an unwanted or + incorrect merge. .. container:: verbose @@ -3818,8 +3818,8 @@ .. note:: - The -c/--continue option does not reapply earlier options, except - for --force. + The -c/--continue option does not reapply earlier options, except + for --force. .. container:: verbose @@ -5623,9 +5623,9 @@ .. note:: - Extra care should be taken with the -f/--force option, - which will push all new heads on all branches, an action which will - almost always cause confusion for collaborators. + Extra care should be taken with the -f/--force option, + which will push all new heads on all branches, an action which will + almost always cause confusion for collaborators. If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository.
--- a/mercurial/revlog.py Sun Dec 20 18:38:21 2015 -0800 +++ b/mercurial/revlog.py Fri Dec 18 06:33:48 2015 +0000 @@ -1163,6 +1163,7 @@ return mdiff.textdiff(self.revision(rev1), self.revision(rev2)) + @util.nogc def revision(self, nodeorrev, _df=None): """return an uncompressed revision of a given node or revision number.