/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/the.py

  • Committer: Tim Marston
  • Date: 2014-04-05 22:26:17 UTC
  • Revision ID: tim@ed.am-20140405222617-4nf4alk3u2dxe430
removed reference to copy-in conflicts (which no longer exist)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/the.py
20
20
 
21
21
 
22
22
import os
23
 
from . import util
 
23
import util
24
24
 
25
25
 
26
26
# the program
29
29
# main command
30
30
command = None
31
31
 
32
 
# config
33
 
config = None
34
 
 
35
32
# repo name, set by late_init() to an instance of Repo
36
33
repo = 'home'
37
34
 
64
61
 
65
62
        global home_dir, full_home_dir
66
63
        full_home_dir = util.canonicalise_path( home_dir )
67
 
        if verbose >= 2: print("home-dir at " + home_dir)
68
64
 
69
65
        global repo
70
 
        if repo is not None:
71
 
                from .repo import Repo
72
 
                repo = Repo( repo )
73
 
                if verbose >= 2: print("repo at " + repo.dir)
74
 
                repo.detect_vcs()
 
66
        from repo import Repo
 
67
        if isinstance( repo, Repo ):
 
68
                raise RuntimeError( 'logic error: the.repo is already set' )
 
69
        repo = Repo( repo )