kallithea Changeset - 0efbf3f48bdd

Changeset - 0efbf3f48bdd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 8 years ago 2018-05-11 14:26:48
mads@kiilerich.com

hg: support more strict branch name checking in Mercurial 4.6 - be more careful about not passing unicode branch names

TestHgApi.test_api_get_changesets_with_branch would fail.

1 file changed with 1 insertions and 2 deletions:

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -517,13 +517,12 @@ class MercurialRepository(BaseRepository @@
         :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:
@@ @@ -535,13 +534,13 @@ class MercurialRepository(BaseRepository @@
             raise BranchDoesNotExistError(msg)
         if end_pos is not None:
             end_pos += 1
         # filter branches
         filter_ = []
         if branch_name:
             filter_.append('branch("%s")' % (branch_name))
+            filter_.append('branch("%s")' % safe_str(branch_name))
         if start_date:
             filter_.append('date(">%s")' % start_date)
         if end_date:
             filter_.append('date("<%s")' % end_date)
         if filter_ or max_revisions:
             if filter_:

0 comments (0 inline, 0 general)