facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

maps: change branchedits to accept revnum directly

Browse Source 
This makes tests easier to write.
This commit is contained in:
Jun Wu 2016-06-15 13:28:40 +01:00
parent 3e067889d0
commit 1755a6d397
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgsubversion/maps.py
View File

@ -370,8 +370,8 @@ class RevMap(dict):
self._hashes = dict((v, k) for (k, v) in self._origiteritems())
return self._hashes
def branchedits(self, branch, rev):
check = lambda x: x[0][1] == branch and x[0][0] < rev.revnum
def branchedits(self, branch, revnum):
check = lambda x: x[0][1] == branch and x[0][0] < revnum
return sorted(filter(check, self._origiteritems()), reverse=True)
def branchmaxrevnum(self, branch, maxrevnum):
@ -579,12 +579,12 @@ class SqliteRevMap(collections.MutableMapping):
self._hashes = self.ReverseRevMap(self)
return self._hashes
def branchedits(self, branch, rev):
def branchedits(self, branch, revnum):
return [((r[0], r[1] or None), bytes(r[2])) for r in
self._query('SELECT rev, branch, hash FROM revmap ' +
'WHERE rev < ? AND branch = ? ' +
'ORDER BY rev DESC, branch DESC',
(rev.revnum, branch or ''))]
(revnum, branch or ''))]
def branchmaxrevnum(self, branch, maxrev):
for row in self._query('SELECT rev FROM revmap ' +

2
hgsubversion/replay.py
View File

@ -103,7 +103,7 @@ def _convert_rev(ui, meta, svn, r, tbdelta, firstrun):
closebranches = {}
for branch in tbdelta['branches'][1]:
branchedits = meta.revmap.branchedits(branch, rev)
branchedits = meta.revmap.branchedits(branch, rev.revnum)
if len(branchedits) < 1:
# can't close a branch that never existed
continue

2
hgsubversion/stupid.py
View File

@ -568,7 +568,7 @@ def fetch_branchrev(svn, meta, branch, branchpath, r, parentctx):
return files, filectxfn
def checkbranch(meta, r, branch):
branchedits = meta.revmap.branchedits(branch, r)
branchedits = meta.revmap.branchedits(branch, r.revnum)
if not branchedits:
return None
branchtip = branchedits[0][1]