Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 26715:652dfb1eff14
merge: directly get destination from destutil
There is no real value in using the revset over the function.
The revset have no remaining users and will be taken care of in a later
changesets.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 01:19:32 +0100 |
| parents | 76f20fc8d54d |
| children | 43708f92f471 |
comparison
equal
deleted
inserted
replaced
| 26714:9903261dcc81 | 26715:652dfb1eff14 |
|---|---|
| 4899 | 4899 |
| 4900 if node: | 4900 if node: |
| 4901 node = scmutil.revsingle(repo, node).node() | 4901 node = scmutil.revsingle(repo, node).node() |
| 4902 | 4902 |
| 4903 if not node: | 4903 if not node: |
| 4904 node = scmutil.revsingle(repo, '_mergedefaultdest()').node() | 4904 node = repo[destutil.destmerge(repo)].node() |
| 4905 | 4905 |
| 4906 if opts.get('preview'): | 4906 if opts.get('preview'): |
| 4907 # find nodes that are ancestors of p2 but not of p1 | 4907 # find nodes that are ancestors of p2 but not of p1 |
| 4908 p1 = repo.lookup('.') | 4908 p1 = repo.lookup('.') |
| 4909 p2 = repo.lookup(node) | 4909 p2 = repo.lookup(node) |