equal
deleted
inserted
replaced
1046 changes = repo.status(match=match) |
1046 changes = repo.status(match=match) |
1047 else: |
1047 else: |
1048 changes = self.checklocalchanges(repo, force=True) |
1048 changes = self.checklocalchanges(repo, force=True) |
1049 commitfiles = list(inclsubs) |
1049 commitfiles = list(inclsubs) |
1050 for files in changes[:3]: |
1050 for files in changes[:3]: |
1051 commitfiles.extend([f for f in files if f != '.hgsubstate']) |
1051 commitfiles.extend(files) |
1052 match = scmutil.matchfiles(repo, commitfiles) |
1052 match = scmutil.matchfiles(repo, commitfiles) |
1053 if len(repo[None].parents()) > 1: |
1053 if len(repo[None].parents()) > 1: |
1054 raise util.Abort(_('cannot manage merge changesets')) |
1054 raise util.Abort(_('cannot manage merge changesets')) |
1055 self.checktoppatch(repo) |
1055 self.checktoppatch(repo) |
1056 insert = self.fullseriesend() |
1056 insert = self.fullseriesend() |
1575 allmatches = set(cm + ca + cr + cd) |
1575 allmatches = set(cm + ca + cr + cd) |
1576 refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] |
1576 refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] |
1577 |
1577 |
1578 files = set(inclsubs) |
1578 files = set(inclsubs) |
1579 for x in refreshchanges: |
1579 for x in refreshchanges: |
1580 files.update([f for f in x if f != '.hgsubstate']) |
1580 files.update(x) |
1581 match = scmutil.matchfiles(repo, files) |
1581 match = scmutil.matchfiles(repo, files) |
1582 |
1582 |
1583 bmlist = repo[top].bookmarks() |
1583 bmlist = repo[top].bookmarks() |
1584 |
1584 |
1585 try: |
1585 try: |