Patchwork changelog: update read pending documentation

login
register
mail settings
Submitter Pierre-Yves David
Date July 17, 2015, 2:03 p.m.
Message ID <c2a8490bf431ffb808f3.1437141796@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/10029/
State Accepted
Headers show

Comments

Pierre-Yves David - July 17, 2015, 2:03 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1437141236 -7200
#      Fri Jul 17 15:53:56 2015 +0200
# Node ID c2a8490bf431ffb808f3b3b80c5837f423865b63
# Parent  35fa7c77c754aa4d156c42abfdb61ca178468872
changelog: update read pending documentation

The pending index contains a full copy of the index + in-transaction data. We
replace "extend" with "overwrite" to make this clearer.
Matt Mackall - July 17, 2015, 9:04 p.m.
On Fri, 2015-07-17 at 16:03 +0200, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1437141236 -7200
> #      Fri Jul 17 15:53:56 2015 +0200
> # Node ID c2a8490bf431ffb808f3b3b80c5837f423865b63
> # Parent  35fa7c77c754aa4d156c42abfdb61ca178468872
> changelog: update read pending documentation

Queued for default, thanks.

Patch

diff --git a/mercurial/changelog.py b/mercurial/changelog.py
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -267,11 +267,11 @@  class changelog(revlog.revlog):
         is running, we are likely in a subprocess invoked in a hook. The
         subprocess is informed that it is within a transaction and needs to
         access its content.
 
         This function will read all the index data out of the pending file and
-        extend the main index."""
+        overwrite the main index."""
 
         if not self.opener.exists(file):
             return # no pending data for changelog
         r = revlog.revlog(self.opener, file)
         self.index = r.index