Breezy

Merge lp:~jelmer/brz/git-remote-tag-selector into lp:brz

  1. git-remote-tag-selector
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 7497
Proposed branch: lp:~jelmer/brz/git-remote-tag-selector
Merge into: lp:brz
Diff against target: 26 lines (+7/-1) (has conflicts)
1 file modified
breezy/git/remote.py (+7/-1)
Text conflict in breezy/git/remote.py
To merge this branch: bzr merge lp:~jelmer/brz/git-remote-tag-selector
Reviewer Review Type Date Requested Status
Breezy developers Pending
Review via email: mp+379608@code.launchpad.net

Description of the change

Add tag_selector support in GitRemoteDir.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/remote.py'
2--- breezy/git/remote.py 2020-02-18 01:57:45 +0000
3+++ breezy/git/remote.py 2020-02-21 06:40:00 +0000
4@@ -545,7 +545,7 @@
5
6 def push_branch(self, source, revision_id=None, overwrite=False,
7 remember=False, create_prefix=False, lossy=False,
8- name=None):
9+ name=None, tag_selector=None):
10 """Push the source branch into this ControlDir."""
11 if revision_id is None:
12 # No revision supplied by the user, default to the branch
13@@ -589,7 +589,13 @@
14 source, self.open_branch(name, nascent_ok=True))
15 ret[actual_refname] = new_sha
16 if fetch_tags:
17+<<<<<<< TREE
18 for tagname, revid in source.tags.get_tag_dict().items():
19+=======
20+ for tagname, revid in viewitems(source.tags.get_tag_dict()):
21+ if tag_selector and not tag_selector(tagname):
22+ continue
23+>>>>>>> MERGE-SOURCE
24 if lossy:
25 try:
26 new_sha = source_store._lookup_revision_sha1(revid)

Subscribers

People subscribed via source and target branches