git_brch_tx.patch

Etienne Massip, 2011-10-28 12:20

Download (946 Bytes)

View differences:

C:/Documents and Settings/e1263830/Desktop/patched_git.rb Fri Oct 28 12:04:13 2011
142 142
    end
143 143
    scm_brs.each do |br1|
144 144
      br = br1.to_s
145
      rev = nil
145 146
      from_scmid = nil
146 147
      from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
147 148
      h["branches"][br] ||= {}
148
      scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
149
        db_rev = find_changeset_by_name(rev.revision)
150
        transaction do
151
          if db_rev.nil?
152
            save_revision(rev)
153
          end
149
      transaction do
150
        scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
151
          find_changeset_by_name(rev.revision) || save_revision(rev)
152
        end
153
        unless rev.nil?
154 154
          h["branches"][br]["last_scmid"] = rev.scmid
155 155
          merge_extra_info(h)
156 156
          self.save