/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/backend/update.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-20 13:02:35 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060820130235-62c9c5753f5d8774
Gettext support added.

2006-08-20  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * po/hu.po: added Hungarian traslation
    * Added gettext support to all files.
    * genpot.sh: added olive-gtk.pot generator script

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/backend/update.py
20
20
 
21
21
from bzrlib.workingtree import WorkingTree
22
22
 
23
 
from errors import ConnectionError, NoLocationKnown, NotBranchError
 
23
from errors import NoLocationKnown, NotBranchError
24
24
 
25
25
def missing(branch, other_branch=None, reverse=False):
26
26
    """ Get the number of missing or extra revisions of local branch.
36
36
    import bzrlib
37
37
    from bzrlib.missing import find_unmerged
38
38
    
39
 
    try:
40
 
        local_branch = bzrlib.branch.Branch.open_containing(branch)[0]
41
 
    except errors.NotBranchError:
42
 
        raise NotBranchError(branch)
43
 
    except:
44
 
        raise
45
 
    
 
39
    local_branch = bzrlib.branch.Branch.open_containing(branch)[0]
46
40
    parent = local_branch.get_parent()
47
41
    if other_branch is None:
48
42
        other_branch = parent
49
43
        if other_branch is None:
50
44
            raise NoLocationKnown
51
 
    
52
 
    try:
53
 
        remote_branch = bzrlib.branch.Branch.open(other_branch)
54
 
    except errors.NotBranchError:
55
 
        raise NotBranchError(other_branch)
56
 
    except errors.ConnectionError:
57
 
        raise ConnectionError(other_branch)
58
 
    except:
59
 
        raise
60
 
    
 
45
    remote_branch = bzrlib.branch.Branch.open(other_branch)
61
46
    if remote_branch.base == local_branch.base:
62
47
        remote_branch = local_branch
63
48
    local_branch.lock_read()
114
99
    
115
100
    :return: number of revisions pulled
116
101
    """
117
 
    nobundle = False
118
 
    
119
102
    from bzrlib.branch import Branch
120
 
    try:
121
 
        from bzrlib.bundle import read_bundle_from_url
122
 
        from bzrlib.bundle.apply_bundle import install_bundle
123
 
    except ImportError:
124
 
        # no bundle support
125
 
        nobundle = True
 
103
    from bzrlib.bundle import read_bundle_from_url
 
104
    from bzrlib.bundle.apply_bundle import install_bundle
126
105
    
127
106
    try:
128
107
        tree_to = WorkingTree.open_containing(branch)[0]
137
116
        raise NotBranchError(location)
138
117
 
139
118
    reader = None
140
 
    if location is not None and not nobundle:
 
119
    if location is not None:
141
120
        try:
142
121
            reader = read_bundle_from_url(location)
143
122
        except errors.NotABundle:
150
129
        else:
151
130
            location = stored_loc
152
131
 
153
 
    if reader is not None and not nobundle:
 
132
    if reader is not None:
154
133
        install_bundle(branch_to.repository, reader)
155
134
        branch_from = branch_to
156
135
    else: