equal
deleted
inserted
replaced
1357 else: |
1357 else: |
1358 end = self.series.index(patch, start) + 1 |
1358 end = self.series.index(patch, start) + 1 |
1359 |
1359 |
1360 tobackup = set() |
1360 tobackup = set() |
1361 if (not nobackup and force) or keepchanges: |
1361 if (not nobackup and force) or keepchanges: |
1362 m, a, r, d = self.checklocalchanges(repo, force=True) |
1362 status = self.checklocalchanges(repo, force=True) |
1363 if keepchanges: |
1363 if keepchanges: |
1364 tobackup.update(m + a + r + d) |
1364 tobackup.update(status.modified + status.added + |
|
1365 status.removed + status.deleted) |
1365 else: |
1366 else: |
1366 tobackup.update(m + a) |
1367 tobackup.update(status.modified + status.added) |
1367 |
1368 |
1368 s = self.series[start:end] |
1369 s = self.series[start:end] |
1369 all_files = set() |
1370 all_files = set() |
1370 try: |
1371 try: |
1371 if mergeq: |
1372 if mergeq: |
1445 break |
1446 break |
1446 update = needupdate |
1447 update = needupdate |
1447 |
1448 |
1448 tobackup = set() |
1449 tobackup = set() |
1449 if update: |
1450 if update: |
1450 m, a, r, d = self.checklocalchanges( |
1451 s = self.checklocalchanges(repo, force=force or keepchanges) |
1451 repo, force=force or keepchanges) |
|
1452 if force: |
1452 if force: |
1453 if not nobackup: |
1453 if not nobackup: |
1454 tobackup.update(m + a) |
1454 tobackup.update(s.modified + s.added) |
1455 elif keepchanges: |
1455 elif keepchanges: |
1456 tobackup.update(m + a + r + d) |
1456 tobackup.update(s.modified + s.added + |
|
1457 s.removed + s.deleted) |
1457 |
1458 |
1458 self.applieddirty = True |
1459 self.applieddirty = True |
1459 end = len(self.applied) |
1460 end = len(self.applied) |
1460 rev = self.applied[start].node |
1461 rev = self.applied[start].node |
1461 |
1462 |