Details
Details
- Reviewers
- None
- Group Reviewers
hg-reviewers - Commits
- rHG151cc149b17f: tests: migrate to new method for getting copy info
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
hg-reviewers |
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | tests/test-annotate.t (4 lines) |
Commit | Parents | Author | Summary | Date |
---|---|---|---|---|
Martin von Zweigbergk | Dec 28 2017, 1:31 AM |
Status | Author | Revision | |
---|---|---|---|
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz |
> def _filecommit(self, fctx, manifest1, manifest2, | > def _filecommit(self, fctx, manifest1, manifest2, | ||||
> linkrev, tr, changelist): | > linkrev, tr, changelist): | ||||
> fname = fctx.path() | > fname = fctx.path() | ||||
> text = fctx.data() | > text = fctx.data() | ||||
> flog = self.file(fname) | > flog = self.file(fname) | ||||
> fparent1 = manifest1.get(fname, node.nullid) | > fparent1 = manifest1.get(fname, node.nullid) | ||||
> fparent2 = manifest2.get(fname, node.nullid) | > fparent2 = manifest2.get(fname, node.nullid) | ||||
> meta = {} | > meta = {} | ||||
> copy = fctx.renamed() | > copy = fctx.copysource() | ||||
> if copy and copy[0] != fname: | > if copy and copy != fname: | ||||
> raise error.Abort('copying is not supported') | > raise error.Abort('copying is not supported') | ||||
> if fparent2 != node.nullid: | > if fparent2 != node.nullid: | ||||
> changelist.append(fname) | > changelist.append(fname) | ||||
> return flog.add(text, meta, tr, linkrev, | > return flog.add(text, meta, tr, linkrev, | ||||
> fparent1, fparent2) | > fparent1, fparent2) | ||||
> raise error.Abort('only merging is supported') | > raise error.Abort('only merging is supported') | ||||
> repo.__class__ = legacyrepo | > repo.__class__ = legacyrepo | ||||
> EOF | > EOF |