Changeset marienz@gentoo.org-20061025224146-97cefa80412deeca in marienz/trac%2Bbzr

Timestamp:

10/25/06 22:41:46 (4 years ago)

Author:

Marien Zwart <marienz@…>

branch-nick:

trac%2Bbzr

Message:

Improve normalize_rev, do not guess self.branch in short_rev.

File:

• tracbzr/backend.py (modified) (2 diffs)

tracbzr/backend.py

@@ -351 +351 @@
         This does not really do anything other than convert None into a rev.
         """
-        # TODO maybe do more here? convert to path + revid or path + revno?
         if rev is None:
-            return string_rev(
-                self.repo, self.branch, self.branch.last_revision())
-        return rev
+            branch = self.branch
+            revid = branch.last_revision()
+        else:
+            branch, revid = self._parse_rev(rev)
+        return string_rev(self.repo, branch, revid)
 
     def short_rev(self, rev):
@@ -370 +371 @@
         branch, revid = self._parse_rev(rev)
         if branch is None:
-            branch = self.branch
+            return '????'
         history = branch.revision_history()
         # First try if it is a revno.