/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Lukáš Lalinský
  • Date: 2008-08-28 13:41:15 UTC
  • mto: (3732.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3733.
  • Revision ID: lalinsky@gmail.com-20080828134115-265uyumclq5qvetg
https://launchpad.net/bugs/144421
Fix `bzr st -rbranch:PATH_TO_BRANCH`

* Add RevisionSpec.as_tree which returns a tree representation of the revision specifier. This might return a remote revision tree.
* Make status use this new method and not require RevisionSpec.as_revision_id, which for RevisionSpec_branch fetches data to the local repository.
* Refactor common code for getting either a revision tree or a tree/branch's basis tree into a private function _get_revision_tree and make it use RevisionSpec.as_tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
 
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib import bencode
 
31
from bzrlib.util import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34
 
290
290
            ' %(num_lines)r)' % self.__dict__
291
291
 
292
292
    def __eq__(self, other):
293
 
        if self.__class__ is not other.__class__:
 
293
        if self.__class__ != other.__class__:
294
294
            return False
295
295
        return (self.__dict__ == other.__dict__)
296
296
 
316
316
        return version in self._parents
317
317
 
318
318
    def do_snapshot(self, version_id, parent_ids):
319
 
        """Determine whether to perform a snapshot for this version"""
 
319
        """Determine whether to perform a a snapshot for this version"""
320
320
        if self.snapshot_interval is None:
321
321
            return False
322
322
        if self.max_snapshots is not None and\