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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
        self.index = Index(os.path.join(self.repository._git.controldir(), 
56
56
            "index"))
57
57
 
58
 
    def lock_read(self):
59
 
        pass
60
 
 
61
58
    def unlock(self):
62
 
        pass
 
59
        # non-implementation specific cleanup
 
60
        self._cleanup()
 
61
 
 
62
        # reverse order of locking.
 
63
        try:
 
64
            return self._control_files.unlock()
 
65
        finally:
 
66
            self.branch.unlock()
63
67
 
64
68
    def is_control_filename(self, path):
65
69
        return os.path.basename(path) == ".git"