equal
deleted
inserted
replaced
136 except Exception: |
136 except Exception: |
137 missings.setdefault(b[1], []).append(b[0]) |
137 missings.setdefault(b[1], []).append(b[0]) |
138 |
138 |
139 if missings: |
139 if missings: |
140 self.after() |
140 self.after() |
141 for pbranch, heads in sorted(pycompat.iteritems(missings)): |
141 for pbranch, heads in sorted(missings.items()): |
142 pbranchpath = os.path.join(self.path, pbranch) |
142 pbranchpath = os.path.join(self.path, pbranch) |
143 prepo = hg.peer(self.ui, {}, pbranchpath) |
143 prepo = hg.peer(self.ui, {}, pbranchpath) |
144 self.ui.note( |
144 self.ui.note( |
145 _(b'pulling from %s into %s\n') % (pbranch, branch) |
145 _(b'pulling from %s into %s\n') % (pbranch, branch) |
146 ) |
146 ) |
593 def _changedfiles(self, ctx1, ctx2): |
593 def _changedfiles(self, ctx1, ctx2): |
594 ma, r = [], [] |
594 ma, r = [], [] |
595 maappend = ma.append |
595 maappend = ma.append |
596 rappend = r.append |
596 rappend = r.append |
597 d = ctx1.manifest().diff(ctx2.manifest()) |
597 d = ctx1.manifest().diff(ctx2.manifest()) |
598 for f, ((node1, flag1), (node2, flag2)) in pycompat.iteritems(d): |
598 for f, ((node1, flag1), (node2, flag2)) in d.items(): |
599 if node2 is None: |
599 if node2 is None: |
600 rappend(f) |
600 rappend(f) |
601 else: |
601 else: |
602 maappend(f) |
602 maappend(f) |
603 return ma, r |
603 return ma, r |
619 # revlogs are detected early |
619 # revlogs are detected early |
620 copies = self._getcopies(ctx, parents, copyfiles) |
620 copies = self._getcopies(ctx, parents, copyfiles) |
621 cleanp2 = set() |
621 cleanp2 = set() |
622 if len(parents) == 2: |
622 if len(parents) == 2: |
623 d = parents[1].manifest().diff(ctx.manifest(), clean=True) |
623 d = parents[1].manifest().diff(ctx.manifest(), clean=True) |
624 for f, value in pycompat.iteritems(d): |
624 for f, value in d.items(): |
625 if value is None: |
625 if value is None: |
626 cleanp2.add(f) |
626 cleanp2.add(f) |
627 changes = [(f, rev) for f in files if f not in self.ignored] |
627 changes = [(f, rev) for f in files if f not in self.ignored] |
628 changes.sort() |
628 changes.sort() |
629 return changes, copies, cleanp2 |
629 return changes, copies, cleanp2 |