Bazaar

Merge lp:~mnordhoff/bzr/add_text_docstrings into lp:~bzr/bzr/trunk-old

  1. add_text_docstrings
  2. Merge into trunk-old
Proposed by Matt Nordhoff
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mnordhoff/bzr/add_text_docstrings
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 25 lines
To merge this branch: bzr merge lp:~mnordhoff/bzr/add_text_docstrings
Reviewer Review Type Date Requested Status
John A Meinel Approve
Ian Clatworthy Approve
Review via email: mp+7789@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Nordhoff (mnordhoff) wrote :

This is a totally trivial patch. The "add_text" methods were renamed to "_add_text", but the docstrings weren't updated.

Revision history for this message
Ian Clatworthy (ian-clatworthy) :
review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

as mentioned, obviously correct

review: Approve

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/groupcompress.py'
2--- bzrlib/groupcompress.py 2009-06-22 15:47:25 +0000
3+++ bzrlib/groupcompress.py 2009-06-23 05:35:16 +0000
4@@ -1009,7 +1009,7 @@
5 return sha1, length, None
6
7 def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
8- """See VersionedFiles.add_text()."""
9+ """See VersionedFiles._add_text()."""
10 self._index._check_write_ok()
11 self._check_add(key, None, random_id, check_content=False)
12 if text.__class__ is not str:
13
14=== modified file 'bzrlib/knit.py'
15--- bzrlib/knit.py 2009-06-22 15:47:25 +0000
16+++ bzrlib/knit.py 2009-06-23 05:35:16 +0000
17@@ -915,7 +915,7 @@
18 line_bytes=line_bytes)
19
20 def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
21- """See VersionedFiles.add_text()."""
22+ """See VersionedFiles._add_text()."""
23 self._index._check_write_ok()
24 self._check_add(key, None, random_id, check_content=False)
25 if text.__class__ is not str: