equal
deleted
inserted
replaced
837 changed = [] |
837 changed = [] |
838 linkrev = self.changelog.count() |
838 linkrev = self.changelog.count() |
839 commit.sort() |
839 commit.sort() |
840 for f in commit: |
840 for f in commit: |
841 self.ui.note(f + "\n") |
841 self.ui.note(f + "\n") |
842 fctx = wctx.filectx(f) |
|
843 try: |
842 try: |
|
843 fctx = wctx.filectx(f) |
844 new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed) |
844 new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed) |
845 new_exec = fctx.isexec() |
845 new_exec = fctx.isexec() |
846 new_link = fctx.islink() |
846 new_link = fctx.islink() |
847 if ((not changed or changed[-1] != f) and |
847 if ((not changed or changed[-1] != f) and |
848 m2.get(f) != new[f]): |
848 m2.get(f) != new[f]): |