hgext/mq.py
changeset 18054 b35e3364f94a
parent 18011 4908197d7422
child 18067 6f62e005781d
equal deleted inserted replaced
18053:0c2f0048125d 18054:b35e3364f94a
  1145                 return None
  1145                 return None
  1146             if matches:
  1146             if matches:
  1147                 return matches[0]
  1147                 return matches[0]
  1148             if self.series and self.applied:
  1148             if self.series and self.applied:
  1149                 if s == 'qtip':
  1149                 if s == 'qtip':
  1150                     return self.series[self.seriesend(True)-1]
  1150                     return self.series[self.seriesend(True) - 1]
  1151                 if s == 'qbase':
  1151                 if s == 'qbase':
  1152                     return self.series[0]
  1152                     return self.series[0]
  1153             return None
  1153             return None
  1154 
  1154 
  1155         if patch in self.series:
  1155         if patch in self.series:
  1624                 for f in r:
  1624                 for f in r:
  1625                     repo.dirstate.remove(f)
  1625                     repo.dirstate.remove(f)
  1626                 # if the patch excludes a modified file, mark that
  1626                 # if the patch excludes a modified file, mark that
  1627                 # file with mtime=0 so status can see it.
  1627                 # file with mtime=0 so status can see it.
  1628                 mm = []
  1628                 mm = []
  1629                 for i in xrange(len(m)-1, -1, -1):
  1629                 for i in xrange(len(m) - 1, -1, -1):
  1630                     if not matchfn(m[i]):
  1630                     if not matchfn(m[i]):
  1631                         mm.append(m[i])
  1631                         mm.append(m[i])
  1632                         del m[i]
  1632                         del m[i]
  1633                 for f in m:
  1633                 for f in m:
  1634                     repo.dirstate.normal(f)
  1634                     repo.dirstate.normal(f)