← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fai.py

  • Committer: Aaron Bentley
  • Date: 2005-10-24 00:08:03 UTC
  • mfrom: (147.4.5)
  • mto: (147.4.12)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: aaron.bentley@utoronto.ca-20051024000803-0e9b59dee42d0460
Merge lifeless

Show diffs side-by-side

added added

removed removed

Lines of Context:
fai.py
36
36
    if not logs:
37
37
        return []
38
38
    for log in logs:
39
 
        indirect.extend([f for f in log.new_patches if f != log.revision])
 
39
        try:
 
40
            this_indirect = [f for f in log.new_patches if f != log.revision]
 
41
        except pybaz.errors.NamespaceError:
 
42
            print
 
43
            print "log ", log, " unusable, attempting to use archive copy."
 
44
            log = pybaz.Revision(str(log.revision)).patchlog
 
45
            this_indirect = [f for f in log.new_patches if f != log.revision]
 
46
        indirect.extend(this_indirect)
40
47
        if log.continuation_of is not None:
41
48
            # continuations list everything in new_patches
42
49
            continue