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

  • Committer: Jelmer Vernooij
  • Date: 2011-11-12 05:14:31 UTC
  • Revision ID: jelmer@samba.org-20111112051431-sqgy80bw2s9eno0x
Update pot file

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
62
62
    last_revision = parents[0]
63
63
 
64
64
    if last_revision is not None:
65
 
        graph = branch.repository.get_graph()
66
 
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
 
65
        try:
 
66
            ignore = set(branch.repository.get_ancestry(last_revision,
 
67
                                                        topo_sorted=False))
 
68
        except errors.NoSuchRevision:
 
69
            # the last revision is a ghost : assume everything is new
 
70
            # except for it
 
71
            ignore = set([None, last_revision])
67
72
    else:
68
 
        ignore = set([])
 
73
        ignore = set([None])
69
74
 
70
75
    pm = []
71
76
    for merge in pending:
128
133
        """Setup the member variables for state."""
129
134
        self._basis_tree = self._wt.basis_tree()
130
135
        self._delta = None
131
 
        self._wt.lock_read()
132
 
        try:
133
 
            self._pending = pending_revisions(self._wt)
134
 
        finally:
135
 
            self._wt.unlock()
 
136
        self._pending = pending_revisions(self._wt)
136
137
 
137
138
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
138
139