Breezy

Merge lp:~jelmer/brz/fix-dw into lp:brz/3.1

  1. fix-dw
  2. Merge into 3.1
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-dw
Merge into: lp:brz/3.1
Diff against target: 56 lines (+5/-5)
3 files modified
breezy/git/branch.py (+1/-1)
breezy/git/git_remote_helper.py (+1/-1)
breezy/git/interrepo.py (+3/-3)
To merge this branch: bzr merge lp:~jelmer/brz/fix-dw
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+394292@code.launchpad.net

Commit message

Use different method names for operations with slightly different

Description of the change

Use different method names for operations with slightly different
signatures.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/branch.py'
2--- breezy/git/branch.py 2020-07-18 15:03:28 +0000
3+++ breezy/git/branch.py 2020-11-22 14:02:15 +0000
4@@ -1456,7 +1456,7 @@
5 ret.append((None, v))
6 ret.append((None, stop_revision))
7 try:
8- revidmap = self.interrepo.fetch_objects(ret, lossy=lossy, limit=limit)
9+ revidmap = self.interrepo.fetch_revs(ret, lossy=lossy, limit=limit)
10 except NoPushSupport:
11 raise errors.NoRoundtrippingSupport(self.source, self.target)
12 return _mod_repository.FetchResult(revidmap={
13
14=== modified file 'breezy/git/git_remote_helper.py'
15--- breezy/git/git_remote_helper.py 2020-01-31 17:43:44 +0000
16+++ breezy/git/git_remote_helper.py 2020-11-22 14:02:15 +0000
17@@ -81,7 +81,7 @@
18 lossy = False
19 else:
20 lossy = True
21- inter.fetch_objects(revs, lossy=lossy)
22+ inter.fetch_revs(revs, lossy=lossy)
23 outf.write(b"\n")
24
25
26
27=== modified file 'breezy/git/interrepo.py'
28--- breezy/git/interrepo.py 2020-11-13 02:00:42 +0000
29+++ breezy/git/interrepo.py 2020-11-22 14:02:15 +0000
30@@ -268,7 +268,7 @@
31 with self.source_store.lock_read():
32 old_refs = self._get_target_bzr_refs()
33 new_refs = update_refs(old_refs)
34- revidmap = self.fetch_objects(
35+ revidmap = self.fetch_revs(
36 [(git_sha, bzr_revid)
37 for (git_sha, bzr_revid) in new_refs.values()
38 if git_sha is None or not git_sha.startswith(SYMREF)],
39@@ -292,7 +292,7 @@
40 result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
41 return revidmap, old_refs, result_refs
42
43- def fetch_objects(self, revs, lossy, limit=None):
44+ def fetch_revs(self, revs, lossy, limit=None):
45 if not lossy and not self.mapping.roundtripping:
46 for git_sha, bzr_revid in revs:
47 if (bzr_revid is not None and
48@@ -338,7 +338,7 @@
49 for revid in self.source.all_revision_ids()]
50 self._warn_slow()
51 try:
52- revidmap = self.fetch_objects(stop_revisions, lossy=lossy)
53+ revidmap = self.fetch_revs(stop_revisions, lossy=lossy)
54 except NoPushSupport:
55 raise NoRoundtrippingSupport(self.source, self.target)
56 return FetchResult(revidmap)

Subscribers

People subscribed via source and target branches