comparison hgext/largefiles/overrides.py @ 18152:4454607b5d25

largefiles: remove findoutgoing portability wrapper
author Mads Kiilerich <madski@unity3d.com>
date Thu, 13 Dec 2012 19:19:06 +0100
parents 14e31a631e41
children 51837a31b425
comparison
equal deleted inserted replaced
18151:90ad387d9245 18152:4454607b5d25
10 10
11 import os 11 import os
12 import copy 12 import copy
13 13
14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \ 14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \
15 node, archival, error, merge 15 node, archival, error, merge, discovery
16 from mercurial.i18n import _ 16 from mercurial.i18n import _
17 from mercurial.node import hex 17 from mercurial.node import hex
18 from hgext import rebase 18 from hgext import rebase
19 19
20 import lfutil 20 import lfutil
974 974
975 try: 975 try:
976 remote = hg.peer(repo, opts, dest) 976 remote = hg.peer(repo, opts, dest)
977 except error.RepoError: 977 except error.RepoError:
978 return None 978 return None
979 o = lfutil.findoutgoing(repo, remote, False) 979 outgoing = discovery.findcommonoutgoing(repo, remote.peer(), force=False)
980 if not o: 980 if not outgoing.missing:
981 return o 981 return outgoing.missing
982 o = repo.changelog.nodesbetween(o, revs)[0] 982 o = repo.changelog.nodesbetween(outgoing.missing, revs)[0]
983 if opts.get('newest_first'): 983 if opts.get('newest_first'):
984 o.reverse() 984 o.reverse()
985 985
986 toupload = set() 986 toupload = set()
987 for n in o: 987 for n in o: