kallithea Changeset - ff0646d1a1b4

Changeset - ff0646d1a1b4

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Mads Kiilerich - 13 years ago 2013-03-19 22:50:28
madski@unity3d.com

Transplanted from: 10187d0a89fc

changelog: make it possible to use closed branches in ?branch=...

Closed branches in Mercurial are just not announced. It should still be
possible to use them. (And arguably there should also be a way to explore them
in the UI.)

1 file changed with 8 insertions and 1 deletions:

rhodecode/lib/vcs/backends/hg/repository.py

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -58,48 +58,55 @@ class MercurialRepository(BaseRepository @@
     def _empty(self):
         """
         Checks if repository is empty without any changesets
         """
         # TODO: Following raises errors when using InMemoryChangeset...
         # return len(self._repo.changelog) == 0
         return len(self.revisions) == 0
     @LazyProperty
     def revisions(self):
         """
         Returns list of revisions' ids, in ascending order.  Being lazy
         attribute allows external tools to inject shas from cache.
         """
         return self._get_all_revisions()
     @LazyProperty
     def name(self):
         return os.path.basename(self.path)
     @LazyProperty
     def branches(self):
         return self._get_branches()
     @LazyProperty
     def allbranches(self):
         """
         List all branches, including closed branches.
         """
         return self._get_branches(closed=True)
     def _get_branches(self, closed=False):
         """
         Get's branches for this repository
         Returns only not closed branches by default
         :param closed: return also closed branches for mercurial
         """
         if self._empty:
             return {}
         def _branchtags(localrepo):
             """
             Patched version of mercurial branchtags to not return the closed
             branches
             :param localrepo: locarepository instance
             """
             bt = {}
             bt_closed = {}
             for bn, heads in localrepo.branchmap().iteritems():
                 tip = heads[-1]
                 if 'close' in localrepo.changelog.read(tip)[5]:
@@ @@ -439,49 +446,49 @@ class MercurialRepository(BaseRepository @@
     def get_changesets(self, start=None, end=None, start_date=None,
                        end_date=None, branch_name=None, reverse=False):
         """
         Returns iterator of ``MercurialChangeset`` objects from start to end
         (both are inclusive)
         :param start: None, str, int or mercurial lookup format
         :param end:  None, str, int or mercurial lookup format
         :param start_date:
         :param end_date:
         :param branch_name:
         :param reversed: return changesets in reversed order
         """
         start_raw_id = self._get_revision(start)
         start_pos = self.revisions.index(start_raw_id) if start else None
         end_raw_id = self._get_revision(end)
         end_pos = self.revisions.index(end_raw_id) if end else None
         if None not in [start, end] and start_pos > end_pos:
             raise RepositoryError("Start revision '%s' cannot be "
                                   "after end revision '%s'" % (start, end))
-        if branch_name and branch_name not in self.branches.keys():
+        if branch_name and branch_name not in self.allbranches.keys():
             raise BranchDoesNotExistError('Branch %s not found in'
                                   ' this repository' % branch_name)
         if end_pos is not None:
             end_pos += 1
         slice_ = reversed(self.revisions[start_pos:end_pos]) if reverse else \
             self.revisions[start_pos:end_pos]
         for id_ in slice_:
             cs = self.get_changeset(id_)
             if branch_name and cs.branch != branch_name:
                 continue
             if start_date and cs.date < start_date:
                 continue
             if end_date and cs.date > end_date:
                 continue
             yield cs
     def pull(self, url):
         """
         Tries to pull changes from external location.
         """
         url = self._get_url(url)

0 comments (0 inline, 0 general)