/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/repo.py

  • Committer: Tim Marston
  • Date: 2014-04-05 19:21:27 UTC
  • Revision ID: tim@ed.am-20140405192127-yvt08c7qnnp2nr8i
fixed some bugs in Bzr.revert()

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/repo.py
1
1
# repo.py
2
2
#
3
 
# Copyright (C) 2013 Tim Marston <tim@edm.am>
 
3
# Copyright (C) 2013 to 2014 Tim Marston <tim@edm.am>
4
4
#
5
5
# This file is part of stdhome (hereafter referred to as "this program").
6
6
# See http://ed.am/dev/stdhome for more information.
20
20
 
21
21
 
22
22
import os
23
 
import the
 
23
import the, util
 
24
from vcs.bzr import BzrVcs
24
25
 
25
26
 
26
27
class Repo:
28
29
 
29
30
        def __init__( self, name ):
30
31
                self.name = name
31
 
                self.dir = '%s/%s' % ( the.dir, self.name )
32
 
                self.expanded_dir = os.path.expanduser( self.dir )
 
32
                self.dir = os.path.join( the.dir, self.name )
 
33
                self.full_dir = util.canonicalise_path( self.dir )
 
34
                self.vcs = BzrVcs( self.full_dir )
33
35
 
34
36
 
35
37
        def check_dir_exists( self, should_exist = True ):
36
38
                condition = 'does not' if should_exist else 'already'
37
 
                if os.path.exists( self.expanded_dir ) != should_exist:
 
39
                if os.path.exists( self.full_dir ) != should_exist:
38
40
                        raise the.program.FatalError(
39
41
                                'repository %s exists: %s' % ( condition, self.dir ) )