/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: 2016-12-13 21:40:34 UTC
  • Revision ID: tim@ed.am-20161213214034-nd5t7ztnlrjd627i
fix add command and generic filename expansion/resolution to expend to
homedir-relative filename and absolute filename based on original filename, as
specified, rather than a fully, symlink-resolved filename.  So, e.g., if ~/bob
was a symlink to ~/fred, then ~/bob/a would resolve to the relative filename
bob/a, becuase it is inside the homedir (it would resolve to fred/a otherwise)

Show diffs side-by-side

added added

removed removed

lib/stdhome/the.py
29
29
# main command
30
30
command = None
31
31
 
 
32
# config
 
33
config = None
 
34
 
32
35
# repo name, set by late_init() to an instance of Repo
33
36
repo = 'home'
34
37
 
61
64
 
62
65
        global home_dir, full_home_dir
63
66
        full_home_dir = util.canonicalise_path( home_dir )
 
67
        if verbose >= 2: print "home-dir at " + home_dir
64
68
 
65
69
        global repo
66
 
        from repo import Repo
67
 
        if isinstance( repo, Repo ):
68
 
                raise RuntimeError( 'logic error: the.repo is already set' )
69
 
        repo = Repo( 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()