Mercurial > public > mercurial-scm > hg
comparison mercurial/copies.py @ 32291:bd872f64a8ba
cleanup: use set literals
We no longer support Python 2.6, so we can now use set literals.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 10 Feb 2017 16:56:29 -0800 |
| parents | 5a909a8098a1 |
| children | c8c9feffbd35 |
comparison
equal
deleted
inserted
replaced
| 32290:2959c3e986e0 | 32291:bd872f64a8ba |
|---|---|
| 635 if m1[f] == mb.get(f) and not remotebase: | 635 if m1[f] == mb.get(f) and not remotebase: |
| 636 # Nothing to merge | 636 # Nothing to merge |
| 637 return | 637 return |
| 638 | 638 |
| 639 of = None | 639 of = None |
| 640 seen = set([f]) | 640 seen = {f} |
| 641 for oc in getfctx(f, m1[f]).ancestors(): | 641 for oc in getfctx(f, m1[f]).ancestors(): |
| 642 ocr = oc.linkrev() | 642 ocr = oc.linkrev() |
| 643 of = oc.path() | 643 of = oc.path() |
| 644 if of in seen: | 644 if of in seen: |
| 645 # check limit late - grab last rename before | 645 # check limit late - grab last rename before |