← Back to branch summary

~garyvdm/qbzr/newwtlist

« back to all changes in this revision

Viewing changes to lib/diff_arg.py

  • Committer: Gary van der Merwe
  • Date: 2009-07-15 22:15:39 UTC
  • Revision ID: garyvdm@gmail.com-20090715221539-mqfsj16dt8x2z1py
Ext diff - Don't pass old revspec if none was provided for working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/diff_arg.py
93
93
        from bzrlib import urlutils
94
94
 
95
95
        args = []
96
 
        args.append(self.get_revspec())
 
96
        revspec = self.get_revspec()
 
97
        if revspec:
 
98
            args.append(revspec)
97
99
        
98
100
        if not self.old_branch.base == self.new_branch.base: 
99
101
            args.append("--old=%s" % self.old_branch.base)
138
140
                self.specific_files)
139
141
 
140
142
    def get_revspec(self):
141
 
        return "-r revid:%s" % (self.old_revid,)
 
143
        if self.old_revid is not None:
 
144
            return "-r revid:%s" % (self.old_revid,)
 
145
        else:
 
146
            return None
142
147
    
143
148
    def need_to_load_paths(self):
144
149
        return False