diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -946,6 +946,11 @@ class Project(object): | |||
946 | dest_branch) | 946 | dest_branch) |
947 | if auto_topic: | 947 | if auto_topic: |
948 | ref_spec = ref_spec + '/' + branch.name | 948 | ref_spec = ref_spec + '/' + branch.name |
949 | if not url.startswith('ssh://'): | ||
950 | rp = ['r=%s' % p for p in people[0]] + \ | ||
951 | ['cc=%s' % p for p in people[1]] | ||
952 | if rp: | ||
953 | ref_spec = ref_spec + '%' + ','.join(rp) | ||
949 | cmd.append(ref_spec) | 954 | cmd.append(ref_spec) |
950 | 955 | ||
951 | if GitCommand(self, cmd, bare = True).Wait() != 0: | 956 | if GitCommand(self, cmd, bare = True).Wait() != 0: |
@@ -963,7 +968,8 @@ class Project(object): | |||
963 | quiet=False, | 968 | quiet=False, |
964 | is_new=None, | 969 | is_new=None, |
965 | current_branch_only=False, | 970 | current_branch_only=False, |
966 | clone_bundle=True): | 971 | clone_bundle=True, |
972 | no_tags=False): | ||
967 | """Perform only the network IO portion of the sync process. | 973 | """Perform only the network IO portion of the sync process. |
968 | Local working directory/branch state is not affected. | 974 | Local working directory/branch state is not affected. |
969 | """ | 975 | """ |
@@ -1001,7 +1007,8 @@ class Project(object): | |||
1001 | current_branch_only = True | 1007 | current_branch_only = True |
1002 | 1008 | ||
1003 | if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, | 1009 | if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, |
1004 | current_branch_only=current_branch_only): | 1010 | current_branch_only=current_branch_only, |
1011 | no_tags=no_tags): | ||
1005 | return False | 1012 | return False |
1006 | 1013 | ||
1007 | if self.worktree: | 1014 | if self.worktree: |
@@ -1551,7 +1558,8 @@ class Project(object): | |||
1551 | current_branch_only=False, | 1558 | current_branch_only=False, |
1552 | initial=False, | 1559 | initial=False, |
1553 | quiet=False, | 1560 | quiet=False, |
1554 | alt_dir=None): | 1561 | alt_dir=None, |
1562 | no_tags=False): | ||
1555 | 1563 | ||
1556 | is_sha1 = False | 1564 | is_sha1 = False |
1557 | tag_name = None | 1565 | tag_name = None |
@@ -1644,7 +1652,10 @@ class Project(object): | |||
1644 | 1652 | ||
1645 | if not current_branch_only: | 1653 | if not current_branch_only: |
1646 | # Fetch whole repo | 1654 | # Fetch whole repo |
1647 | cmd.append('--tags') | 1655 | if no_tags: |
1656 | cmd.append('--no-tags') | ||
1657 | else: | ||
1658 | cmd.append('--tags') | ||
1648 | cmd.append((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')) | 1659 | cmd.append((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')) |
1649 | elif tag_name is not None: | 1660 | elif tag_name is not None: |
1650 | cmd.append('tag') | 1661 | cmd.append('tag') |